diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/applications/editors/thonny/default.nix index a6d698b65a1..0ef9ac66ecc 100644 --- a/pkgs/applications/editors/thonny/default.nix +++ b/pkgs/applications/editors/thonny/default.nix @@ -4,13 +4,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "thonny"; - version = "4.0.2"; + version = "4.1.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-TxfpzKAsU/5ble4VzJ+4pokCiyJsdisjmNwWfxOMKzE="; + hash = "sha256-DlizSm5cDvYXQ8Gok+W/RTSaAWJTkdyTQ4uewOiDVXg="; }; nativeBuildInputs = [ copyDesktopItems ]; diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 6f1b267f961..4a57523f1b0 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -20,13 +20,13 @@ in stdenv.mkDerivation rec { pname = "tiled"; - version = "1.10.1"; + version = "1.10.2"; src = fetchFromGitHub { owner = "mapeditor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zrDka6yXJ++UuGFepn8glQ1r7ufBcjsnNZuH+jnkJw0="; + sha256 = "sha256-4Ykr60u2t5cyIZdpFHiRirXg2FqSLCzJzsdvw6r/LK8="; }; nativeBuildInputs = [ pkg-config qbs wrapQtAppsHook ]; diff --git a/pkgs/applications/emulators/citra/default.nix b/pkgs/applications/emulators/citra/default.nix index cdebb980b24..56a763b05bb 100644 --- a/pkgs/applications/emulators/citra/default.nix +++ b/pkgs/applications/emulators/citra/default.nix @@ -9,19 +9,19 @@ let # Please make sure to update this when updating citra! compat-list = fetchurl { name = "citra-compat-list"; - url = "https://web.archive.org/web/20230512234055/https://api.citra-emu.org/gamedb/"; - hash = "sha256-J+zqtWde5NgK2QROvGewtXGRAWUTNSKHNMG6iu9m1fU="; + url = "https://web.archive.org/web/20230807103651/https://api.citra-emu.org/gamedb/"; + hash = "sha256-Ma1SXgzhyMHa/MeoYuf8b+QYPjhoQEeKklLbGbkHwEk="; }; in { nightly = qt6Packages.callPackage ./generic.nix rec { pname = "citra-nightly"; - version = "1907"; + version = "1963"; src = fetchFromGitHub { owner = "citra-emu"; repo = "citra-nightly"; rev = "nightly-${version}"; - sha256 = "l4pqok42/ybnRX90Qwhcgm2JR4/9C5bbCTk3j4QuWtw="; + sha256 = "0ggi1l8327s43xaxs616g0s9vmal6q7vsv69bn07gp71gchhcmyi"; fetchSubmodules = true; }; @@ -30,13 +30,13 @@ in { canary = qt6Packages.callPackage ./generic.nix rec { pname = "citra-canary"; - version = "2484"; + version = "2573"; src = fetchFromGitHub { owner = "citra-emu"; repo = "citra-canary"; rev = "canary-${version}"; - sha256 = "IgCpqt3rKV9IqNstF4QwnJlE3hPH+BkIhaOvEmshh0U="; + sha256 = "sha256-tQJ3WcqGcnW9dOiwDrBgL0n3UNp1DGQ/FjCR28Xjdpc="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/citra/generic.nix b/pkgs/applications/emulators/citra/generic.nix index 7bce3e16d87..8df720e60b7 100644 --- a/pkgs/applications/emulators/citra/generic.nix +++ b/pkgs/applications/emulators/citra/generic.nix @@ -8,9 +8,10 @@ , stdenv , fetchFromGitHub , cmake -, boost179 +, boost , pkg-config , libusb1 +, glslang , zstd , libressl , enableSdl2 ? true, SDL2 @@ -31,11 +32,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake + glslang pkg-config ] ++ lib.optionals enableQt [ wrapQtAppsHook ]; buildInputs = [ - boost179 + boost libusb1 ] ++ lib.optionals enableQt [ qtbase qtmultimedia ] ++ lib.optional enableSdl2 SDL2 @@ -47,6 +49,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_SYSTEM_BOOST=ON" + "-DCITRA_WARNINGS_AS_ERRORS=OFF" "-DCITRA_USE_BUNDLED_FFMPEG=OFF" "-DCITRA_USE_BUNDLED_QT=OFF" "-DUSE_SYSTEM_SDL2=ON" @@ -66,7 +69,9 @@ stdenv.mkDerivation rec { ++ lib.optional useDiscordRichPresence "-DUSE_DISCORD_PRESENCE=ON" ++ lib.optional enableFdk "-DENABLE_FDK=ON"; - postPatch = '' + postPatch = with lib; let + branchCaptialized = (lib.toUpper (lib.substring 0 1 branch) + lib.substring 1 (-1) branch); + in '' # Fix file not found when looking in var/empty instead of opt mkdir externals/dynarmic/src/dynarmic/ir/var ln -s ../opt externals/dynarmic/src/dynarmic/ir/var/empty @@ -78,6 +83,9 @@ stdenv.mkDerivation rec { substituteInPlace CMakeLists.txt \ --replace "check_submodules_present()" "" + # Add versions + echo 'set(BUILD_FULLNAME "${branchCaptialized} ${version}")' >> CMakeModules/GenerateBuildInfo.cmake + # Devendoring rm -rf externals/zstd externals/libressl cp -r ${zstd.src} externals/zstd diff --git a/pkgs/applications/emulators/citra/update.sh b/pkgs/applications/emulators/citra/update.sh index e9150e34e0a..e76121dac6e 100755 --- a/pkgs/applications/emulators/citra/update.sh +++ b/pkgs/applications/emulators/citra/update.sh @@ -44,8 +44,8 @@ updateNightly() { echo " Successfully fetched. hash: ${NEW_NIGHTLY_HASH}" - sed -i "s/${OLD_NIGHTLY_VERSION}/${NEW_NIGHTLY_VERSION}/" ./default.nix - sed -i "s/${OLD_NIGHTLY_HASH}/${NEW_NIGHTLY_HASH}/" ./default.nix + sed -i "s|${OLD_NIGHTLY_VERSION}|${NEW_NIGHTLY_VERSION}|" ./default.nix + sed -i "s|${OLD_NIGHTLY_HASH}|${NEW_NIGHTLY_HASH}|" ./default.nix } updateCanary() { @@ -69,8 +69,8 @@ updateCanary() { echo " Successfully fetched. hash: ${NEW_CANARY_HASH}" - sed -i "s/${OLD_CANARY_VERSION}/${NEW_CANARY_VERSION}/" ./default.nix - sed -i "s/${OLD_CANARY_HASH}/${NEW_CANARY_HASH}/" ./default.nix + sed -i "s|${OLD_CANARY_VERSION}|${NEW_CANARY_VERSION}|" ./default.nix + sed -i "s|${OLD_CANARY_HASH}|${NEW_CANARY_HASH}|" ./default.nix } if [[ "$BRANCH" = "nightly" ]]; then diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix index 2cec147fb30..aa022cf232a 100644 --- a/pkgs/applications/graphics/mcomix/default.nix +++ b/pkgs/applications/graphics/mcomix/default.nix @@ -18,11 +18,11 @@ python3.pkgs.buildPythonApplication rec { pname = "mcomix"; - version = "2.1.0"; + version = "2.2.1"; src = fetchurl { url = "mirror://sourceforge/mcomix/${pname}-${version}.tar.gz"; - hash = "sha256-Nok4oqTezO84q9IDZvgi33ZeKfRL+tpg7QEDmp2ZZpU="; + hash = "sha256-fmnlPhNCN6YR3lW2YCMEAbEiWVigcfFDq1tDQ1eTNkA="; }; buildInputs = [ gtk3 gdk-pixbuf ]; diff --git a/pkgs/applications/kde/neochat.nix b/pkgs/applications/kde/neochat.nix index 4df33add679..0b9f3c57f61 100644 --- a/pkgs/applications/kde/neochat.nix +++ b/pkgs/applications/kde/neochat.nix @@ -1,5 +1,6 @@ { mkDerivation , lib +, fetchpatch , cmake , extra-cmake-modules @@ -32,6 +33,14 @@ mkDerivation { pname = "neochat"; + patches = [ + (fetchpatch { + name = "libquotient-0.8.patch"; + url = "https://invent.kde.org/network/neochat/-/commit/d9d5e17be2a2057ab2ee545561fab721cb211f7f.patch"; + hash = "sha256-y1PEehFCW+69OH8YvL3SUGOb8Hhyf8xwRvSZzJ5J5Wc="; + }) + ]; + nativeBuildInputs = [ cmake extra-cmake-modules diff --git a/pkgs/applications/misc/goldendict-ng/default.nix b/pkgs/applications/misc/goldendict-ng/default.nix index 983b61b9317..eacea109cf2 100644 --- a/pkgs/applications/misc/goldendict-ng/default.nix +++ b/pkgs/applications/misc/goldendict-ng/default.nix @@ -26,6 +26,7 @@ , qtmultimedia , qtspeech , wrapQtAppsHook +, wrapGAppsHook }: stdenv.mkDerivation (finalAttrs: { @@ -39,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ZKbrO5L4KFmr2NsGDihRWBeW0OXHoPRwZGj6kt1Anc8="; }; - nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ]; + nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook wrapGAppsHook ]; buildInputs = [ qtbase qtsvg @@ -64,6 +65,13 @@ stdenv.mkDerivation (finalAttrs: { libzim ]; + # to prevent double wrapping of wrapQtApps and wrapGApps + dontWrapGApps = true; + + preFixup = '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + cmakeFlags = [ "-DWITH_XAPIAN=ON" "-DWITH_ZIM=ON" diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index 5fa0580c73b..2bb54b8b5bd 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -13,15 +13,15 @@ , olm }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "quaternion"; - version = "0.0.95.81"; + version = "0.0.96-beta4"; src = fetchFromGitHub { - owner = "QMatrixClient"; + owner = "quotient-im"; repo = "Quaternion"; - rev = "5f639d8c84ed1475057b2cb3f7d0cb0abe77203b"; - hash = "sha256-/1fich97oqSSDpfOjaYghYzHfu3MDrh77nanbIN/v/w="; + rev = "refs/tags/${version}"; + hash = "sha256-yItl31Ze48lRIIey+FlRLMVAkg4mHu8G1sFOceHvTJw="; }; buildInputs = [ @@ -36,6 +36,10 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake qttools wrapQtAppsHook ]; + cmakeFlags = [ + "-DBUILD_WITH_QT6=OFF" + ]; + postInstall = if stdenv.isDarwin then '' mkdir -p $out/Applications diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 46d5d97e437..6b2d7b380b9 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -36,14 +36,14 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "4.0.2"; + version = "4.0.3"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.xz"; - hash = "sha256-DmSO4NAkyAmUJe5g1BsnKSTsjhmADujxRBCQcIg0Ajw="; + hash = "sha256-iA29zo5zs/SAKggsShp8YZQ9vFhn16lWleTkY8ZTWpI="; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix index 52ad130b034..7cfa5088154 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "obs-tuna"; - version = "1.9.6"; + version = "1.9.7"; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ obs-studio qtbase zlib curl taglib dbus ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "univrsal"; repo = "tuna"; rev = "v${finalAttrs.version}"; - hash = "sha256-+AgRaivvYhogX4CLGK2ylvE8tQoauC/UMvXK6W0Tvog="; + hash = "sha256-NpfQ3zi+1kQNt2Lj4+1kX2bW9A/E2/MhUV1BA1UX4y0="; fetchSubmodules = true; }; diff --git a/pkgs/applications/virtualization/lima/bin.nix b/pkgs/applications/virtualization/lima/bin.nix index 26466823303..fab9d6b6801 100644 --- a/pkgs/applications/virtualization/lima/bin.nix +++ b/pkgs/applications/virtualization/lima/bin.nix @@ -9,31 +9,31 @@ }: let - version = "0.16.0"; + version = "0.17.0"; dist = { aarch64-darwin = rec { archSuffix = "Darwin-arm64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "092d586426f85c61263bd4822c22538b1585dc84d0369dccac936db758a17ce1"; + sha256 = "c1b6cd12d13a67918be0f85c1036c2fbc894ef91707cbb9a8c346c0cb371a4e5"; }; x86_64-darwin = rec { archSuffix = "Darwin-x86_64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "6c6278ddc2db080b4ad6a2f39ae36e6258efd6c696fbe599a5d389cfb9232aa1"; + sha256 = "cecefed3ae3aadc25b591973db51f89278589cb53605b17282b8afb7c38febab"; }; aarch64-linux = rec { archSuffix = "Linux-aarch64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "e33301878082cb73eb9bc4f267b91eb4895ac3c8303d56d4b86c1264563bfcff"; + sha256 = "b07fc3af272b7e86ea913a91722f46a8bc6361d74c2db9ca097c88852e444f1d"; }; x86_64-linux = rec { archSuffix = "Linux-x86_64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "be6093c2a9b0aa3c39cc5a5e39e79223c6d03f0e07ebadf70c3c128143672a84"; + sha256 = "1e455d4d1a213db2521aba3b1d282fcee70e5e42482f32177488539e8b35c103"; }; }; in diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index dcdac09004b..0c63cc5a9be 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -357,12 +357,20 @@ rec { ''; checkPhase = + # GHC (=> shellcheck) isn't supported on some platforms (such as risc-v) + # but we still want to use writeShellApplication on those platforms + let + shellcheckSupported = lib.meta.availableOn stdenv.buildPlatform shellcheck.compiler; + shellcheckCommand = lib.optionalString shellcheckSupported '' + # use shellcheck which does not include docs + # pandoc takes long to build and documentation isn't needed for just running the cli + ${lib.getExe (haskell.lib.compose.justStaticExecutables shellcheck.unwrapped)} "$target" + ''; + in if checkPhase == null then '' runHook preCheck ${stdenv.shellDryRun} "$target" - # use shellcheck which does not include docs - # pandoc takes long to build and documentation isn't needed for in nixpkgs usage - ${lib.getExe (haskell.lib.compose.justStaticExecutables shellcheck.unwrapped)} "$target" + ${shellcheckCommand} runHook postCheck '' else checkPhase; diff --git a/pkgs/development/embedded/openocd/default.nix b/pkgs/development/embedded/openocd/default.nix index 204d5794a30..954f043a2ad 100644 --- a/pkgs/development/embedded/openocd/default.nix +++ b/pkgs/development/embedded/openocd/default.nix @@ -25,7 +25,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ hidapi jimtcl libftdi1 libjaylink libusb1 ] - ++ lib.optional stdenv.isLinux libgpiod; + ++ + # tracking issue for v2 api changes https://sourceforge.net/p/openocd/tickets/306/ + lib.optional stdenv.isLinux (libgpiod.overrideAttrs (old: rec { + version = "1.6.4"; + src = fetchurl { + url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz"; + sha256 = "sha256-gp1KwmjfB4U2CdZ8/H9HbpqnNssqaKYwvpno+tGXvgo="; + }; + })); configureFlags = [ "--disable-werror" diff --git a/pkgs/development/libraries/libquotient/default.nix b/pkgs/development/libraries/libquotient/default.nix index 4bb5ca238a7..24661c082ae 100644 --- a/pkgs/development/libraries/libquotient/default.nix +++ b/pkgs/development/libraries/libquotient/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libquotient"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "quotient-im"; repo = "libQuotient"; rev = version; - hash = "sha256-Lq404O2VjZ8vlXOW+rhsvWDvZsNd3APNbv6AadQCjhk="; + hash = "sha256-ecTHiWbsNDIUz+Sadh2pVbDRZFzdMkZXBYSjy1JqZrk="; }; buildInputs = [ olm openssl qtbase qtmultimedia qtkeychain ]; diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 5f829009038..5ae5102abee 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -329,9 +329,6 @@ let propagatedBuildInputs = [ self.qtbase.dev buildPackages.makeBinaryWrapper ] ++ lib.optional stdenv.isLinux self.qtwayland.dev; } ../hooks/wrap-qt-apps-hook.sh; - } // lib.optionalAttrs config.allowAliases { - # remove before 23.11 - overrideScope' = lib.warn "qt5 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"." self.overrideScope; }; in makeScopeWithSplicing (generateSplicesForMkScope "qt5") (_: {}) (_: {}) addPackages diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix index 61f57f07626..5d26f33f45e 100644 --- a/pkgs/development/lisp-modules/packages.nix +++ b/pkgs/development/lisp-modules/packages.nix @@ -799,6 +799,22 @@ let ]; }; + sb-cga = build-asdf-system { + pname = "sb-cga"; + version = "1.0.1"; + src = pkgs.fetchFromGitHub { + owner = "nikodemus"; + repo = "sb-cga"; + rev = "9a554ea1c01cac998ff7eaa5f767bc5bcdc4c094"; + sha256 = "sha256-iBM+VXu6JRqGmeIFzfXbGot+elvangmfSpDB7DjFpPg"; + }; + lispLibs = [ super.alexandria ]; + }; + + nsb-cga = super.nsb-cga.overrideLispAttrs (oa: { + lispLibs = oa.lispLibs ++ [ self.sb-cga ]; + }); + }); in packages diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index ab46608dde4..3bd13e272b9 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.62"; + version = "9.2.63"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-a4YRbFOnBTGte52wYlAsh9o4+x+dugHGhU6kboSdU2c="; + hash = "sha256-Hg8KSReRHOmdoN8CZiX8i8Xdrn5/Gnqmx1QE6elV6qA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioaladdinconnect/default.nix b/pkgs/development/python-modules/aioaladdinconnect/default.nix index 42f8f3fb7bf..0095813f32c 100644 --- a/pkgs/development/python-modules/aioaladdinconnect/default.nix +++ b/pkgs/development/python-modules/aioaladdinconnect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioaladdinconnect"; - version = "0.1.56"; + version = "0.1.57"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "AIOAladdinConnect"; inherit version; - hash = "sha256-YLAIT33ItaNgokwensOan/OO2lK01GO/u5AZwzvuoPo="; + hash = "sha256-NPcrGViqrUcjuzqmsI0bXxqxcyoZ9Xp/5z4BPemdjrY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 9d06b45a3c2..bd2c248119c 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.62"; + version = "9.2.63"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-GyX0LBXABRRQj3bVW8whxp2T5CSPnfI/Vjlj5V4MqrE="; + hash = "sha256-vrcziVoH+P0cqnzalwZOyu7awidQ0Lv6vT6Uq9Pu4I0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 58b6cc6c6fd..61ec6057975 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.62"; + version = "9.2.63"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7PNwJMsX3Z/j+zy9CgEvCRpbyJi9qI7ex6KJXwkywgU="; + hash = "sha256-10ocfA1JFHyZA8Uv5b209rOjY5OeBtKITnoiRaw/w7k="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index e9b2ded49a2..4bd30c929b9 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.62"; + version = "9.2.63"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-rjHz0NfxUzEQxDD4XiUlIr/RltXN7GKRojWs/nxs1ac="; + hash = "sha256-p5fJ5+YFQIs397eVFxtMMJj/FwfH97CY1HjFJqPVVc0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 17e09f785ff..84f6b5f21cc 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,7 +16,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.62"; + version = "9.2.63"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-w1U9/Hvu64ULWQouE5gFRxtfUcNdKIIWACaYXtvlCtE="; + hash = "sha256-rCopCv7CPx04MYW1HkP0RP4NRZZlKtD4D8854FqIu10="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cmdstanpy/default.nix b/pkgs/development/python-modules/cmdstanpy/default.nix new file mode 100644 index 00000000000..f8960fadb3a --- /dev/null +++ b/pkgs/development/python-modules/cmdstanpy/default.nix @@ -0,0 +1,82 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, substituteAll + +, cmdstan + +, pandas +, numpy +, tqdm +, xarray + +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "cmdstanpy"; + version = "1.1.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "stan-dev"; + repo = "cmdstanpy"; + rev = "refs/tags/v${version}"; + hash = "sha256-9kAd3rbSctWEhAzB6RiQlbg5/uVxGIghYLus8hWzBFQ="; + }; + + patches = [ + (substituteAll { + src = ./use-nix-cmdstan-path.patch; + cmdstan = "${cmdstan}/opt/cmdstan"; + }) + ]; + + postPatch = '' + # conftest.py would have used git to clean up, which is unnecessary here + rm test/conftest.py + ''; + + propagatedBuildInputs = [ + pandas + numpy + tqdm + ]; + + passthru.optional-dependencies = { + all = [ xarray ]; + }; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + nativeCheckInputs = [ + pytestCheckHook + ] ++ passthru.optional-dependencies.all; + + disabledTestPaths = [ + # No need to test these when using Nix + "test/test_install_cmdstan.py" + "test/test_cxx_installation.py" + ]; + + disabledTests = [ + "test_lp_good" # Fails for some reason + "test_serialization" # Pickle class mismatch errors + # These tests use the flag -DSTAN_THREADS which doesn't work in cmdstan (missing file) + "test_multi_proc_threads" + "test_compile_force" + ]; + + pythonImportsCheck = [ "cmdstanpy" ]; + + meta = { + homepage = "https://github.com/stan-dev/cmdstanpy"; + description = "A lightweight interface to Stan for Python users"; + changelog = "https://github.com/stan-dev/cmdstanpy/releases/tag/v${version}"; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ tomasajt ]; + }; +} diff --git a/pkgs/development/python-modules/cmdstanpy/use-nix-cmdstan-path.patch b/pkgs/development/python-modules/cmdstanpy/use-nix-cmdstan-path.patch new file mode 100644 index 00000000000..5f8df43c799 --- /dev/null +++ b/pkgs/development/python-modules/cmdstanpy/use-nix-cmdstan-path.patch @@ -0,0 +1,25 @@ +diff --git a/cmdstanpy/utils/cmdstan.py b/cmdstanpy/utils/cmdstan.py +index 227d97a..27c3ccc 100644 +--- a/cmdstanpy/utils/cmdstan.py ++++ b/cmdstanpy/utils/cmdstan.py +@@ -163,19 +163,7 @@ def cmdstan_path() -> str: + if 'CMDSTAN' in os.environ and len(os.environ['CMDSTAN']) > 0: + cmdstan = os.environ['CMDSTAN'] + else: +- cmdstan_dir = os.path.expanduser(os.path.join('~', _DOT_CMDSTAN)) +- if not os.path.exists(cmdstan_dir): +- raise ValueError( +- 'No CmdStan installation found, run command "install_cmdstan"' +- 'or (re)activate your conda environment!' +- ) +- latest_cmdstan = get_latest_cmdstan(cmdstan_dir) +- if latest_cmdstan is None: +- raise ValueError( +- 'No CmdStan installation found, run command "install_cmdstan"' +- 'or (re)activate your conda environment!' +- ) +- cmdstan = os.path.join(cmdstan_dir, latest_cmdstan) ++ cmdstan = '@cmdstan@' + os.environ['CMDSTAN'] = cmdstan + validate_cmdstan_path(cmdstan) + return os.path.normpath(cmdstan) diff --git a/pkgs/development/python-modules/crytic-compile/default.nix b/pkgs/development/python-modules/crytic-compile/default.nix index 07e5c19f8d2..4e725dd8cde 100644 --- a/pkgs/development/python-modules/crytic-compile/default.nix +++ b/pkgs/development/python-modules/crytic-compile/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "crytic-compile"; - version = "0.3.3"; + version = "0.3.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "crytic"; repo = "crytic-compile"; rev = "refs/tags/${version}"; - hash = "sha256-Nx3eKy/0BLg82o3qDHjxcHXtpX3KDdnBKYwCuTLWRUE="; + hash = "sha256-CeoACtgvMweDbIvYguK2Ca+iTBFONWcE2b0qUkBbQSU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index 70b11a9f23f..51275aafc4c 100644 --- a/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.15.4"; + version = "0.16.1"; format = "pyproject"; src = fetchFromGitHub { owner = "tianocore"; repo = "edk2-pytool-library"; rev = "v${version}"; - hash = "sha256-jGZa1qfI/OybwgG2L4N1hICHpWZTufgElpl31EhU+O4="; + hash = "sha256-iVNie2VFyqzDdXtgnbZDzeIXsDEm6ugjIPJexLwHqeI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/lunarcalendar/default.nix b/pkgs/development/python-modules/lunarcalendar/default.nix new file mode 100644 index 00000000000..e5233fec6cb --- /dev/null +++ b/pkgs/development/python-modules/lunarcalendar/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +, python-dateutil +, ephem +, pytz + +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "lunarcalendar"; + version = "0.0.9"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "wolfhong"; + repo = "LunarCalendar"; + rev = "885418ea1a2a90b7e0bbe758919af9987fb2863b"; + hash = "sha256-AhxCWWqCjlOroqs4pOSZTWoIQT8a1l/D2Rxuw1XUoU8="; + }; + + propagatedBuildInputs = [ + python-dateutil + ephem + pytz + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "lunarcalendar" ]; + + meta = { + homepage = "https://github.com/wolfhong/LunarCalendar"; + description = "A Lunar-Solar Converter, containing a number of lunar and solar festivals in China"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tomasajt ]; + }; +} diff --git a/pkgs/development/python-modules/prophet/default.nix b/pkgs/development/python-modules/prophet/default.nix new file mode 100644 index 00000000000..7bb71fb778b --- /dev/null +++ b/pkgs/development/python-modules/prophet/default.nix @@ -0,0 +1,84 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, fetchpatch + +, setuptools + +, cmdstanpy +, numpy +, matplotlib +, pandas +, lunarcalendar +, convertdate +, holidays +, python-dateutil +, tqdm +, importlib-resources + +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "prophet"; + version = "1.1.4"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "facebook"; + repo = "prophet"; + rev = "refs/tags/v${version}"; + hash = "sha256-pbJ0xL5wDZ+rKgtQQTJPsB1Mu2QXo3S9MMpiYkURsz0="; + }; + + patches = [ + # TODO: remove when bumping version from 1.1.4 + (fetchpatch { + name = "fix-stan-file-temp-dest.patch"; + url = "https://github.com/facebook/prophet/commit/374676500795aec9d5cbc7fe5f7a96bf00489809.patch"; + hash = "sha256-sfiQ2V3ZEF0WM9oM1FkL/fhZesQJ1i2EUPYJMdDA2UM="; + relative = "python"; + }) + ]; + + sourceRoot = "source/python"; + + env.PROPHET_REPACKAGE_CMDSTAN = "false"; + + nativeBuildInputs = [ setuptools ]; + + # TODO: update when bumping version from 1.1.4 + propagatedBuildInputs = [ + cmdstanpy + numpy + matplotlib + pandas + lunarcalendar + convertdate + holidays + python-dateutil + tqdm + importlib-resources + ]; + + preCheck = '' + # the generated stan_model directory only exists in build/lib* + cd build/lib* + ''; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "prophet" ]; + + meta = { + homepage = "https://facebook.github.io/prophet/"; + description = "A tool for producing high quality forecasts for time series data that has multiple seasonality with linear or non-linear growth"; + changelog = "https://github.com/facebook/prophet/releases/tag/v${version}"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ tomasajt ]; + }; +} diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index b6d3593b94c..567abbf06d1 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.62"; + version = "9.2.63"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-eBmmXdtYeG6O8Wdt0Gye78/6dt+XZznXyEzlv9WFwcI="; + hash = "sha256-HuAyI+X9XDcIJQw6+O1TrFdSsA0TNZpW5MAm70ox24c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index 29e9dbdfd37..a1889d56098 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "yalexs"; - version = "1.5.1"; + version = "1.5.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-8aOLDjWZOqAsnldxUtUBcuT7pBbZHPnPSmQCF/oqNYw="; + hash = "sha256-IkjRoomRcUQSTLloLpiyO2Llk3NZYxbx0oeH8TCVAHc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 82394980fcf..c19c59d730b 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre }: stdenvNoCC.mkDerivation rec { - version = "10.12.1"; + version = "10.12.2"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-K6pQjcvofybGEtRz1sTVhP534SoJsChg2psngVMIyrY="; + sha256 = "sha256-0vv04vPROCDjFo/mqkH4GXKEB8PvbU7qryGu+mzmShM="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/development/tools/java/dex2jar/default.nix b/pkgs/development/tools/java/dex2jar/default.nix index 6ac1d0dbb1c..97fa2298b05 100644 --- a/pkgs/development/tools/java/dex2jar/default.nix +++ b/pkgs/development/tools/java/dex2jar/default.nix @@ -1,18 +1,18 @@ -{ stdenv -, lib +{ lib +, stdenvNoCC , fetchurl , jre , makeWrapper , unzip }: -stdenv.mkDerivation rec { - name = "${pname}-${version}"; + +stdenvNoCC.mkDerivation (finalAttrs: { pname = "dex2jar"; - version = "2.0"; + version = "2.1"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${name}.zip"; - sha256 = "1g3mrbyl8sdw1nhp17z23qbfzqpa0w2yxrywgphvd04jdr6yn1vr"; + url = "https://github.com/pxb1988/dex2jar/releases/download/v${finalAttrs.version}/dex2jar-${finalAttrs.version}.zip"; + hash = "sha256-epvfhD1D3k0elOwue29VglAXsMSn7jn/gmYOJJOkbwg="; }; nativeBuildInputs = [ makeWrapper unzip ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - f=$out/lib/dex2jar/ + f=$out/share/dex2jar/ mkdir -p $f $out/bin @@ -35,10 +35,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://sourceforge.net/projects/dex2jar/"; + homepage = "https://github.com/pxb1988/dex2jar"; description = "Tools to work with android .dex and java .class files"; maintainers = with maintainers; [ makefu ]; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix index d0d69fa2695..143c6ee74dd 100644 --- a/pkgs/development/tools/misc/blackfire/default.nix +++ b/pkgs/development/tools/misc/blackfire/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2.19.0"; + version = "2.20.0"; src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}"); @@ -57,23 +57,23 @@ stdenv.mkDerivation rec { sources = { "x86_64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - sha256 = "hzHRloC0KSKzXpdheqqqFmjVS6IGXV7r5vo1OiW5Dms="; + sha256 = "zsG527W8/gr6wqbHfzOuihf/a8k4QeFdU6ajlJgGncs="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "GUbSB7MRtiYSvgrW1oBbQhhJg7SkPAWegw6UNxZIG9I="; + sha256 = "0ov+VJSJleI0aiMiZ+KdtQJ6nYcI6NZxZiShWGhV9N0="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "ayA+vIcSIKjivlJAKoXAfvAt1VIgthipC6SzPD/2dqI="; + sha256 = "IEyAR6C2px2C/LEHLW5ZBamhmveCBwcgmm6w7KW6Cyg="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "7TTcWHL6JWJAW4faEeGvSYQKEbdibEpQvIH9n96BcTA="; + sha256 = "fD8iNRSY860hBiZ4uFqDO1LCa49/gyC9M2rBlvm2ZWI="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "Dk4cSfukFBcnjwATfcQU6R+i2phVsfXMAwFb/iFjFAg="; + sha256 = "E6UuLldO7N59PAkzR49FXJZYJ15yGbePtHVdacwyJ20="; }; }; diff --git a/pkgs/development/tools/regclient/default.nix b/pkgs/development/tools/regclient/default.nix index 80ef11cfc01..383410de870 100644 --- a/pkgs/development/tools/regclient/default.nix +++ b/pkgs/development/tools/regclient/default.nix @@ -4,16 +4,16 @@ let bins = [ "regbot" "regctl" "regsync" ]; in buildGoModule rec { pname = "regclient"; - version = "0.5.0"; + version = "0.5.1"; tag = "v${version}"; src = fetchFromGitHub { owner = "regclient"; repo = "regclient"; rev = tag; - sha256 = "sha256-CkZh4wIxw4LdioOw48JQYgFkqK6A/gkAPuMNf5UpVXk="; + sha256 = "sha256-mlwEUVMUXK2V8jzwDb51xjJElHhqioAsbq65R7rNS/Q="; }; - vendorHash = "sha256-55qJRYPdWyodMxkz9rLd/ukKkw9XXqe5CLcUP0Z8z8s="; + vendorHash = "sha256-AeC5Zv30BLkqaAPnWDrpGaJnhFoNJ9UgQaLEUmqXgb0="; outputs = [ "out" ] ++ bins; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index efbcdead6f8..2b27d621821 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -1035,6 +1035,10 @@ let # Fresh toolchains frequently break -Werror build for minor issues. WERROR = whenAtLeast "5.15" no; + + # > CONFIG_KUNIT should not be enabled in a production environment. Enabling KUnit disables Kernel Address-Space Layout Randomization (KASLR), and tests may affect the state of the kernel in ways not suitable for production. + # https://www.kernel.org/doc/html/latest/dev-tools/kunit/start.html + KUNIT = no; } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") { # Enable CPU/memory hotplug support # Allows you to dynamically add & remove CPUs/memory to a VM client running NixOS without requiring a reboot diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 582dd939689..3e63a4a54d8 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -5,8 +5,8 @@ let # Compare with https://github.com/draios/sysdig/blob/dev/cmake/modules/falcosecurity-libs.cmake - libsRev = "0.11.3"; - libsSha256 = "sha256-ph4ErNfgVv2aesZawCj+7kdqcYAnRgeNHfSrDMgm6Lo="; + libsRev = "59fb313475b82f842e9e9bbc1e0e629428c0a4cf"; + libsSha256 = "sha256-IjzLbCOpB6EgPDgkGIyg1dNxHfYgU10OLgXrDOPmoTs="; # Compare with https://github.com/falcosecurity/libs/blob/master/cmake/modules/valijson.cmake#L17 valijson = fetchFromGitHub { @@ -20,22 +20,30 @@ let driver = fetchFromGitHub { owner = "falcosecurity"; repo = "libs"; - rev = "5.0.1+driver"; - sha256 = "sha256-CQ6QTcyTnThpJHDXgOM1Zdp5SG7rngp9XtEM+2mS8ro="; + rev = libsRev; + sha256 = libsSha256; }; in stdenv.mkDerivation rec { pname = "sysdig"; - version = "0.32.0"; + version = "0.33.1"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "sha256-R14uQdcZ2BnlgWjqvRQP8MDaKMk4Kfw17qTKYYlBg7o="; + sha256 = "sha256-qcJ9EcePrsKic+wgsck+pTrRdQic0xhzguH4EYVP0gk="; }; + patches = [ + # https://github.com/draios/sysdig/pull/2024 + (fetchpatch { + url = "https://github.com/draios/sysdig/commit/d9515aad2be660b2ba7ec8c0b4fb2467a10434af.patch"; + sha256 = "sha256-3m+Rn8BZS8U8QTBDJ6x7kQbH6BE3HKgt1iNnRjPEr8k="; + }) + ]; + nativeBuildInputs = [ cmake perl installShellFiles pkg-config ]; buildInputs = [ luajit diff --git a/pkgs/servers/guacamole-client/default.nix b/pkgs/servers/guacamole-client/default.nix index dde48ffc244..d4e94dea0da 100644 --- a/pkgs/servers/guacamole-client/default.nix +++ b/pkgs/servers/guacamole-client/default.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "guacamole-client"; - version = "1.5.2"; + version = "1.5.3"; src = fetchurl { url = "https://archive.apache.org/dist/guacamole/${finalAttrs.version}/binary/guacamole-${finalAttrs.version}.war"; - hash = "sha256-hu/DABbkA4lI2MGlw3oLBeONrdMQTbbsA3VbxuMRHEA="; + hash = "sha256-FaNObtbPbwP+IPkPZ9LWCXE6ic08syT4nt8edpbm7WE="; }; dontUnpack = true; diff --git a/pkgs/servers/guacamole-server/default.nix b/pkgs/servers/guacamole-server/default.nix index 202088c58c2..8f14e7d9545 100644 --- a/pkgs/servers/guacamole-server/default.nix +++ b/pkgs/servers/guacamole-server/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "guacamole-server"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "apache"; repo = "guacamole-server"; rev = finalAttrs.version; - hash = "sha256-L1hFZ24kwTSHwqCUslnt5cBKkNh1cpVxu1ntTN1gFr0="; + hash = "sha256-8VPhaZ+XnbDElF5MOpbA8MDDTUkou9O2z4NUdWwW4FM="; }; NIX_CFLAGS_COMPILE = [ @@ -89,8 +89,8 @@ stdenv.mkDerivation (finalAttrs: { description = "Clientless remote desktop gateway"; homepage = "https://guacamole.apache.org/"; license = lib.licenses.asl20; + mainProgram = "guacd"; maintainers = [ lib.maintainers.drupol ]; platforms = [ "x86_64-linux" "i686-linux" ]; - mainProgram = "guacd"; }; }) diff --git a/pkgs/tools/networking/ddns-go/default.nix b/pkgs/tools/networking/ddns-go/default.nix index 97b34f85a54..10b9beafb7b 100644 --- a/pkgs/tools/networking/ddns-go/default.nix +++ b/pkgs/tools/networking/ddns-go/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ddns-go"; - version = "5.5.1"; + version = "5.6.0"; src = fetchFromGitHub { owner = "jeessy2"; repo = pname; rev = "v${version}"; - hash = "sha256-fjfY0QLXewbjpoTbPjSEyrTXppzZ/LjvkFjc782Scp0="; + hash = "sha256-w9/5n5QKx+pNiA0wBTjjwllsAvsGUH53buwmx2CIZIg="; }; vendorHash = "sha256-azsXfWa4w3wZaiy9AKy7UPOybikubcJvLsXthYedmbY="; diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index 609d0da08af..9259c7e21f1 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -50,7 +50,13 @@ in , util-linuxMinimal , xz -, enableDocumentation ? !atLeast24 || stdenv.hostPlatform == stdenv.buildPlatform +, enableDocumentation ? !atLeast24 || ( + (stdenv.hostPlatform == stdenv.buildPlatform) && + # mdbook errors out on risc-v due to a rustc bug + # https://github.com/NixOS/nixpkgs/pull/242019 + # https://github.com/rust-lang/rust/issues/114473 + !stdenv.buildPlatform.isRiscV + ) , enableStatic ? stdenv.hostPlatform.isStatic , withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp , withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp, libseccomp diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fa5e16e5a80..38e2b3062e9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2041,6 +2041,8 @@ self: super: with self; { cmdline = callPackage ../development/python-modules/cmdline { }; + cmdstanpy = callPackage ../development/python-modules/cmdstanpy { }; + cmigemo = callPackage ../development/python-modules/cmigemo { inherit (pkgs) cmigemo; }; @@ -6168,6 +6170,8 @@ self: super: with self; { luhn = callPackage ../development/python-modules/luhn { }; + lunarcalendar = callPackage ../development/python-modules/lunarcalendar { }; + luqum = callPackage ../development/python-modules/luqum { }; luxor = callPackage ../development/python-modules/luxor { }; @@ -8029,6 +8033,8 @@ self: super: with self; { prodict = callPackage ../development/python-modules/prodict { }; + prophet = callPackage ../development/python-modules/prophet { }; + propka = callPackage ../development/python-modules/propka { }; proxy_tools = callPackage ../development/python-modules/proxy_tools { };