diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index d4ed269efc6c..87876867c572 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -221,7 +221,7 @@ in
type = lib.types.package;
default = pkgs.zfs;
defaultText = lib.literalExpression "pkgs.zfs";
- description = "Configured ZFS userland tools package, use `pkgs.zfs_unstable` if you want to track the latest staging ZFS branch.";
+ description = "Configured ZFS userland tools package.";
};
modulePackage = lib.mkOption {
diff --git a/pkgs/applications/audio/easyaudiosync/0001-fix-project-name.patch b/pkgs/applications/audio/easyaudiosync/0001-fix-project-name.patch
index ed7a462d02c6..ebd13112e796 100644
--- a/pkgs/applications/audio/easyaudiosync/0001-fix-project-name.patch
+++ b/pkgs/applications/audio/easyaudiosync/0001-fix-project-name.patch
@@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7065538..b2716e1 100644
+index 34f3094..b161ba8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ if (VCPKG)
@@ -8,6 +8,6 @@ index 7065538..b2716e1 100644
-project("Easy Audio Sync"
+project("easyaudiosync"
- VERSION 1.1.1
+ VERSION 1.1.2
DESCRIPTION "Audio library syncing and conversion utility"
HOMEPAGE_URL "https://github.com/complexlogic/EasyAudioSync"
diff --git a/pkgs/applications/audio/easyaudiosync/0002-fix-qt67-deprecated-methods.patch b/pkgs/applications/audio/easyaudiosync/0002-fix-qt67-deprecated-methods.patch
deleted file mode 100644
index 523c1821a10f..000000000000
--- a/pkgs/applications/audio/easyaudiosync/0002-fix-qt67-deprecated-methods.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index e7befae..8689f13 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -43,11 +43,14 @@ configure_file("${PROJECT_SOURCE_DIR}/translations/languages.hpp.in" "${PROJECT_
-
- # Make lupdate target for Qt 6
- if (${QT_VERSION} VERSION_GREATER_EQUAL "6")
-- qt_add_lupdate(${EXECUTABLE_NAME}
-+ qt_add_lupdate(
- TS_FILES ${TS_FILES} "${PROJECT_SOURCE_DIR}/translations/source.ts"
-+ SOURCE_TARGETS ${EXECUTABLE_NAME}
- )
- endif ()
--qt_add_translation(QM_FILES "${TS_FILES}")
-+qt_add_translations(
-+ ${EXECUTABLE_NAME}
-+)
- foreach (FILE ${QM_FILES})
- get_filename_component(BASENAME ${FILE} NAME)
- string(APPEND TRANSLATION_FILES " ${BASENAME}\n")
diff --git a/pkgs/applications/audio/easyaudiosync/default.nix b/pkgs/applications/audio/easyaudiosync/default.nix
index 38fe6b15d937..b5f6a522ff5a 100644
--- a/pkgs/applications/audio/easyaudiosync/default.nix
+++ b/pkgs/applications/audio/easyaudiosync/default.nix
@@ -15,18 +15,17 @@
stdenv.mkDerivation rec {
pname = "easyaudiosync";
- version = "1.1.1";
+ version = "1.1.2";
src = fetchFromGitHub {
owner = "complexlogic";
repo = "EasyAudioSync";
rev = "v${version}";
- hash = "sha256-w98tj9BuixPhuDgwn74EYY0gvKH6kbfQmtg030RWRU0=";
+ hash = "sha256-UCOL4DzynKjNDvS0HZ4/K+Wn5lOqHZ0bNop0zqJl5kc=";
};
patches = [
./0001-fix-project-name.patch
- ./0002-fix-qt67-deprecated-methods.patch
./0003-fix-darwin-app.patch
./0004-force-qt6.patch
];
diff --git a/pkgs/applications/audio/grandorgue/darwin-fixes.patch b/pkgs/applications/audio/grandorgue/darwin-fixes.patch
new file mode 100644
index 000000000000..f38a1dded2ec
--- /dev/null
+++ b/pkgs/applications/audio/grandorgue/darwin-fixes.patch
@@ -0,0 +1,13 @@
+diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
+index d231e3d1..73f389a2 100644
+--- a/resources/CMakeLists.txt
++++ b/resources/CMakeLists.txt
+@@ -62,7 +62,7 @@ if(WIN32)
+ DEPENDS "${CMAKE_SOURCE_DIR}/resources/GrandOrgue.manifest")
+ LIST(APPEND DEPLIST "${RESOURCEDIR}/GOIcon.ico" "${RESOURCEDIR}/GrandOrgue.rc" "${RESOURCEDIR}/GrandOrgue.manifest")
+ elseif(APPLE)
+- ADD_CUSTOM_COMMAND(OUTPUT "${RESOURCEDIR}/GrandOrgue.icns" COMMAND iconutil -c icns --output "${RESOURCEDIR}/GrandOrgue.icns" ${GENERATED_ICONS_DIR} DEPENDS ${GENERATED_ICONS})
++ ADD_CUSTOM_COMMAND(OUTPUT "${RESOURCEDIR}/GrandOrgue.icns" COMMAND png2icns "${RESOURCEDIR}/GrandOrgue.icns" ${GENERATED_ICONS_DIR}/*{16,32,128,256,512,1024}.png DEPENDS ${GENERATED_ICONS})
+ INSTALL(FILES "${RESOURCEDIR}/GrandOrgue.icns" DESTINATION "${RESOURCEINSTDIR}")
+ LIST(APPEND DEPLIST "${RESOURCEDIR}/GrandOrgue.icns")
+ elseif(UNIX)
diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix
index 771bef276221..7b3be4d9bb0d 100644
--- a/pkgs/applications/audio/grandorgue/default.nix
+++ b/pkgs/applications/audio/grandorgue/default.nix
@@ -21,22 +21,17 @@
stdenv.mkDerivation rec {
pname = "grandorgue";
- version = "3.15.1-1";
+ version = "3.15.2-1";
src = fetchFromGitHub {
owner = "GrandOrgue";
repo = "grandorgue";
rev = version;
fetchSubmodules = true;
- hash = "sha256-5uAA878OBc04PkUgCwoRtc6lIASivq3YcfFffTae6uM=";
+ hash = "sha256-U0DAWCzhXqdL2klSFQjnLiWp7yTdw/n0dmNUJSAg/5c=";
};
- postPatch = ''
- substituteInPlace resources/CMakeLists.txt \
- --replace \
- "iconutil -c icns \''${GENERATED_ICONS_DIR}" \
- "png2icns \''${GENERATED_ICONS_DIR}/../GrandOrgue.icns \''${GENERATED_ICONS_DIR}/*{16,32,128,256,512,1024}.png" \
- '';
+ patches = [ ./darwin-fixes.patch ];
nativeBuildInputs = [ cmake pkg-config imagemagick libicns makeWrapper ];
diff --git a/pkgs/applications/audio/r128gain/default.nix b/pkgs/applications/audio/r128gain/default.nix
index 5444ffb4a178..7ff5a13b775e 100644
--- a/pkgs/applications/audio/r128gain/default.nix
+++ b/pkgs/applications/audio/r128gain/default.nix
@@ -9,13 +9,13 @@
python3Packages.buildPythonApplication rec {
pname = "r128gain";
- version = "1.0.3";
+ version = "1.0.7";
src = fetchFromGitHub {
owner = "desbma";
repo = "r128gain";
rev = version;
- sha256 = "0w2i2szajv1vcmc96w0fczdr8xc28ijcf1gdg180f21gi6yh96sc";
+ sha256 = "sha256-JyKacDqjIKTNl2GjbJPkgbakF8HR4Jd4czAtOaemDH8=";
};
patches = [
diff --git a/pkgs/applications/audio/r128gain/ffmpeg-location.patch b/pkgs/applications/audio/r128gain/ffmpeg-location.patch
index c01f115c1d6d..53d755cdae41 100644
--- a/pkgs/applications/audio/r128gain/ffmpeg-location.patch
+++ b/pkgs/applications/audio/r128gain/ffmpeg-location.patch
@@ -1,29 +1,31 @@
---- i/r128gain/__init__.py
-+++ w/r128gain/__init__.py
-@@ -78,7 +78,7 @@ def get_ffmpeg_lib_versions(ffmpeg_path=None):
- Example: 0x3040100 for FFmpeg 3.4.1
- """
- r = collections.OrderedDict()
-- cmd = (ffmpeg_path or "ffmpeg", "-version")
-+ cmd = (ffmpeg_path or "@ffmpeg@/bin/ffmpeg", "-version")
- output = subprocess.run(cmd,
- check=True,
- stdout=subprocess.PIPE,
-@@ -156,7 +156,7 @@ def get_r128_loudness(audio_filepaths, *, calc_peak=True, enable_ffmpeg_threadin
- os.devnull,
- **additional_ffmpeg_args,
- f="null").global_args("-hide_banner", "-nostats"),
-- cmd=ffmpeg_path or "ffmpeg")
-+ cmd=ffmpeg_path or "@ffmpeg@/bin/ffmpeg")
+diff --git a/r128gain/__init__.py b/r128gain/__init__.py
+index 79a5cbd..d8f13ba 100755
+--- a/r128gain/__init__.py
++++ b/r128gain/__init__.py
+@@ -86,7 +86,7 @@ def get_ffmpeg_lib_versions(ffmpeg_path: Optional[str] = None) -> Dict[str, int]
+ Example: 0x3040100 for FFmpeg 3.4.1
+ """
+ r = collections.OrderedDict()
+- cmd = (ffmpeg_path or "ffmpeg", "-version")
++ cmd = (ffmpeg_path or "@ffmpeg@/bin/ffmpeg", "-version")
+ output_str = subprocess.run(cmd, check=True, stdout=subprocess.PIPE, universal_newlines=True).stdout
+ output_lines = output_str.splitlines()
+ lib_version_regex = re.compile(r"^\s*(lib[a-z]+)\s+([0-9]+).\s*([0-9]+).\s*([0-9]+)\s+")
+@@ -194,7 +194,7 @@ def get_r128_loudness( # noqa: C901
+ ffmpeg.output(*output_streams, os.devnull, **additional_ffmpeg_args, f="null").global_args(
+ "-hide_banner", "-nostats"
+ ),
+- cmd=ffmpeg_path or "ffmpeg",
++ cmd=ffmpeg_path or "@ffmpeg@/bin/ffmpeg",
+ )
- # run
- logger().debug(cmd_to_string(cmd))
-@@ -740,7 +740,7 @@ def cl_main():
- help="Maximum number of tracks to scan in parallel. If not specified, autodetect CPU count")
- arg_parser.add_argument("-f",
- "--ffmpeg-path",
-- default=shutil.which("ffmpeg"),
-+ default="@ffmpeg@/bin/ffmpeg",
- help="""Full file path of ffmpeg executable (only needed if not in PATH).
- If not specified, autodetect""")
- arg_parser.add_argument("-d",
+ # run
+@@ -885,7 +885,7 @@ def cl_main() -> None:
+ arg_parser.add_argument(
+ "-f",
+ "--ffmpeg-path",
+- default=shutil.which("ffmpeg"),
++ default="@ffmpeg@/bin/ffmpeg",
+ help="""Full file path of ffmpeg executable (only needed if not in PATH).
+ If not specified, autodetect""",
+ )
diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix
index 121d62219db0..70f5dd604296 100644
--- a/pkgs/applications/editors/mg/default.nix
+++ b/pkgs/applications/editors/mg/default.nix
@@ -1,6 +1,6 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, buildPackages }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, buildPackages, darwin }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "mg";
version = "7.3-unstable-2024-06-04";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ ncurses ];
+ buildInputs = [ ncurses ] ++ lib.optional stdenv.isDarwin [ darwin.libutil ];
meta = with lib; {
description = "Micro GNU/emacs, a portable version of the mg maintained by the OpenBSD team";
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 89cd38c92bf5..336021bcfb1a 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1122,8 +1122,8 @@ let
mktplcRef = {
name = "dbclient-jdbc";
publisher = "cweijan";
- version = "1.3.4";
- hash = "sha256-qknooeedRhTvEWSuGXFoO/BczGanYCdMr7WWjthxG+k=";
+ version = "1.3.6";
+ hash = "sha256-CETB2hLaXD7DuNmop/DHjpI8NgHfMGyMMZyfw/Bt1yc=";
};
meta = {
description = "JDBC Adapter For Database Client";
@@ -1724,8 +1724,8 @@ let
mktplcRef = {
name = "vsc-material-theme-icons";
publisher = "Equinusocio";
- version = "3.5.0";
- hash = "sha256-XqtyZVlsPaPkKB9HdigKSXjCwqXe9wzJWeRcPpS6EVM=";
+ version = "3.8.8";
+ hash = "sha256-el2hQaq1gZBn2PZ+f+S1fHM/g3V0sX7Chyre04sds8k=";
};
meta = {
description = "Material Theme Icons, the most epic icons theme for Visual Studio Code and Material Theme";
@@ -1852,8 +1852,8 @@ let
mktplcRef = {
name = "vscode-jest-runner";
publisher = "firsttris";
- version = "0.4.72";
- hash = "sha256-1nUpOXdteWsyFYJ2uATCcr1SUbeusmbpa09Bkw9/TZM=";
+ version = "0.4.74";
+ hash = "sha256-35Ix6B/vkYQIky9KYsMsxgmRh1LYzBoRs9pMe8M5/rI=";
};
meta = {
description = "Simple way to run or debug a single (or multiple) tests from context-menu";
@@ -2262,8 +2262,8 @@ let
mktplcRef = {
name = "HCL";
publisher = "HashiCorp";
- version = "0.3.2";
- hash = "sha256-cxF3knYY29PvT3rkRS8SGxMn9vzt56wwBXpk2PqO0mo=";
+ version = "0.6.0";
+ hash = "sha256-Za2ODrsHR/y0X/FOhVEtbg6bNs439G6rlBHW84EZS60=";
};
meta = {
description = "HashiCorp HCL syntax";
@@ -3972,8 +3972,8 @@ let
mktplcRef = {
name = "ansible";
publisher = "redhat";
- version = "2.12.143";
- hash = "sha256-NEV7sVYJJvapZjk5sylkzijH8qLZ7xzmBzHI7qcj2Ok=";
+ version = "24.10.0";
+ hash = "sha256-NDIGyVCo3Az6oncnKR9PXXnZ4ynwF7HBeIiNyiGTPko=";
};
meta = {
description = "Ansible language support";
@@ -4564,8 +4564,8 @@ let
mktplcRef = {
name = "vscode-stylelint";
publisher = "stylelint";
- version = "1.3.0";
- hash = "sha256-JoCa2d0ayBEuCcQi3Z/90GJ4AIECVz8NCpd+i+9uMeA=";
+ version = "1.4.0";
+ hash = "sha256-CsQBRoVDtNLlkHa6NLmOspkswB/JUMfMuU2dMYDlDnc=";
};
meta = {
description = "Official Stylelint extension for Visual Studio Code";
@@ -5053,8 +5053,8 @@ let
mktplcRef = {
name = "intellicode-api-usage-examples";
publisher = "VisualStudioExptTeam";
- version = "0.2.8";
- hash = "sha256-aXAS3QX+mrX0kJqf1LUsvguqRxxC0o+jj1bKQteXPNA=";
+ version = "0.2.9";
+ hash = "sha256-8xBD+WLBaxYt8v3+8lvV2SiqV89iE4jeQod2kH7LNHU=";
};
meta = {
description = "See relevant code examples from GitHub for over 100K different APIs right in your editor";
@@ -5069,8 +5069,8 @@ let
mktplcRef = {
name = "vscodeintellicode";
publisher = "VisualStudioExptTeam";
- version = "1.2.30";
- hash = "sha256-f2Gn+W0QHN8jD5aCG+P93Y+JDr/vs2ldGL7uQwBK4lE=";
+ version = "1.3.2";
+ hash = "sha256-2zexyX1YKD5jgtsvDx7/z3luh5We71ys+XRlVcNywfs=";
};
meta = {
description = "AI-assisted development";
@@ -5172,8 +5172,8 @@ let
mktplcRef = {
name = "vscode-java-pack";
publisher = "vscjava";
- version = "0.25.2023121402";
- hash = "sha256-JhVJK2gZe3R6dpynon+9wauSAWPdW4LmG9oRWylCexM=";
+ version = "0.29.2024091906";
+ hash = "sha256-A0WHSqqYVkRN1C3WI7Gd7DZJFDJPYDVsEygDCG67GoQ=";
};
meta = {
description = "Popular extensions for Java development that provides Java IntelliSense, debugging, testing, Maven/Gradle support, project management and more";
diff --git a/pkgs/applications/file-managers/lf/default.nix b/pkgs/applications/file-managers/lf/default.nix
index 9bbe32fd298e..79975b988926 100644
--- a/pkgs/applications/file-managers/lf/default.nix
+++ b/pkgs/applications/file-managers/lf/default.nix
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "lf";
- version = "32";
+ version = "33";
src = fetchFromGitHub {
owner = "gokcehan";
repo = "lf";
rev = "r${version}";
- hash = "sha256-rFK1M15NcshVY2vtXcMWZhB9Rd/DRC8JyKE5u4wjh2I=";
+ hash = "sha256-aKvTf2tqAUbB3plOemvgJJ7qYdGfQoXhsGVE7Y9wuMo=";
};
- vendorHash = "sha256-r1Kq6CYGNbxTTue3sb3CKMsWZJDzX2dKX7QHQ73nZ8g=";
+ vendorHash = "sha256-E6uZVsQAiwy3uGXp9COvtJSlgXhXxfS7vOfhM5uBPQw=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/applications/misc/comodoro/default.nix b/pkgs/applications/misc/comodoro/default.nix
index 01836f583066..79022f724005 100644
--- a/pkgs/applications/misc/comodoro/default.nix
+++ b/pkgs/applications/misc/comodoro/default.nix
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "CLI to manage your time";
- homepage = "https://pimalaya.org/comodoro/";
+ homepage = "https://github.com/pimalaya/comodoro";
changelog = "https://github.com/soywod/comodoro/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ soywod ];
diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix
index bf3c3b06dc83..0a6d4549498f 100644
--- a/pkgs/applications/misc/lyx/default.nix
+++ b/pkgs/applications/misc/lyx/default.nix
@@ -13,12 +13,12 @@
}:
mkDerivation rec {
- version = "2.4.1";
+ version = "2.4.2.1";
pname = "lyx";
src = fetchurl {
url = "ftp://ftp.lyx.org/pub/lyx/stable/2.4.x/${pname}-${version}.tar.xz";
- hash = "sha256-dN4ooH7zeqlHG8mWLbGCFSolMQx9H0f2drubxj2XE8U=";
+ hash = "sha256-HSscer45Hi+0kQneLI4Tp9/mBfJ99o9om/lH36/HpNk=";
};
# LaTeX is used from $PATH, as people often want to have it with extra pkgs
diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix
index 2ddb36a87de8..0863756777e2 100644
--- a/pkgs/applications/misc/xca/default.nix
+++ b/pkgs/applications/misc/xca/default.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "xca";
- version = "2.7.0";
+ version = "2.8.0";
src = fetchFromGitHub {
owner = "chris2511";
repo = "xca";
rev = "RELEASE.${finalAttrs.version}";
- hash = "sha256-Ty6j0Fl2smMGxp+1nnD3Fu83bn19gqtRKSA1wDgNZes=";
+ hash = "sha256-2TqqHTutG+5YU2mJNTS3pvtEqV7qKVB+j/dipdmEkIk=";
};
buildInputs = [ openssl qtbase ];
@@ -36,6 +36,13 @@ stdenv.mkDerivation (finalAttrs: {
enableParallelBuilding = true;
+ dontWrapQtApps = stdenv.hostPlatform.isDarwin;
+
+ postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
+ mkdir -p "$out/Applications"
+ mv "$out/xca.app" "$out/Applications/xca.app"
+ '';
+
meta = with lib; {
description = "X509 certificate generation tool, handling RSA, DSA and EC keys, certificate signing requests (PKCS#10) and CRLs";
mainProgram = "xca";
diff --git a/pkgs/applications/networking/browsers/microsoft-edge/browser.nix b/pkgs/applications/networking/browsers/microsoft-edge/browser.nix
deleted file mode 100644
index 71791ac71180..000000000000
--- a/pkgs/applications/networking/browsers/microsoft-edge/browser.nix
+++ /dev/null
@@ -1,197 +0,0 @@
-{ channel, version, revision, hash }:
-
-{ stdenv
-, fetchurl
-, lib
-, makeWrapper
-
-, binutils-unwrapped
-, xz
-, gnutar
-, file
-
-, glibc
-, glib
-, nss
-, nspr
-, atk
-, at-spi2-atk
-, xorg
-, cups
-, dbus
-, expat
-, libdrm
-, libxkbcommon
-, pipewire
-, gtk3
-, pango
-, cairo
-, gdk-pixbuf
-, mesa
-, alsa-lib
-, at-spi2-core
-, libuuid
-, systemd
-, wayland
-, libGL
-
-# command line arguments which are always set e.g "--disable-gpu"
-, commandLineArgs ? ""
-}:
-
-let
-
- baseName = "microsoft-edge";
-
- shortName = if channel == "stable"
- then "msedge"
- else "msedge-" + channel;
-
- longName = if channel == "stable"
- then baseName
- else baseName + "-" + channel;
-
- iconSuffix = lib.optionalString (channel != "stable") "_${channel}";
-
- desktopSuffix = lib.optionalString (channel != "stable") "-${channel}";
-in
-
-stdenv.mkDerivation rec {
- pname="${baseName}-${channel}";
- inherit version;
-
- src = fetchurl {
- url = "https://packages.microsoft.com/repos/edge/pool/main/m/${baseName}-${channel}/${baseName}-${channel}_${version}-${revision}_amd64.deb";
- inherit hash;
- };
-
- nativeBuildInputs = [
- makeWrapper
- ];
-
- unpackCmd = "${binutils-unwrapped}/bin/ar p $src data.tar.xz | ${xz}/bin/xz -dc | ${gnutar}/bin/tar -xf -";
- sourceRoot = ".";
-
- dontPatch = true;
- dontConfigure = true;
- dontPatchELF = true;
-
- buildPhase = let
- libPath = {
- msedge = lib.makeLibraryPath [
- glibc glib nss nspr atk at-spi2-atk xorg.libX11
- xorg.libxcb cups.lib dbus.lib expat libdrm
- xorg.libXcomposite xorg.libXdamage xorg.libXext
- xorg.libXfixes xorg.libXrandr libxkbcommon
- pipewire gtk3 pango cairo gdk-pixbuf mesa
- alsa-lib at-spi2-core xorg.libxshmfence systemd wayland
- ];
- naclHelper = lib.makeLibraryPath [
- glib nspr atk libdrm xorg.libxcb mesa xorg.libX11
- xorg.libXext dbus.lib libxkbcommon
- ];
- libwidevinecdm = lib.makeLibraryPath [
- glib nss nspr
- ];
- libGLESv2 = lib.makeLibraryPath [
- xorg.libX11 xorg.libXext xorg.libxcb wayland libGL
- ];
- liboneauth = lib.makeLibraryPath [
- libuuid xorg.libX11
- ];
- };
- in ''
- patchelf \
- --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- --set-rpath "${libPath.msedge}" \
- opt/microsoft/${shortName}/msedge
-
- patchelf \
- --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- opt/microsoft/${shortName}/msedge-sandbox
-
- patchelf \
- --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- opt/microsoft/${shortName}/msedge_crashpad_handler
-
- patchelf \
- --set-rpath "${libPath.libwidevinecdm}" \
- opt/microsoft/${shortName}/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so
-
- patchelf \
- --set-rpath "${libPath.libGLESv2}" \
- opt/microsoft/${shortName}/libGLESv2.so
-
- patchelf \
- --set-rpath "${libPath.liboneauth}" \
- opt/microsoft/${shortName}/liboneauth.so
- '' + lib.optionalString (lib.versionOlder version "121") ''
- patchelf \
- --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- --set-rpath "${libPath.naclHelper}" \
- opt/microsoft/${shortName}/nacl_helper
- '';
-
- installPhase = ''
- mkdir -p $out
- cp -R opt usr/bin usr/share $out
-
- ${if channel == "stable"
- then "ln -sf $out/bin/${longName} $out/bin/${baseName}-${channel}"
- else "ln -sf $out/opt/microsoft/${shortName}/${baseName}-${channel} $out/opt/microsoft/${shortName}/${baseName}"}
-
- ln -sf $out/opt/microsoft/${shortName}/${longName} $out/bin/${longName}
-
- rm -rf $out/share/doc
- rm -rf $out/opt/microsoft/${shortName}/cron
-
- for icon in '16' '24' '32' '48' '64' '128' '256'
- do
- ${ "icon_source=$out/opt/microsoft/${shortName}/product_logo_\${icon}${iconSuffix}.png" }
- ${ "icon_target=$out/share/icons/hicolor/\${icon}x\${icon}/apps" }
- mkdir -p $icon_target
- cp $icon_source $icon_target/microsoft-edge${desktopSuffix}.png
- done
-
- substituteInPlace $out/share/applications/${longName}.desktop \
- --replace /usr/bin/${baseName}-${channel} $out/bin/${longName}
-
- substituteInPlace $out/share/gnome-control-center/default-apps/${longName}.xml \
- --replace /opt/microsoft/${shortName} $out/opt/microsoft/${shortName}
-
- substituteInPlace $out/share/menu/${longName}.menu \
- --replace /opt/microsoft/${shortName} $out/opt/microsoft/${shortName}
-
- substituteInPlace $out/opt/microsoft/${shortName}/xdg-mime \
- --replace "\''${XDG_DATA_DIRS:-/usr/local/share:/usr/share}" "\''${XDG_DATA_DIRS:-/run/current-system/sw/share}" \
- --replace "xdg_system_dirs=/usr/local/share/:/usr/share/" "xdg_system_dirs=/run/current-system/sw/share/" \
- --replace /usr/bin/file ${file}/bin/file
-
- substituteInPlace $out/opt/microsoft/${shortName}/default-app-block \
- --replace /opt/microsoft/${shortName} $out/opt/microsoft/${shortName}
-
- substituteInPlace $out/opt/microsoft/${shortName}/xdg-settings \
- --replace "\''${XDG_DATA_DIRS:-/usr/local/share:/usr/share}" "\''${XDG_DATA_DIRS:-/run/current-system/sw/share}" \
- --replace "\''${XDG_CONFIG_DIRS:-/etc/xdg}" "\''${XDG_CONFIG_DIRS:-/run/current-system/sw/etc/xdg}"
- '';
-
- postFixup = ''
- wrapProgram "$out/bin/${longName}" \
- --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.pname}-${gtk3.version}" \
- --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
- --add-flags ${lib.escapeShellArg commandLineArgs}
- '';
-
- # We only want automatic updates for stable, beta and dev will get updated by the same script
- # and are only used for testing.
- passthru = lib.optionalAttrs (channel == "stable") { updateScript = ./update.py; };
-
- meta = with lib; {
- homepage = "https://www.microsoft.com/en-us/edge";
- description = "Web browser from Microsoft";
- license = licenses.unfree;
- sourceProvenance = with sourceTypes; [ binaryNativeCode ];
- platforms = [ "x86_64-linux" ];
- maintainers = with maintainers; [ zanculmarktum kuwii rhysmdnz ];
- };
-}
diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix
deleted file mode 100644
index 5721c6e616b9..000000000000
--- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- beta = import ./browser.nix {
- channel = "beta";
- version = "130.0.2849.5";
- revision = "1";
- hash = "sha256-chvB84+zu6/xgRHyUk33aicc44QJLxxdOOu0ngqmsFM=";
- };
- dev = import ./browser.nix {
- channel = "dev";
- version = "130.0.2849.1";
- revision = "1";
- hash = "sha256-JObqtaaUR6J4rZ90WWw7Ku5Ntl/QBWHo23T7Ohu5p1s=";
- };
- stable = import ./browser.nix {
- channel = "stable";
- version = "129.0.2792.65";
- revision = "1";
- hash = "sha256-xuCtHptE2CG4aiY7gu2sWW3Km4qfB0E/L/PBACIaKOc=";
- };
-}
diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix
index 2d9e23b7cc99..639dca88f966 100644
--- a/pkgs/applications/networking/cluster/arkade/default.nix
+++ b/pkgs/applications/networking/cluster/arkade/default.nix
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "arkade";
- version = "0.11.27";
+ version = "0.11.29";
src = fetchFromGitHub {
owner = "alexellis";
repo = "arkade";
rev = version;
- hash = "sha256-5/QAtaAAiIzpvOl43A4OqnIcKlfdxehGjmCREFRKXTs=";
+ hash = "sha256-B5MgBX8GPjBsfOCa1OoZRhQAUQxKH7GXYKMaH6TsUV4=";
};
CGO_ENABLED = 0;
diff --git a/pkgs/applications/networking/cluster/kubecm/default.nix b/pkgs/applications/networking/cluster/kubecm/default.nix
index 494d5e5e1b2e..cef37279778a 100644
--- a/pkgs/applications/networking/cluster/kubecm/default.nix
+++ b/pkgs/applications/networking/cluster/kubecm/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kubecm";
- version = "0.31.0";
+ version = "0.32.0";
src = fetchFromGitHub {
owner = "sunny0826";
repo = "kubecm";
rev = "v${version}";
- hash = "sha256-Go2lroa8lq1XjIzvdA5ZL/lOjTAyDKopBepqgWzsUII=";
+ hash = "sha256-wwAJha576P5Gt70Ys83IS4Pe1qAKvq46ucnjAcRKEKA=";
};
- vendorHash = "sha256-BrSYfxftrnNOcPgG/rsTF3OukDd+VlOvE7OJcos7vW4=";
+ vendorHash = "sha256-7NW6j5GzOCP0Eb6IVeC9NRtMJl4ujXPWoWu/NvkMxYA=";
ldflags = [ "-s" "-w" "-X github.com/sunny0826/kubecm/version.Version=${version}"];
doCheck = false;
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index f0ffec6d9275..2a72a5060300 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -99,7 +99,7 @@
, libetonyek
, liborcus
, libpng
-, langs ? [ "ar" "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fi" "fr" "hu" "it" "ja" "ko" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sk" "sl" "tr" "uk" "zh-CN" ]
+, langs ? [ "ar" "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fi" "fr" "hu" "it" "ja" "ko" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sk" "sl" "tr" "uk" "zh-CN" "zh-TW" ]
, withFonts ? false
, withHelp ? true
, kdeIntegration ? false
diff --git a/pkgs/applications/science/biology/seqkit/default.nix b/pkgs/applications/science/biology/seqkit/default.nix
index 0fbda84ccea7..c5fb63c66eda 100644
--- a/pkgs/applications/science/biology/seqkit/default.nix
+++ b/pkgs/applications/science/biology/seqkit/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "seqkit";
- version = "2.8.2";
+ version = "2.9.0";
src = fetchFromGitHub {
owner = "shenwei356";
repo = "seqkit";
rev = "v${version}";
- sha256 = "sha256-jCzd36ds9YVBpnyR3gDJSX3CCVXzC9WkQWmkcDiDWfM=";
+ sha256 = "sha256-xPlqS0tYx077YD/MIxGFn8Bdy4h25dY8idhypIj28rI=";
};
- vendorHash = "sha256-0//kySYhNmfiwiys/Ku0/8RzKpnxO0+byD8pcIkvDY0=";
+ vendorHash = "sha256-EzEomz9GVcirx+Uk1Ygmmb1/GkdUS9aBStLxuNzjHAU=";
meta = with lib; {
description = "cross-platform and ultrafast toolkit for FASTA/Q file manipulation";
diff --git a/pkgs/applications/science/logic/surelog/default.nix b/pkgs/applications/science/logic/surelog/default.nix
index 0d795611b95a..595a3e168040 100644
--- a/pkgs/applications/science/logic/surelog/default.nix
+++ b/pkgs/applications/science/logic/surelog/default.nix
@@ -12,6 +12,7 @@
, antlr4
, capnproto
, nlohmann_json
+, darwin
}:
stdenv.mkDerivation (finalAttrs: {
@@ -45,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
capnproto
antlr4.runtime.cpp
nlohmann_json
- ];
+ ] ++ lib.optional stdenv.isDarwin [ darwin.libutil ];
cmakeFlags = [
"-DSURELOG_USE_HOST_CAPNP=On"
diff --git a/pkgs/applications/science/logic/uhdm/default.nix b/pkgs/applications/science/logic/uhdm/default.nix
index 72b55ffbcd7a..eb078d482732 100644
--- a/pkgs/applications/science/logic/uhdm/default.nix
+++ b/pkgs/applications/science/logic/uhdm/default.nix
@@ -5,6 +5,7 @@
, python3
, capnproto
, gtest
+, darwin
}:
stdenv.mkDerivation (finalAttrs: {
@@ -28,6 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
capnproto
+ ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ darwin.libutil
];
cmakeFlags = [
diff --git a/pkgs/applications/science/math/pari/gp2c.nix b/pkgs/applications/science/math/pari/gp2c.nix
index c99c2fed2bd1..37a671e75cd5 100644
--- a/pkgs/applications/science/math/pari/gp2c.nix
+++ b/pkgs/applications/science/math/pari/gp2c.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "gp2c";
- version = "0.0.13";
+ version = "0.0.14";
src = fetchurl {
url = "https://pari.math.u-bordeaux.fr/pub/pari/GP2C/${pname}-${version}.tar.gz";
- hash = "sha256-JhN07Kc+vXbBEqlZPcootkgSqnYlYf2lpLLCzXmmnTY=";
+ hash = "sha256-r2ESzAKUBFfiOdpEM9Gg2Npg7u8p98xyL2TNSsALezA=";
};
buildInputs = [
diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix
index ff8b4c310662..1438e9729af4 100644
--- a/pkgs/applications/system/glances/default.nix
+++ b/pkgs/applications/system/glances/default.nix
@@ -5,20 +5,15 @@
isPyPy,
lib,
defusedxml,
- future,
- ujson,
packaging,
psutil,
setuptools,
- pydantic,
# Optional dependencies:
fastapi,
jinja2,
- orjson,
pysnmp,
hddtemp,
netifaces, # IP module
- py-cpuinfo,
uvicorn,
requests,
prometheus-client,
@@ -26,16 +21,20 @@
buildPythonApplication rec {
pname = "glances";
- version = "4.1.2.1";
+ version = "4.2.0";
+ pyproject = true;
+
disabled = isPyPy;
src = fetchFromGitHub {
owner = "nicolargo";
repo = "glances";
rev = "refs/tags/v${version}";
- hash = "sha256-SlKt+wjzI9QRmMVvbIERuhQuCCaOh7L89WuNUXNhkuI=";
+ hash = "sha256-liyrMaqBgK7UZjWIKIgIFbskTGaWfyrK8L74DKmaDmY=";
};
+ build-system = [ setuptools ];
+
# On Darwin this package segfaults due to mismatch of pure and impure
# CoreFoundation. This issues was solved for binaries but for interpreted
# scripts a workaround below is still required.
@@ -46,27 +45,27 @@ buildPythonApplication rec {
"/System/Library/Frameworks"
];
- doCheck = true;
- preCheck = lib.optionalString stdenv.hostPlatform.isDarwin ''
- export DYLD_FRAMEWORK_PATH=/System/Library/Frameworks
+ # some tests fail in darwin sandbox
+ doCheck = !stdenv.hostPlatform.isDarwin;
+
+ checkPhase = ''
+ runHook preCheck
+
+ python unittest-core.py
+
+ runHook postCheck
'';
- propagatedBuildInputs = [
+ dependencies = [
defusedxml
- future
- ujson
netifaces
packaging
psutil
pysnmp
- setuptools
- py-cpuinfo
- pydantic
fastapi
uvicorn
requests
jinja2
- orjson
prometheus-client
] ++ lib.optional stdenv.hostPlatform.isLinux hddtemp;
diff --git a/pkgs/applications/version-management/fnc/default.nix b/pkgs/applications/version-management/fnc/default.nix
index b0bae95ba9d1..293fb563af60 100644
--- a/pkgs/applications/version-management/fnc/default.nix
+++ b/pkgs/applications/version-management/fnc/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, stdenv, zlib, ncurses, libiconv }:
+{ lib, fetchurl, stdenv, zlib, ncurses, libiconv, darwin }:
stdenv.mkDerivation (finalAttrs: {
pname = "fnc";
@@ -9,7 +9,9 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-npS+sOxF0S/9TuFjtEFlev0HpIOsaP6zmcfopPNUehk=";
};
- buildInputs = [ libiconv ncurses zlib ];
+ buildInputs = [ libiconv ncurses zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ darwin.libutil
+ ];
makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/applications/version-management/gql/default.nix b/pkgs/applications/version-management/gql/default.nix
index 4e8cfbfd43fc..957ac402fb42 100644
--- a/pkgs/applications/version-management/gql/default.nix
+++ b/pkgs/applications/version-management/gql/default.nix
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "gql";
- version = "0.28.0";
+ version = "0.29.1";
src = fetchFromGitHub {
owner = "AmrDeveloper";
repo = "GQL";
rev = version;
- hash = "sha256-BA94Q8nRf4NptVBHSMYLMEklB9vHaXRU1+o7shXhkZQ=";
+ hash = "sha256-Py2wTWuUfr6Poxtab4JikG4D7Iv6mBocLEbn0zgz+k8=";
};
- cargoHash = "sha256-L+o0ZhTI7x01DpGuhWrvzvSZDYHc++31svWTJ41qx90=";
+ cargoHash = "sha256-BAaHnBkTmk58uAnZyZ7id1WmKz/HiOKSvdZApmgk6rs=";
nativeBuildInputs = [
pkg-config
diff --git a/pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh b/pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh
index d7275b62244d..d576df6489d6 100644
--- a/pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh
+++ b/pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh
@@ -6,7 +6,6 @@ setupMpiCheck() {
# Find out which MPI implementation we are using
# and set safe defaults that are guaranteed to run
# on any build machine
-
mpiType="NONE"
# OpenMPI signature
@@ -41,6 +40,10 @@ setupMpiCheck() {
export OMPI_MCA_rmaps_base_oversubscribe=1
export PRTE_MCA_rmaps_default_mapping_policy=node:oversubscribe
+ # Make sure we do not need openssh in the checkPhase
+ export OMPI_MCA_plm_ssh_agent=false
+ export PRRTE_MCA_plm_ssh_agent=false
+
# Disable CPU pinning
export OMPI_MCA_hwloc_base_binding_policy=none
export PRTE_MCA_hwloc_default_binding_policy=none
diff --git a/pkgs/by-name/ai/aiken/package.nix b/pkgs/by-name/ai/aiken/package.nix
index 272adcfb401e..34ffc4a35ada 100644
--- a/pkgs/by-name/ai/aiken/package.nix
+++ b/pkgs/by-name/ai/aiken/package.nix
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "aiken";
- version = "1.1.4";
+ version = "1.1.5";
src = fetchFromGitHub {
owner = "aiken-lang";
repo = "aiken";
rev = "v${version}";
- hash = "sha256-PTC7qn8Z1PGcBTNK5MtMvThIEhmAqTj23B/cHHhiDFE=";
+ hash = "sha256-cspIIuH+0LJItTz9wk6mChwEMFP3GDpI+KKg0FWM9bQ=";
};
- cargoHash = "sha256-p//1TZJ6sJUUDPPpxRBKL7w7MBTUQppbQedj2x4T17w=";
+ cargoHash = "sha256-aylmZFb+UaK3OEpJLOf4NuT4uMLRhdUg+cSjzxRo7t8=";
buildInputs =
[ openssl ]
diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix
index a7e19dec98a1..67ee8d878706 100644
--- a/pkgs/by-name/an/ansel/package.nix
+++ b/pkgs/by-name/an/ansel/package.nix
@@ -77,13 +77,13 @@ let
in
stdenv.mkDerivation {
pname = "ansel";
- version = "0-unstable-2024-08-13";
+ version = "0-unstable-2024-09-29";
src = fetchFromGitHub {
owner = "aurelienpierreeng";
repo = "ansel";
- rev = "85f2b8b15fe2081634c6f2c3f96b5d430e045bf0";
- hash = "sha256-w2DziVBoCy1NpH4AoIFmKdjqufopqUeYjAwqkOhxHBc=";
+ rev = "0e942648c4f9b1fd89fee8ca91d6e9bd5e06344c";
+ hash = "sha256-gzIZwbTdGE0+uLScV/JfGW0ZxXIbnnSrYO1OxPS5Xz0=";
fetchSubmodules = true;
};
diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix
index c3e879be8e4a..8f6c753577b2 100644
--- a/pkgs/by-name/co/code-cursor/package.nix
+++ b/pkgs/by-name/co/code-cursor/package.nix
@@ -8,11 +8,11 @@
}:
let
pname = "cursor";
- version = "0.42.3";
+ version = "0.42.4";
appKey = "230313mzl4w4u92";
src = fetchurl {
- url = "https://download.todesktop.com/230313mzl4w4u92/cursor-0.42.3-build-241016kxu9umuir-x86_64.AppImage";
- hash = "sha256-GWkilBlpXube//jbxRjmKJjYcmB42nhMY8K0OgkvtwA=";
+ url = "https://download.todesktop.com/230313mzl4w4u92/cursor-0.42.4-build-2410291z3bdg1dy-x86_64.AppImage";
+ hash = "sha256-CD6bQ4T8DhJidiOxNRgRDL4obfEZx7hnO0VotVb6lDc=";
};
appimageContents = appimageTools.extractType2 { inherit version pname src; };
in
diff --git a/pkgs/by-name/co/conduwuit/package.nix b/pkgs/by-name/co/conduwuit/package.nix
index 733b502246a0..f0ff83fe73b6 100644
--- a/pkgs/by-name/co/conduwuit/package.nix
+++ b/pkgs/by-name/co/conduwuit/package.nix
@@ -6,7 +6,8 @@
bzip2,
zstd,
stdenv,
- darwin,
+ apple-sdk_15,
+ darwinMinVersionHook,
rocksdb,
nix-update-script,
testers,
@@ -63,7 +64,9 @@ rustPlatform.buildRustPackage rec {
++ lib.optional enableJemalloc rust-jemalloc-sys'
++ lib.optional enableLiburing liburing
++ lib.optionals stdenv.hostPlatform.isDarwin [
- darwin.apple_sdk.frameworks.Security
+ apple-sdk_15
+ # aws-lc-sys requires CryptoKit's CommonCrypto, which is available on macOS 10.15+
+ (darwinMinVersionHook "10.15")
];
env = {
diff --git a/pkgs/by-name/cp/cp2k/package.nix b/pkgs/by-name/cp/cp2k/package.nix
index 95c7f0461032..646e9d5aba78 100644
--- a/pkgs/by-name/cp/cp2k/package.nix
+++ b/pkgs/by-name/cp/cp2k/package.nix
@@ -18,7 +18,6 @@
mpi,
gsl,
scalapack,
- openssh,
makeWrapper,
libxsmm,
spglib,
@@ -83,7 +82,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
python3
which
- openssh
makeWrapper
pkg-config
] ++ lib.optional (gpuBackend == "cuda") cudaPackages.cuda_nvcc;
@@ -225,7 +223,6 @@ stdenv.mkDerivation rec {
nativeCheckInputs = [
mpiCheckPhaseHook
- openssh
];
checkPhase = ''
diff --git a/pkgs/by-name/db/dbip-asn-lite/package.nix b/pkgs/by-name/db/dbip-asn-lite/package.nix
index 8d844d3972d4..2f260a639d7c 100644
--- a/pkgs/by-name/db/dbip-asn-lite/package.nix
+++ b/pkgs/by-name/db/dbip-asn-lite/package.nix
@@ -5,11 +5,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "dbip-asn-lite";
- version = "2024-10";
+ version = "2024-11";
src = fetchurl {
url = "https://download.db-ip.com/free/dbip-asn-lite-${finalAttrs.version}.mmdb.gz";
- hash = "sha256-zfBRxZ6xwIrOC6MrmtbfKrIK7jxMD/1EMOgQDON6nPw=";
+ hash = "sha256-uqtn3Dy8GYjRHX3LNky0DUAc+MxEph41AKShxsPdJJM=";
};
dontUnpack = true;
diff --git a/pkgs/by-name/db/dbip-city-lite/package.nix b/pkgs/by-name/db/dbip-city-lite/package.nix
index b0e3e4260cbe..c957eb0bc510 100644
--- a/pkgs/by-name/db/dbip-city-lite/package.nix
+++ b/pkgs/by-name/db/dbip-city-lite/package.nix
@@ -5,11 +5,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "dbip-city-lite";
- version = "2024-10";
+ version = "2024-11";
src = fetchurl {
url = "https://download.db-ip.com/free/dbip-city-lite-${finalAttrs.version}.mmdb.gz";
- hash = "sha256-sPjtO0WRdMxGiTySFO3vA1mL3RHxDnhLFzQ1fq2LNUw=";
+ hash = "sha256-w/Dl89AdhIfsfNu4IvVMEVKqZtQcqg0UAjB7HJxq/OE=";
};
dontUnpack = true;
diff --git a/pkgs/by-name/db/dbip-country-lite/package.nix b/pkgs/by-name/db/dbip-country-lite/package.nix
index 74f9ce977067..c02bdee10547 100644
--- a/pkgs/by-name/db/dbip-country-lite/package.nix
+++ b/pkgs/by-name/db/dbip-country-lite/package.nix
@@ -5,11 +5,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "dbip-country-lite";
- version = "2024-10";
+ version = "2024-11";
src = fetchurl {
url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz";
- hash = "sha256-MeAhfDY2jdX2WDsNGNjvH/JeCo9C1hx3PWyk8am9Ut0=";
+ hash = "sha256-Ua4hm0duKHAD/cgtOaDqAYT/4lWsuoIdPnM7K0Lqecw=";
};
dontUnpack = true;
diff --git a/pkgs/by-name/ex/exodus/package.nix b/pkgs/by-name/ex/exodus/package.nix
index b301e4e26cd8..09759bb7e5ff 100644
--- a/pkgs/by-name/ex/exodus/package.nix
+++ b/pkgs/by-name/ex/exodus/package.nix
@@ -28,12 +28,12 @@
stdenv.mkDerivation (finalAttrs: {
pname = "exodus";
- version = "24.19.4";
+ version = "24.41.3";
src = requireFile {
name = "exodus-linux-x64-${finalAttrs.version}.zip";
url = "https://downloads.exodus.com/releases/exodus-linux-x64-${finalAttrs.version}.zip";
- hash = "sha256-+g7DdDrSVmBl1wCSCoJcO2gmbWQBnJUYqjT+GuDlCYw=";
+ hash = "sha256-cq8vHE/wAGRu20F3N3q9F+JXLV8VgGbo5JE9Q2OFuMw=";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/by-name/gr/graphicsmagick/package.nix b/pkgs/by-name/gr/graphicsmagick/package.nix
index 5a449d959f75..e0da1257fe14 100644
--- a/pkgs/by-name/gr/graphicsmagick/package.nix
+++ b/pkgs/by-name/gr/graphicsmagick/package.nix
@@ -26,11 +26,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "graphicsmagick";
- version = "1.3.43";
+ version = "1.3.45";
src = fetchurl {
url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${finalAttrs.version}.tar.xz";
- hash = "sha256-K4hYBzLNfkCdniLGEWI4vvSuBvzaEUUb8z0ln5y/OZ8=";
+ hash = "sha256-3OpRZ0FPfIBVV94tekepsxR7y/YXuR9fD0r+XmVDAms=";
};
outputs = [ "out" "man" ];
diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix
index 7a8f3f8bd214..2d57470e8cc0 100644
--- a/pkgs/by-name/hu/hugo/package.nix
+++ b/pkgs/by-name/hu/hugo/package.nix
@@ -12,13 +12,13 @@
buildGoModule rec {
pname = "hugo";
- version = "0.136.4";
+ version = "0.136.5";
src = fetchFromGitHub {
owner = "gohugoio";
repo = "hugo";
rev = "refs/tags/v${version}";
- hash = "sha256-wCv0lZqvJNOwL/naFuGb6k0Xyk58NpgH1mkhoNnkSno=";
+ hash = "sha256-NluV9/tqWTRfs2u9g4cHC1TyrxOXx3ghOZ4GDx7OZFo=";
};
vendorHash = "sha256-KqDsa7MlSONyn7AYOepQ95q1CEM83AhWk23iYSQ4twU=";
diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
new file mode 100644
index 000000000000..dff0183db0ab
--- /dev/null
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -0,0 +1,287 @@
+{
+ fetchurl,
+ lib,
+ makeWrapper,
+ patchelf,
+ stdenv,
+
+ # Linked dynamic libraries.
+ alsa-lib,
+ at-spi2-atk,
+ at-spi2-core,
+ atk,
+ cairo,
+ cups,
+ dbus,
+ expat,
+ fontconfig,
+ freetype,
+ gcc-unwrapped,
+ gdk-pixbuf,
+ glib,
+ gtk3,
+ gtk4,
+ libdrm,
+ libglvnd,
+ libkrb5,
+ libX11,
+ libxcb,
+ libXcomposite,
+ libXcursor,
+ libXdamage,
+ libXext,
+ libXfixes,
+ libXi,
+ libxkbcommon,
+ libXrandr,
+ libXrender,
+ libXScrnSaver,
+ libxshmfence,
+ libXtst,
+ mesa,
+ nspr,
+ nss,
+ pango,
+ pipewire,
+ vulkan-loader,
+ wayland, # ozone/wayland
+
+ # Command line programs
+ coreutils,
+
+ # command line arguments which are always set e.g "--disable-gpu"
+ commandLineArgs ? "",
+
+ # Will crash without.
+ systemd,
+
+ # Loaded at runtime.
+ libexif,
+ pciutils,
+
+ # Additional dependencies according to other distros.
+ ## Ubuntu
+ curl,
+ liberation_ttf,
+ util-linux,
+ wget,
+ xdg-utils,
+ ## Arch Linux.
+ flac,
+ harfbuzz,
+ icu,
+ libopus,
+ libpng,
+ snappy,
+ speechd-minimal,
+ ## Gentoo
+ bzip2,
+ libcap,
+
+ # Necessary for USB audio devices.
+ libpulseaudio,
+ pulseSupport ? true,
+
+ adwaita-icon-theme,
+ gsettings-desktop-schemas,
+
+ # For video acceleration via VA-API (--enable-features=VaapiVideoDecoder)
+ libva,
+ libvaSupport ? true,
+
+ # For Vulkan support (--enable-features=Vulkan)
+ addDriverRunpath,
+
+ # Edge Specific
+ libuuid,
+}:
+
+let
+
+ opusWithCustomModes = libopus.override { withCustomModes = true; };
+
+ deps =
+ [
+ alsa-lib
+ at-spi2-atk
+ at-spi2-core
+ atk
+ bzip2
+ cairo
+ coreutils
+ cups
+ curl
+ dbus
+ expat
+ flac
+ fontconfig
+ freetype
+ gcc-unwrapped.lib
+ gdk-pixbuf
+ glib
+ harfbuzz
+ icu
+ libcap
+ libdrm
+ liberation_ttf
+ libexif
+ libglvnd
+ libkrb5
+ libpng
+ libX11
+ libxcb
+ libXcomposite
+ libXcursor
+ libXdamage
+ libXext
+ libXfixes
+ libXi
+ libxkbcommon
+ libXrandr
+ libXrender
+ libXScrnSaver
+ libxshmfence
+ libXtst
+ mesa
+ nspr
+ nss
+ opusWithCustomModes
+ pango
+ pciutils
+ pipewire
+ snappy
+ speechd-minimal
+ systemd
+ util-linux
+ vulkan-loader
+ wayland
+ wget
+ libuuid
+ ]
+ ++ lib.optional pulseSupport libpulseaudio
+ ++ lib.optional libvaSupport libva
+ ++ [
+ gtk3
+ gtk4
+ ];
+in
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "microsoft-edge";
+ version = "130.0.2849.46";
+
+ src = fetchurl {
+ url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
+ hash = "sha256-QschcHSDoYakjf4oYXIc40SyniCufNmjHJPuvRazdSw=";
+ };
+
+ # With strictDeps on, some shebangs were not being patched correctly
+ # ie, $out/share/microsoft/msedge/microsoft-edge
+ strictDeps = false;
+
+ nativeBuildInputs = [
+ makeWrapper
+ patchelf
+ ];
+
+ buildInputs = [
+ # needed for XDG_ICON_DIRS
+ adwaita-icon-theme
+ glib
+ gtk3
+ gtk4
+ # needed for GSETTINGS_SCHEMAS_PATH
+ gsettings-desktop-schemas
+ ];
+
+ unpackPhase = ''
+ runHook preUnpack
+ ar x $src
+ tar xf data.tar.xz
+ runHook postUnpack
+ '';
+
+ rpath = lib.makeLibraryPath deps + ":" + lib.makeSearchPathOutput "lib" "lib64" deps;
+ binpath = lib.makeBinPath deps;
+
+ installPhase = ''
+ runHook preInstall
+
+ appname=msedge
+ dist=stable
+
+ exe=$out/bin/microsoft-edge
+
+ mkdir -p $out/bin $out/share
+ cp -v -a opt/* $out/share
+ cp -v -a usr/share/* $out/share
+
+ # replace bundled vulkan-loader
+ rm -v $out/share/microsoft/$appname/libvulkan.so.1
+ ln -v -s -t "$out/share/microsoft/$appname" "${lib.getLib vulkan-loader}/lib/libvulkan.so.1"
+
+ substituteInPlace $out/share/microsoft/$appname/microsoft-edge \
+ --replace-fail 'CHROME_WRAPPER' 'WRAPPER'
+ substituteInPlace $out/share/applications/microsoft-edge.desktop \
+ --replace-fail /usr/bin/microsoft-edge-$dist $exe
+ substituteInPlace $out/share/gnome-control-center/default-apps/microsoft-edge.xml \
+ --replace-fail /opt/microsoft/msedge $exe
+ substituteInPlace $out/share/menu/microsoft-edge.menu \
+ --replace-fail /opt $out/share \
+ --replace-fail $out/share/microsoft/$appname/microsoft-edge $exe
+
+ for icon_file in $out/share/microsoft/msedge/product_logo_[0-9]*.png; do
+ num_and_suffix="''${icon_file##*logo_}"
+ if [ $dist = "stable" ]; then
+ icon_size="''${num_and_suffix%.*}"
+ else
+ icon_size="''${num_and_suffix%_*}"
+ fi
+ logo_output_prefix="$out/share/icons/hicolor"
+ logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps"
+ mkdir -p "$logo_output_path"
+ mv "$icon_file" "$logo_output_path/microsoft-edge.png"
+ done
+
+ # "--simulate-outdated-no-au" disables auto updates and browser outdated popup
+ makeWrapper "$out/share/microsoft/$appname/microsoft-edge" "$exe" \
+ --prefix LD_LIBRARY_PATH : "$rpath" \
+ --prefix PATH : "$binpath" \
+ --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \
+ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \
+ --set CHROME_WRAPPER "microsoft-edge-$dist" \
+ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
+ --add-flags "--simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'" \
+ --add-flags ${lib.escapeShellArg commandLineArgs}
+
+ # Make sure that libGL and libvulkan are found by ANGLE libGLESv2.so
+ patchelf --set-rpath $rpath $out/share/microsoft/$appname/lib*GL*
+
+ # Edge specific set liboneauth
+ patchelf --set-rpath $rpath $out/share/microsoft/$appname/liboneauth.so
+
+ for elf in $out/share/microsoft/$appname/{msedge,msedge-sandbox,msedge_crashpad_handler}; do
+ patchelf --set-rpath $rpath $elf
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf
+ done
+
+ runHook postInstall
+ '';
+
+ passthru.updateScript = ./update.py;
+
+ meta = {
+ changelog = "https://learn.microsoft.com/en-us/deployedge/microsoft-edge-relnote-stable-channel";
+ description = "Web browser from Microsoft";
+ homepage = "https://www.microsoft.com/en-us/edge";
+ license = lib.licenses.unfree;
+ mainProgram = "microsoft-edge";
+ maintainers = with lib.maintainers; [
+ zanculmarktum
+ kuwii
+ rhysmdnz
+ ];
+ platforms = [ "x86_64-linux" ];
+ sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+ };
+})
diff --git a/pkgs/applications/networking/browsers/microsoft-edge/update.py b/pkgs/by-name/mi/microsoft-edge/update.py
similarity index 53%
rename from pkgs/applications/networking/browsers/microsoft-edge/update.py
rename to pkgs/by-name/mi/microsoft-edge/update.py
index 724a83d09d54..c9a048d504c8 100755
--- a/pkgs/applications/networking/browsers/microsoft-edge/update.py
+++ b/pkgs/by-name/mi/microsoft-edge/update.py
@@ -1,8 +1,9 @@
#! /usr/bin/env nix-shell
-#! nix-shell -i python3 -p python3Packages.packaging python3Packages.debian
+#! nix-shell -i python3 -p python3Packages.packaging python3Packages.debian common-updater-scripts
import base64
import textwrap
+import os
from urllib import request
from collections import OrderedDict
@@ -22,7 +23,7 @@ def latest_packages(packages: bytes):
latest_packages: OrderedDict[str, Packages] = {}
for package in Packages.iter_paragraphs(packages, use_apt_pkg=False):
name: str = package['Package']
- if not name.startswith('microsoft-edge-'):
+ if not name.startswith('microsoft-edge-stable'):
continue
channel = name.replace('microsoft-edge-', '')
if channel not in latest_packages:
@@ -34,37 +35,10 @@ def latest_packages(packages: bytes):
return OrderedDict(sorted(latest_packages.items(), key=lambda x:x[0]))
-def nix_expressions(latest: dict[str, Packages]):
- channel_strs: list[str] = []
- for channel, package in latest.items():
- print(f"Processing {channel} {package['Version']}")
- match = Version.re_valid_version.match(package['Version'])
- assert match is not None
-
- version = match.group('upstream_version')
- revision = match.group('debian_revision')
- sri = 'sha256-' + \
- base64.b64encode(bytes.fromhex(package['SHA256'])).decode('ascii')
-
- channel_str = textwrap.dedent(
- f'''\
- {channel} = import ./browser.nix {{
- channel = "{channel}";
- version = "{version}";
- revision = "{revision}";
- hash = "{sri}";
- }};'''
- )
- channel_strs.append(channel_str)
- return channel_strs
-
-
def write_expression():
latest = latest_packages(packages())
- channel_strs = nix_expressions(latest)
- nix_expr = '{\n' + textwrap.indent('\n'.join(channel_strs), ' ') + '\n}\n'
- with open(PIN_PATH, 'w') as f:
- f.write(nix_expr)
+ version = Version.re_valid_version.match(latest['stable']['Version']).group('upstream_version')
+ os.system(f'update-source-version microsoft-edge "{version}"')
write_expression()
diff --git a/pkgs/by-name/mi/miniflux/package.nix b/pkgs/by-name/mi/miniflux/package.nix
index c3e590e80fd4..457c22e7d243 100644
--- a/pkgs/by-name/mi/miniflux/package.nix
+++ b/pkgs/by-name/mi/miniflux/package.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "miniflux";
- version = "2.2.1";
+ version = "2.2.2";
src = fetchFromGitHub {
owner = "miniflux";
repo = "v2";
rev = "refs/tags/${version}";
- hash = "sha256-b4slACQl+3vDsioULVKscBhS8LvTxCUPDnO7GlT46CM=";
+ hash = "sha256-FAeUhB05mDcdlHzJRLJR9mSKeqpKWed4Kxa89j/pjOQ=";
};
- vendorHash = "sha256-PL5tc6MQRHloc3Dfw+FpWdqrXErFPjEb8RNPmHr7jSk=";
+ vendorHash = "sha256-FVm6kTZFp6qSUUuB2R4owzSxk+zfBWW1o7kOFadSS38=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/no/notes/package.nix b/pkgs/by-name/no/notes/package.nix
index 83af624af20c..af926182fa91 100644
--- a/pkgs/by-name/no/notes/package.nix
+++ b/pkgs/by-name/no/notes/package.nix
@@ -12,13 +12,13 @@ let
in
stdenv'.mkDerivation (finalAttrs: {
pname = "notes";
- version = "2.3.0";
+ version = "2.3.1";
src = fetchFromGitHub {
owner = "nuttyartist";
repo = "notes";
rev = "v${finalAttrs.version}";
- hash = "sha256-Z89Z7Il9K9pOxvNfFCoRUkRs0Wf5a6TQACDbBrQhGyw=";
+ hash = "sha256-ceZ37torgnxZJybacjnNG+kNAU/I2Ki7ZZ7Tzn4pIas=";
fetchSubmodules = true;
};
diff --git a/pkgs/by-name/nz/nzbhydra2/package.nix b/pkgs/by-name/nz/nzbhydra2/package.nix
index db143bf1a513..8a00d6ac8824 100644
--- a/pkgs/by-name/nz/nzbhydra2/package.nix
+++ b/pkgs/by-name/nz/nzbhydra2/package.nix
@@ -10,11 +10,11 @@
}:
stdenv.mkDerivation rec {
pname = "nzbhydra2";
- version = "7.7.0";
+ version = "7.8.0";
src = fetchzip {
url = "https://github.com/theotherp/nzbhydra2/releases/download/v${version}/nzbhydra2-${version}-generic.zip";
- hash = "sha256-8Q/aTMwHFy7OG+VyoSRYlXp4l247nUSPP0YCMkv9Cec=";
+ hash = "sha256-xE43ACFF9B5YMPjcSDcG2I3YlTSLR5oD3UdAL9XXUWI=";
stripRoot = false;
};
diff --git a/pkgs/by-name/pe/peertube-viewer/package.nix b/pkgs/by-name/pe/peertube-viewer/package.nix
index 3981fb69f311..749948f2ccf2 100644
--- a/pkgs/by-name/pe/peertube-viewer/package.nix
+++ b/pkgs/by-name/pe/peertube-viewer/package.nix
@@ -4,7 +4,7 @@
rustPlatform,
}:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
pname = "peertube-viewer";
version = "1.8.6";
@@ -22,5 +22,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://gitlab.com/peertube-viewer/peertube-viewer-rs";
license = licenses.agpl3Only;
maintainers = with maintainers; [ haruki7049 ];
+ mainProgram = "peertube-viewer-rs";
};
}
diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix
index 8d0db4a768db..ebe5564441ca 100644
--- a/pkgs/by-name/pe/petsc/package.nix
+++ b/pkgs/by-name/pe/petsc/package.nix
@@ -10,7 +10,6 @@
mpiSupport ? true,
mpi, # generic mpi dependency
mpiCheckPhaseHook,
- openssh, # required for openmpi tests
petsc-withp4est ? false,
hdf5-support ? false,
hdf5,
@@ -42,7 +41,7 @@ stdenv.mkDerivation rec {
python3
gfortran
pkg-config
- ] ++ lib.optional mpiSupport mpi ++ lib.optional (mpiSupport && mpi.pname == "openmpi") openssh;
+ ] ++ lib.optional mpiSupport mpi;
buildInputs = [
blas
lapack
diff --git a/pkgs/by-name/pi/piv-agent/package.nix b/pkgs/by-name/pi/piv-agent/package.nix
index 5a8f25000efc..84f7db49becb 100644
--- a/pkgs/by-name/pi/piv-agent/package.nix
+++ b/pkgs/by-name/pi/piv-agent/package.nix
@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "piv-agent";
- version = "0.21.2";
+ version = "0.22.0";
src = fetchFromGitHub {
owner = "smlx";
repo = "piv-agent";
rev = "v${version}";
- hash = "sha256-nHxtQaQ5Lc0QAJrWU6fUWViDwOKkxVyj9/B6XZ+Y0zw=";
+ hash = "sha256-bfJIrWDFQIg0n1RDadARPHhQwE6i7mAMxE5GPYo4WU8=";
};
- vendorHash = "sha256-L5HuTYA01w3LUtSy7OVxG6QN5uQZ8LVYyrBcJQTkIUA=";
+ vendorHash = "sha256-HIB+p0yh7EWudLp1YGoClYbK3hkYEJZ+o+9BbOHE4+0=";
subPackages = [ "cmd/piv-agent" ];
diff --git a/pkgs/by-name/rm/rmpc/package.nix b/pkgs/by-name/rm/rmpc/package.nix
index 6efe7b07a43a..ed25639833e2 100644
--- a/pkgs/by-name/rm/rmpc/package.nix
+++ b/pkgs/by-name/rm/rmpc/package.nix
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "rmpc";
- version = "0.4.0";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "mierak";
repo = "rmpc";
rev = "v${version}";
- hash = "sha256-eWscMWOjTGmFCNGwf/6lMU0JbULC7/AFCPbznGQYRQI=";
+ hash = "sha256-hQhcNeGNxUxJ9hO/ukmt6V8V8zQHQLvejeu692pKTwg=";
};
- cargoHash = "sha256-PieGA8/C7d8Q5rdu7oRdVuCLNhwGp5LZYz/rM4agqng=";
+ cargoHash = "sha256-Y+NmBAcp6lu1dmMo1Gpozmm/YvNYM7mUAvU2C7iO0ew=";
nativeBuildInputs = [
installShellFiles
@@ -48,7 +48,10 @@ rustPlatform.buildRustPackage rec {
album art through kitty image protocol without any ugly hacks. It also features ranger/lf
inspired browsing of songs and other goodies.
'';
- maintainers = with lib.maintainers; [ donovanglover ];
+ maintainers = with lib.maintainers; [
+ donovanglover
+ bloxx12
+ ];
mainProgram = "rmpc";
platforms = lib.platforms.linux;
};
diff --git a/pkgs/by-name/si/sirius/package.nix b/pkgs/by-name/si/sirius/package.nix
index d437eece8b21..58c6e6a6dd2e 100644
--- a/pkgs/by-name/si/sirius/package.nix
+++ b/pkgs/by-name/si/sirius/package.nix
@@ -5,7 +5,6 @@
, pkg-config
, mpi
, mpiCheckPhaseHook
-, openssh
, gfortran
, blas
, lapack
@@ -139,7 +138,6 @@ stdenv.mkDerivation rec {
nativeCheckInputs = [
mpiCheckPhaseHook
- openssh
];
meta = with lib; {
diff --git a/pkgs/by-name/te/templ/package.nix b/pkgs/by-name/te/templ/package.nix
index 8e90a4823ffc..727ddff217e5 100644
--- a/pkgs/by-name/te/templ/package.nix
+++ b/pkgs/by-name/te/templ/package.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "templ";
- version = "0.2.778";
+ version = "0.2.793";
src = fetchFromGitHub {
owner = "a-h";
repo = "templ";
rev = "v${version}";
- hash = "sha256-lU8aVTw73HX0lNGPyD8Xnvtnr2VFTXv/S6xCVn6Lg74=";
+ hash = "sha256-0KGht5IMbJV8KkXgT5qJxA9bcmWevzXXAVPMQTm0ccw=";
};
vendorHash = "sha256-ZWY19f11+UI18jeHYIEZjdb9Ii74mD6w+dYRLPkdfBU=";
diff --git a/pkgs/by-name/vi/vips/package.nix b/pkgs/by-name/vi/vips/package.nix
new file mode 100644
index 000000000000..ca866f148441
--- /dev/null
+++ b/pkgs/by-name/vi/vips/package.nix
@@ -0,0 +1,169 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+
+ # Native build inputs
+ docbook-xsl-nons,
+ gobject-introspection,
+ gtk-doc,
+ meson,
+ ninja,
+ pkg-config,
+
+ # Build inputs
+ ApplicationServices,
+ expat,
+ Foundation,
+ glib,
+ libxml2,
+ python3,
+
+ # Optional dependencies
+ cfitsio,
+ cgif,
+ fftw,
+ imagemagick,
+ lcms2,
+ libarchive,
+ libexif,
+ libheif,
+ libhwy,
+ libimagequant,
+ libjpeg,
+ libjxl,
+ librsvg,
+ libspng,
+ libtiff,
+ libwebp,
+ matio,
+ openexr,
+ openjpeg,
+ openslide,
+ pango,
+ poppler,
+
+ # passthru
+ testers,
+ nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "vips";
+ version = "8.15.5";
+
+ outputs = [
+ "bin"
+ "out"
+ "man"
+ "dev"
+ ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "devdoc" ];
+
+ src = fetchFromGitHub {
+ owner = "libvips";
+ repo = "libvips";
+ rev = "refs/tags/v${finalAttrs.version}";
+ hash = "sha256-Lwe4lu3kS1WxgbM0eRfrMf/UIpDebvooHKvyVv7lq24=";
+ # Remove unicode file names which leads to different checksums on HFS+
+ # vs. other filesystems because of unicode normalisation.
+ postFetch = ''
+ rm -r $out/test/test-suite/images/
+ '';
+ };
+
+ nativeBuildInputs =
+ [
+ docbook-xsl-nons
+ gobject-introspection
+ meson
+ ninja
+ pkg-config
+ ]
+ ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+ gtk-doc
+ ];
+
+ buildInputs =
+ [
+ glib
+ libxml2
+ expat
+ (python3.withPackages (p: [ p.pycairo ]))
+
+ # Optional dependencies
+ cfitsio
+ cgif
+ fftw
+ imagemagick
+ lcms2
+ libarchive
+ libexif
+ libheif
+ libhwy
+ libimagequant
+ libjpeg
+ libjxl
+ librsvg
+ libspng
+ libtiff
+ libwebp
+ matio
+ openexr
+ openjpeg
+ openslide
+ pango
+ poppler
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ ApplicationServices
+ Foundation
+ ];
+
+ # Required by .pc file
+ propagatedBuildInputs = [
+ glib
+ ];
+
+ mesonFlags =
+ [
+ (lib.mesonEnable "pdfium" false)
+ (lib.mesonEnable "nifti" false)
+ ]
+ ++ lib.optional (!stdenv.hostPlatform.isDarwin) (lib.mesonBool "gtk_doc" true)
+ ++ lib.optional (imagemagick == null) (lib.mesonEnable "magick" false);
+
+ passthru = {
+ tests = {
+ pkg-config = testers.hasPkgConfigModules {
+ package = finalAttrs.finalPackage;
+ };
+ version = testers.testVersion {
+ package = finalAttrs.finalPackage;
+ command = "vips --version";
+ };
+ };
+ updateScript = nix-update-script {
+ extraArgs = [
+ "--version-regex"
+ "v([0-9.]+)"
+ ];
+ };
+ };
+
+ meta = with lib; {
+ changelog = "https://github.com/libvips/libvips/blob/${finalAttrs.src.rev}/ChangeLog";
+ homepage = "https://www.libvips.org/";
+ description = "Image processing system for large images";
+ license = licenses.lgpl2Plus;
+ maintainers = with maintainers; [
+ kovirobi
+ anthonyroussel
+ ];
+ pkgConfigModules = [
+ "vips"
+ "vips-cpp"
+ ];
+ platforms = platforms.unix;
+ mainProgram = "vips";
+ };
+})
diff --git a/pkgs/by-name/wa/waveterm/package.nix b/pkgs/by-name/wa/waveterm/package.nix
index 7f762178a93c..a72a83b30f03 100644
--- a/pkgs/by-name/wa/waveterm/package.nix
+++ b/pkgs/by-name/wa/waveterm/package.nix
@@ -33,7 +33,7 @@
let
pname = "waveterm";
- version = "0.8.12";
+ version = "0.9.1";
src =
let
@@ -46,10 +46,10 @@ let
aarch64-darwin = "Wave-darwin-arm64-${version}.zip";
};
hash = selectSystem {
- x86_64-linux = "sha256-lk+YBlsgS2kOsaesKJ0XMCnbxq5iza/0xG6qWjHLZA8=";
- aarch64-linux = "sha256-57j5qp/1jGiqJP6Qmfw5XkoyXkNpnaTepfhSzlISExM=";
- x86_64-darwin = "sha256-jBFkBC4PcWSQNw8A2w+2iUnSLoRvXQ3A0CVqkqfx4dI=";
- aarch64-darwin = "sha256-pQ3TXKhiCI164qmmDkDFb3WUjd/lX1MnAOWqsQICHR4=";
+ x86_64-linux = "sha256-DtpS9jRQljAhPA9Qcpd5acIeCyb5E/Nkyg3LXa4wrk0=";
+ aarch64-linux = "sha256-xM+34vsp+LFCYAFIrb0mKQRy/vPqn7FFvPlzV4JWPCg=";
+ x86_64-darwin = "sha256-fadf/qOec1liqpBOH+lTEGnTYJlvL8QJ3kHNcuI1wew=";
+ aarch64-darwin = "sha256-kKDDeIyO4CSxLWYpJyfz0Egl2S1ADRk4N/XXpsCBXVo=";
};
in
fetchurl {
diff --git a/pkgs/by-name/yo/yourkit-java/package.nix b/pkgs/by-name/yo/yourkit-java/package.nix
index c51bdf5ee787..9f8329fdc3be 100644
--- a/pkgs/by-name/yo/yourkit-java/package.nix
+++ b/pkgs/by-name/yo/yourkit-java/package.nix
@@ -9,7 +9,7 @@
let
vPath = v: lib.elemAt (lib.splitString "-" v) 0;
- version = "2024.3-b161";
+ version = "2024.9-b158";
arches = {
aarch64-linux = "arm64";
@@ -20,8 +20,8 @@ let
arches.${stdenvNoCC.targetPlatform.system} or (throw "Unsupported system");
hashes = {
- arm64 = "sha256-Qm/+KQ4nZr1IIyo+i8Gp8K2PEU844tuigiopWEibaAE=";
- x64 = "sha256-yxbPS5UrYq6FgPlqfWjO9tPI/rjA/400JnS3kKHgMV0=";
+ arm64 = "sha256-juRU7rLek1vT4hRglMoyw2SyLoBh4mhg45AroMq+TE0=";
+ x64 = "sha256-3qO3l+L9fBFIumFKS9noA+c0Gu5GlMrxQaCyhW5Wark=";
};
desktopItem = makeDesktopItem {
diff --git a/pkgs/by-name/zo/zoekt/package.nix b/pkgs/by-name/zo/zoekt/package.nix
index 4af89fc2f468..81182b2d9d6c 100644
--- a/pkgs/by-name/zo/zoekt/package.nix
+++ b/pkgs/by-name/zo/zoekt/package.nix
@@ -7,16 +7,16 @@
buildGoModule {
pname = "zoekt";
- version = "3.7.2-2-unstable-2024-10-01";
+ version = "3.7.2-2-unstable-2024-10-24";
src = fetchFromGitHub {
owner = "sourcegraph";
repo = "zoekt";
- rev = "650136078a98ef99acf4159310a2c12fd25075d7";
- hash = "sha256-MtN/x5o0iHZeDqIQCuio8y5pmZXq5qFIE6FySgIY2CY=";
+ rev = "bfd8ee868c4c3fe509fa0fd4f2b8c68d84805ff9";
+ hash = "sha256-hoKMD/nTX0r2PEM0qRhAQFXM45UhDztwK0epL2EIMY8=";
};
- vendorHash = "sha256-+ayixWCD2e+7Nh9WJmDAloSzp63v9hQYQd8UMuo8qxQ=";
+ vendorHash = "sha256-QZysaEBZ1/ISPRkUPr6UIEUlWv/aHEwk8B/wxaYe7zU=";
nativeCheckInputs = [
git
diff --git a/pkgs/data/icons/colloid-icon-theme/default.nix b/pkgs/data/icons/colloid-icon-theme/default.nix
index 4fbfeb0fcc39..25ffaf87b493 100644
--- a/pkgs/data/icons/colloid-icon-theme/default.nix
+++ b/pkgs/data/icons/colloid-icon-theme/default.nix
@@ -18,13 +18,13 @@ lib.checkListOfEnum "${pname}: color variants" [ "default" "purple" "pink" "red"
stdenvNoCC.mkDerivation rec {
inherit pname;
- version = "2024-08-31";
+ version = "2024-10-18";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
- hash = "sha256-/eUlc+fnmQZ61qE/JWZDiR0mMPntLOec0nmevJa7lrc=";
+ hash = "sha256-xpRgOt/FqZSbtOlZKlZS1ILQn6OAwqKAXX3hj41Wo+0=";
};
nativeBuildInputs = [
diff --git a/pkgs/data/themes/whitesur/default.nix b/pkgs/data/themes/whitesur/default.nix
index 6909db147de3..82b30082d1e1 100644
--- a/pkgs/data/themes/whitesur/default.nix
+++ b/pkgs/data/themes/whitesur/default.nix
@@ -2,8 +2,8 @@
, stdenv
, fetchFromGitHub
, gitUpdater
+, dialog
, glib
-, gnome-shell
, gnome-themes-extra
, jdupes
, libxml2
@@ -32,7 +32,7 @@ lib.checkListOfEnum "${pname}: alt variants" [ "normal" "alt" "all" ] altVariant
lib.checkListOfEnum "${pname}: color variants" [ "Light" "Dark" ] colorVariants
lib.checkListOfEnum "${pname}: opacity variants" [ "normal" "solid" ] opacityVariants
lib.checkListOfEnum "${pname}: theme variants" [ "default" "blue" "purple" "pink" "red" "orange" "yellow" "green" "grey" "all" ] themeVariants
-lib.checkListOfEnum "${pname}: Activities icon variants" [ "standard" "simple" "gnome" "ubuntu" "tux" "arch" "manjaro" "fedora" "debian" "void" "opensuse" "popos" "mxlinux" "zorin" "budgie" "gentoo" ] (single iconVariant)
+lib.checkListOfEnum "${pname}: activities icon variants" [ "standard" "apple" "simple" "gnome" "ubuntu" "tux" "arch" "manjaro" "fedora" "debian" "void" "opensuse" "popos" "mxlinux" "zorin" "budgie" "gentoo" ] (single iconVariant)
lib.checkListOfEnum "${pname}: nautilus style" [ "stable" "normal" "mojave" "glassy" ] (single nautilusStyle)
lib.checkListOfEnum "${pname}: nautilus sidebar minimum width" [ "default" "180" "220" "240" "260" "280" ] (single nautilusSize)
lib.checkListOfEnum "${pname}: panel opacity" [ "default" "30" "45" "60" "75" ] (single panelOpacity)
@@ -40,18 +40,18 @@ lib.checkListOfEnum "${pname}: panel size" [ "default" "smaller" "bigger" ] (sin
stdenv.mkDerivation rec {
pname = "whitesur-gtk-theme";
- version = "2024-05-01";
+ version = "2024.09.02";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
- sha256 = "sha256-NgmFQtgVJvVXJjZUXt/BIx1hdzjHfVmmwXUCDZZD7+g=";
+ hash = "sha256-a32iHPcbMYuBy65FWm/fkjwJQE3aVScR3WJJzKTVx9k=";
};
nativeBuildInputs = [
+ dialog
glib
- gnome-shell
jdupes
libxml2
sassc
@@ -68,10 +68,10 @@ stdenv.mkDerivation rec {
done
# Do not provide `sudo`, as it is not needed in our use case of the install script
- substituteInPlace shell/lib-core.sh --replace '$(which sudo)' false
+ substituteInPlace shell/lib-core.sh --replace-fail '$(which sudo)' false
# Provides a dummy home directory
- substituteInPlace shell/lib-core.sh --replace 'MY_HOME=$(getent passwd "''${MY_USERNAME}" | cut -d: -f6)' 'MY_HOME=/tmp'
+ substituteInPlace shell/lib-core.sh --replace-fail 'MY_HOME=$(getent passwd "''${MY_USERNAME}" | cut -d: -f6)' 'MY_HOME=/tmp'
'';
dontBuild = true;
@@ -81,19 +81,19 @@ stdenv.mkDerivation rec {
mkdir -p $out/share/themes
- ./install.sh \
+ ./install.sh \
${toString (map (x: "--alt " + x) altVariants)} \
${toString (map (x: "--color " + x) colorVariants)} \
${toString (map (x: "--opacity " + x) opacityVariants)} \
${toString (map (x: "--theme " + x) themeVariants)} \
- ${lib.optionalString (iconVariant != null) ("--icon " + iconVariant)} \
- ${lib.optionalString (nautilusStyle != null) ("--nautilus-style " + nautilusStyle)} \
+ ${lib.optionalString (nautilusStyle != null) ("--nautilus " + nautilusStyle)} \
${lib.optionalString (nautilusSize != null) ("--size " + nautilusSize)} \
- ${lib.optionalString (panelOpacity != null) ("--panel-opacity " + panelOpacity)} \
- ${lib.optionalString (panelSize != null) ("--panel-size " + panelSize)} \
${lib.optionalString roundedMaxWindow "--roundedmaxwindow"} \
${lib.optionalString nordColor "--nordcolor"} \
${lib.optionalString darkerColor "--darkercolor"} \
+ ${lib.optionalString (iconVariant != null) ("--gnome-shell -i " + iconVariant)} \
+ ${lib.optionalString (panelSize != null) ("--gnome-shell -height " + panelSize)} \
+ ${lib.optionalString (panelOpacity != null) ("--gnome-shell -panelopacity " + panelOpacity)} \
--dest $out/share/themes
jdupes --quiet --link-soft --recurse $out/share
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index b50928ce05f3..34632bf4b50d 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -16,12 +16,12 @@ let
};
# By unofficial and very loose convention we keep the latest version of
# SBCL, and the previous one in case someone quickly needs to roll back.
- "2.4.8" = {
- sha256 = "sha256-/G7NzFOOgKFKmY1TDMw4SkF5D09Pxs1//oyxJqZ3aUw=";
- };
"2.4.9" = {
sha256 = "sha256-mXDk68XWlD3GTXyh9S2bXNn8lM75TSMyE9eOx182BeI=";
};
+ "2.4.10" = {
+ sha256 = "sha256-zus5a2nSkT7uBIQcKva+ylw0LOFGTD/j5FPy3hDF4vg=";
+ };
};
# Collection of pre-built SBCL binaries for platforms that need them for
# bootstrapping. Ideally these are to be avoided. If ECL (or any other
diff --git a/pkgs/development/interpreters/php/8.4.nix b/pkgs/development/interpreters/php/8.4.nix
index 3c1f17048c37..c794e3963700 100644
--- a/pkgs/development/interpreters/php/8.4.nix
+++ b/pkgs/development/interpreters/php/8.4.nix
@@ -4,10 +4,10 @@ let
base = callPackage ./generic.nix (
_args
// {
- version = "8.4.0beta3";
+ version = "8.4.0RC3";
phpSrc = fetchurl {
- url = "https://downloads.php.net/~calvinb/php-8.4.0beta3.tar.xz";
- hash = "sha256-aTgUCmS3tdV304Ag05DZObLKTQ8XgpNIfHARbhpZUAw=";
+ url = "https://downloads.php.net/~saki/php-8.4.0RC3.tar.xz";
+ hash = "sha256-6eA5w7NRfH5k+AyoIvuSEY9JgjtQqYwyZXTRSuKHBvY=";
};
}
);
diff --git a/pkgs/development/interpreters/php/fix-paths-php84.patch b/pkgs/development/interpreters/php/fix-paths-php84.patch
index 294d13569af7..12a392bc973c 100644
--- a/pkgs/development/interpreters/php/fix-paths-php84.patch
+++ b/pkgs/development/interpreters/php/fix-paths-php84.patch
@@ -13,15 +13,16 @@ index e46acf0928..ee8e5a88f8 100644
AS_VAR_IF([GETTEXT_DIR],,
[AC_MSG_ERROR([Cannot locate header file libintl.h])])
-diff -ru a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
---- a/sapi/apache2handler/config.m4 2018-11-07 15:35:23.000000000 +0000
-+++ b/sapi/apache2handler/config.m4 2018-11-27 00:32:28.000000000 +0000
-@@ -66,7 +66,7 @@
- AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required])
- fi
+diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
+index e335721f19..a5087e1320 100644
+--- a/sapi/apache2handler/config.m4
++++ b/sapi/apache2handler/config.m4
+@@ -68,7 +68,7 @@ if test "$PHP_APXS2" != "no"; then
+ AS_VERSION_COMPARE([$APACHE_VERSION], [2.4.0],
+ [AC_MSG_ERROR([Please note that Apache version >= 2.4 is required])])
-- APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
+- APXS_LIBEXECDIR='$(INSTALL_ROOT)'$($APXS -q LIBEXECDIR)
+ APXS_LIBEXECDIR="$prefix/modules"
- if test -z `$APXS -q SYSCONFDIR`; then
+ if test -z $($APXS -q SYSCONFDIR); then
INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
index 344d00703164..eeca83414a6c 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -26,11 +26,11 @@ mkDerivation rec {
strictDeps = true;
- nativeBuildInputs = [ cmake pkg-config qttools ];
+ nativeBuildInputs = [ cmake pkg-config qttools ]
+ ++ lib.optionals useSCEL [ emacs ];
buildInputs = [ gcc libjack2 libsndfile fftw curl libXt qtbase qtwebengine qtwebsockets readline ]
- ++ lib.optional (!stdenv.hostPlatform.isDarwin) alsa-lib
- ++ lib.optional useSCEL emacs;
+ ++ lib.optional (!stdenv.hostPlatform.isDarwin) alsa-lib;
hardeningDisable = [ "stackprotector" ];
diff --git a/pkgs/development/libraries/elpa/default.nix b/pkgs/development/libraries/elpa/default.nix
index f13b1a167e23..03e6595d1239 100644
--- a/pkgs/development/libraries/elpa/default.nix
+++ b/pkgs/development/libraries/elpa/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, autoreconfHook, mpiCheckPhaseHook
-, perl, mpi, blas, lapack, scalapack, openssh
+, perl, mpi, blas, lapack, scalapack
# CPU optimizations
, avxSupport ? stdenv.hostPlatform.avxSupport
, avx2Support ? stdenv.hostPlatform.avx2Support
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
doCheck = !enableCuda;
- nativeCheckInputs = [ mpiCheckPhaseHook openssh ];
+ nativeCheckInputs = [ mpiCheckPhaseHook ];
preCheck = ''
#patchShebangs ./
diff --git a/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch b/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch
index 832ae945aa2c..11bd6f561c8b 100644
--- a/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch
+++ b/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch
@@ -1,7 +1,7 @@
-diff --git i/data/meson.build w/data/meson.build
-index 6ac2a11..73f433b 100644
---- i/data/meson.build
-+++ w/data/meson.build
+diff --git a/data/meson.build b/data/meson.build
+index b22ff55..01c5910 100644
+--- a/data/meson.build
++++ b/data/meson.build
@@ -1,6 +1,6 @@
if get_option('enable-backend')
conf = configuration_data()
@@ -10,8 +10,8 @@ index 6ac2a11..73f433b 100644
if get_option('demo-agent')
conf.set('demo_agent', 'geoclue-demo-agent;')
-@@ -8,7 +8,7 @@ if get_option('enable-backend')
- conf.set('demo_agent', '')
+@@ -14,7 +14,7 @@ if get_option('enable-backend')
+ conf.set('default_wifi_enable', 'false')
endif
- conf_dir = join_paths(sysconfdir, 'geoclue')
@@ -19,7 +19,7 @@ index 6ac2a11..73f433b 100644
configure_file(output: 'geoclue.conf',
input: 'geoclue.conf.in',
configuration: conf,
-@@ -17,7 +17,7 @@ if get_option('enable-backend')
+@@ -23,7 +23,7 @@ if get_option('enable-backend')
conf = configuration_data()
conf.set('libexecdir', libexecdir)
conf.set('dbus_srv_user', get_option('dbus-srv-user'))
@@ -28,19 +28,10 @@ index 6ac2a11..73f433b 100644
confd_dir = join_paths(conf_dir, 'conf.d')
install_emptydir(confd_dir)
-@@ -37,7 +37,7 @@ if get_option('enable-backend')
- # DBus Service policy file
- dbus_service_dir = get_option('dbus-sys-dir')
- if dbus_service_dir == ''
-- dbus_service_dir = join_paths(sysconfdir, 'dbus-1', 'system.d')
-+ dbus_service_dir = join_paths(sysconfdir_install, 'dbus-1', 'system.d')
- endif
- configure_file(output: 'org.freedesktop.GeoClue2.conf',
- input: 'org.freedesktop.GeoClue2.conf.in',
-diff --git i/demo/meson.build w/demo/meson.build
+diff --git a/demo/meson.build b/demo/meson.build
index 1427fbe..2623f16 100644
---- i/demo/meson.build
-+++ w/demo/meson.build
+--- a/demo/meson.build
++++ b/demo/meson.build
@@ -54,7 +54,7 @@ if get_option('demo-agent')
install_dir: desktop_dir)
@@ -50,43 +41,33 @@ index 1427fbe..2623f16 100644
meson.add_install_script('install-file.py',
desktop_file.full_path(),
autostart_dir)
-diff --git i/meson.build w/meson.build
-index 220ae2b..dbf6458 100644
---- i/meson.build
-+++ w/meson.build
-@@ -12,7 +12,11 @@ gclue_api_version='2.0'
- datadir = join_paths(get_option('prefix'), get_option('datadir'))
+diff --git a/meson.build b/meson.build
+index c561572..bca0cb3 100644
+--- a/meson.build
++++ b/meson.build
+@@ -13,6 +13,11 @@ datadir = join_paths(get_option('prefix'), get_option('datadir'))
includedir = join_paths(get_option('prefix'), get_option('includedir'))
libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'))
--sysconfdir = join_paths(get_option('prefix'), get_option('sysconfdir'))
+ sysconfdir = join_paths(get_option('prefix'), get_option('sysconfdir'))
+if get_option('sysconfdir_install') != ''
+ sysconfdir_install = join_paths(get_option('prefix'), get_option('sysconfdir_install'))
+else
-+ sysconfdir_install = get_option('sysconfdir')
++ sysconfdir_install = sysconfdir
+endif
localedir = join_paths(datadir, 'locale')
header_dir = 'libgeoclue-' + gclue_api_version
-@@ -29,7 +33,7 @@ conf.set_quoted('PACKAGE_URL', 'https://gitlab.freedesktop.org/geoclue/geoclue/w
- conf.set_quoted('PACKAGE_BUGREPORT', 'https://gitlab.freedesktop.org/geoclue/geoclue/issues/new')
- conf.set_quoted('TEST_SRCDIR', meson.project_source_root() + '/data/')
- conf.set_quoted('LOCALEDIR', localedir)
--conf.set_quoted('SYSCONFDIR', sysconfdir)
-+conf.set_quoted('SYSCONFDIR', get_option('sysconfdir'))
- conf.set_quoted('MOZILLA_API_KEY', get_option('mozilla-api-key'))
- conf.set10('GCLUE_USE_3G_SOURCE', get_option('3g-source'))
- conf.set10('GCLUE_USE_CDMA_SOURCE', get_option('cdma-source'))
-diff --git i/meson_options.txt w/meson_options.txt
-index 5b8c42d..945dfd5 100644
---- i/meson_options.txt
-+++ w/meson_options.txt
-@@ -40,6 +40,9 @@ option('systemd-system-unit-dir',
- option('dbus-srv-user',
- type: 'string', value: 'root',
- description: 'The user (existing) as which the service will run')
+diff --git a/meson_options.txt b/meson_options.txt
+index 4d55a63..682b39c 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -31,6 +31,9 @@ option('enable-backend',
+ option('demo-agent',
+ type: 'boolean', value: true,
+ description: 'Build demo agent')
+option('sysconfdir_install',
+ type: 'string', value: '',
+ description: 'sysconfdir to use during installation')
- option('mozilla-api-key',
- type: 'string', value: 'geoclue',
- description: 'Your API key for Mozilla Location Service')
+ option('dbus-sys-dir',
+ type: 'string',
+ description: 'where D-BUS system.d directory is')
diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix
index 84fa20f8efad..d30c0b411796 100644
--- a/pkgs/development/libraries/geoclue/default.nix
+++ b/pkgs/development/libraries/geoclue/default.nix
@@ -22,11 +22,12 @@
, gobject-introspection
, vala
, withDemoAgent ? false
+, nix-update-script
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "geoclue";
- version = "2.7.0";
+ version = "2.7.2";
outputs = [ "out" "dev" "devdoc" ];
@@ -34,8 +35,8 @@ stdenv.mkDerivation rec {
domain = "gitlab.freedesktop.org";
owner = "geoclue";
repo = "geoclue";
- rev = version;
- hash = "sha256-vzarUg4lBEXYkH+n9SY8SYr0gHUX94PSTDmKd957gyc=";
+ rev = "refs/tags/${finalAttrs.version}";
+ hash = "sha256-LwL1WtCdHb/NwPr3/OLISwaAwplhJwiZT9vUdX29Bbs=";
};
patches = [
@@ -76,13 +77,11 @@ stdenv.mkDerivation rec {
];
mesonFlags = [
- "-Dsystemd-system-unit-dir=${placeholder "out"}/etc/systemd/system"
+ "-Dsystemd-system-unit-dir=${placeholder "out"}/lib/systemd/system"
"-Ddemo-agent=${lib.boolToString withDemoAgent}"
"--sysconfdir=/etc"
"-Dsysconfdir_install=${placeholder "out"}/etc"
- "-Dmozilla-api-key=5c28d1f4-9511-47ff-b11a-2bef80fc177c"
"-Ddbus-srv-user=geoclue"
- "-Ddbus-sys-dir=${placeholder "out"}/share/dbus-1/system.d"
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
"-D3g-source=false"
"-Dcdma-source=false"
@@ -95,12 +94,15 @@ stdenv.mkDerivation rec {
patchShebangs demo/install-file.py
'';
+ updateScript = nix-update-script {};
+
meta = with lib; {
broken = stdenv.hostPlatform.isDarwin && withDemoAgent;
description = "Geolocation framework and some data providers";
homepage = "https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home";
+ changelog = "https://gitlab.freedesktop.org/geoclue/geoclue/-/blob/${finalAttrs.version}/NEWS";
maintainers = with maintainers; [ raskin mimame ];
platforms = with platforms; linux ++ darwin;
license = licenses.lgpl2Plus;
};
-}
+})
diff --git a/pkgs/development/libraries/libwpe/fdo.nix b/pkgs/development/libraries/libwpe/fdo.nix
index 3d2df9259a54..d4e743ee2855 100644
--- a/pkgs/development/libraries/libwpe/fdo.nix
+++ b/pkgs/development/libraries/libwpe/fdo.nix
@@ -16,11 +16,11 @@
stdenv.mkDerivation rec {
pname = "wpebackend-fdo";
- version = "1.14.2";
+ version = "1.14.3";
src = fetchurl {
url = "https://wpewebkit.org/releases/wpebackend-fdo-${version}.tar.xz";
- sha256 = "k8l2aumGTurq7isKdPIsvKCN9CwaG9tVsIbyUo44DTg=";
+ sha256 = "sha256-EBIYQllahQKR2z6C89sLmYTfB5Ai04bOQsK4UIFZ3Gw=";
};
depsBuildBuild = [
diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix
index 0643fabdd8c6..2a4007c3ce71 100644
--- a/pkgs/development/libraries/ogre/default.nix
+++ b/pkgs/development/libraries/ogre/default.nix
@@ -112,9 +112,9 @@ let
in
{
ogre_14 = common {
- version = "14.3.0";
- hash = "sha256-SQ0Ij04W/KgonHDLFEPFDhXb/TDkT8I6W8J7hz3gtrg=";
- # https://github.com/OGRECave/ogre/blob/v14.3.0/Components/Overlay/CMakeLists.txt
+ version = "14.3.1";
+ hash = "sha256-rr8tetBfFdZPVvN3fYRWltf8/e6oLcLL0uhHKWanuVA=";
+ # https://github.com/OGRECave/ogre/blob/v14.3.1/Components/Overlay/CMakeLists.txt
imguiVersion = "1.91.2";
imguiHash = "sha256-B7XXQNuEPcT1ID5nMYbAV+aNCG9gIrC9J7BLnYB8yjI=";
};
diff --git a/pkgs/development/libraries/science/math/dbcsr/default.nix b/pkgs/development/libraries/science/math/dbcsr/default.nix
index 34f9c4db39cc..e758e1c8fcc2 100644
--- a/pkgs/development/libraries/science/math/dbcsr/default.nix
+++ b/pkgs/development/libraries/science/math/dbcsr/default.nix
@@ -11,7 +11,6 @@
, python3
, libxsmm
, mpi
-, openssh
}:
stdenv.mkDerivation rec {
@@ -62,7 +61,6 @@ stdenv.mkDerivation rec {
];
checkInputs = [
- openssh
mpiCheckPhaseHook
];
diff --git a/pkgs/development/libraries/science/math/p4est-sc/default.nix b/pkgs/development/libraries/science/math/p4est-sc/default.nix
index 39b5660494d2..3ac61e5c2b36 100644
--- a/pkgs/development/libraries/science/math/p4est-sc/default.nix
+++ b/pkgs/development/libraries/science/math/p4est-sc/default.nix
@@ -1,14 +1,13 @@
{ lib, stdenv, fetchFromGitHub, mpiCheckPhaseHook
, autoreconfHook, pkg-config
, p4est-sc-debugEnable ? true, p4est-sc-mpiSupport ? true
-, mpi, openssh, zlib
+, mpi, zlib
}:
let
dbg = lib.optionalString debugEnable "-dbg";
debugEnable = p4est-sc-debugEnable;
mpiSupport = p4est-sc-mpiSupport;
- isOpenmpi = mpiSupport && mpi.pname == "openmpi";
in
stdenv.mkDerivation {
pname = "p4est-sc${dbg}";
@@ -24,9 +23,7 @@ stdenv.mkDerivation {
strictDeps = true;
nativeBuildInputs = [ autoreconfHook pkg-config ];
- propagatedNativeBuildInputs = lib.optional mpiSupport mpi
- ++ lib.optional isOpenmpi openssh
- ;
+ propagatedNativeBuildInputs = lib.optional mpiSupport mpi ;
propagatedBuildInputs = [ zlib ];
inherit debugEnable mpiSupport;
@@ -49,7 +46,6 @@ stdenv.mkDerivation {
nativeCheckInputs = lib.optionals mpiSupport [
mpiCheckPhaseHook
- openssh
];
# disallow Darwin checks due to prototype incompatibility of qsort_r
diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix
index f7b4ba6738d1..3efd66dff395 100644
--- a/pkgs/development/libraries/science/math/scalapack/default.nix
+++ b/pkgs/development/libraries/science/math/scalapack/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake
-, openssh, mpiCheckPhaseHook, mpi, blas, lapack
+, mpiCheckPhaseHook, mpi, blas, lapack
} :
assert blas.isILP64 == lapack.isILP64;
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
nativeBuildInputs = [ cmake ];
- nativeCheckInputs = [ openssh mpiCheckPhaseHook ];
+ nativeCheckInputs = [ mpiCheckPhaseHook ];
buildInputs = [ blas lapack ];
propagatedBuildInputs = [ mpi ];
hardeningDisable = lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) [ "stackprotector" ];
diff --git a/pkgs/development/ocaml-modules/ocaml-version/default.nix b/pkgs/development/ocaml-modules/ocaml-version/default.nix
index c475cc7a97d0..a8a998299a95 100644
--- a/pkgs/development/ocaml-modules/ocaml-version/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-version/default.nix
@@ -2,11 +2,11 @@
buildDunePackage rec {
pname = "ocaml-version";
- version = "3.6.8";
+ version = "3.6.9";
src = fetchurl {
url = "https://github.com/ocurrent/ocaml-version/releases/download/v${version}/ocaml-version-${version}.tbz";
- hash = "sha256-mCIeXsvpea/iFuJkvearu6wr804qFPCcH4WOaUKYC9k=";
+ hash = "sha256-NcelYCcDPooOP7GfWr2m27GDikKiMqezcvRfFmBzlYY=";
};
checkInputs = [ alcotest ];
diff --git a/pkgs/development/php-packages/couchbase/default.nix b/pkgs/development/php-packages/couchbase/default.nix
index 2ed284fe6079..381ec3734243 100644
--- a/pkgs/development/php-packages/couchbase/default.nix
+++ b/pkgs/development/php-packages/couchbase/default.nix
@@ -5,6 +5,7 @@
libcouchbase,
zlib,
substituteAll,
+ php,
}:
let
pname = "couchbase";
@@ -40,5 +41,6 @@ buildPecl {
license = licenses.asl20;
homepage = "https://docs.couchbase.com/php-sdk/current/project-docs/sdk-release-notes.html";
maintainers = teams.php.members;
+ broken = lib.versionAtLeast php.version "8.3";
};
}
diff --git a/pkgs/development/php-packages/openswoole/default.nix b/pkgs/development/php-packages/openswoole/default.nix
index b250db4a3003..0a56b3f0e774 100644
--- a/pkgs/development/php-packages/openswoole/default.nix
+++ b/pkgs/development/php-packages/openswoole/default.nix
@@ -5,6 +5,7 @@
valgrind,
pcre2,
fetchFromGitHub,
+ php,
}:
let
@@ -34,5 +35,6 @@ buildPecl {
You can use the sync or async, Coroutine API to write whole applications or create thousands of light weight Coroutines within one Linux process.
'';
maintainers = teams.php.members;
+ broken = lib.versionAtLeast php.version "8.4";
};
}
diff --git a/pkgs/development/php-packages/phalcon/default.nix b/pkgs/development/php-packages/phalcon/default.nix
index b5d89ee6a0d2..e571c746f652 100644
--- a/pkgs/development/php-packages/phalcon/default.nix
+++ b/pkgs/development/php-packages/phalcon/default.nix
@@ -33,5 +33,6 @@ buildPecl rec {
license = licenses.bsd3;
homepage = "https://phalcon.io";
maintainers = teams.php.members ++ [ maintainers.krzaczek ];
+ broken = lib.versionAtLeast php.version "8.4";
};
}
diff --git a/pkgs/development/php-packages/psysh/default.nix b/pkgs/development/php-packages/psysh/default.nix
index e30fc51cfd8b..ffa163168286 100644
--- a/pkgs/development/php-packages/psysh/default.nix
+++ b/pkgs/development/php-packages/psysh/default.nix
@@ -19,7 +19,7 @@ let
composerLock = fetchurl {
name = "composer.lock";
url = "https://github.com/bobthecow/psysh/releases/download/v${version}/composer-v${version}.lock";
- hash = "sha256-ur6mzla3uXeFL6aEHAPdpxGdvcgzOgTLW/CKPbNqeCg=";
+ hash = "sha256-PQDWShzvTY8yF+OUPVJAV0HMx0/KnA03TDhZUM7ppXw=";
};
in
php.buildComposerProject2 (finalAttrs: {
@@ -45,7 +45,7 @@ php.buildComposerProject2 (finalAttrs: {
composer update --lock --no-install
'';
- vendorHash = "sha256-mW276lzOTCY68EnvSVR+tD+gh3Y61GrWchVJHDZ4dpg=";
+ vendorHash = "sha256-tKy2A3dGGmZZzZF0JxtG6NYMfG/paQsuxAO1y3GfCsA=";
};
meta = {
diff --git a/pkgs/development/php-packages/swoole/default.nix b/pkgs/development/php-packages/swoole/default.nix
index 6cc399be10dc..7b52c838f473 100644
--- a/pkgs/development/php-packages/swoole/default.nix
+++ b/pkgs/development/php-packages/swoole/default.nix
@@ -33,5 +33,6 @@ buildPecl {
homepage = "https://www.swoole.com";
license = lib.licenses.asl20;
maintainers = lib.teams.php.members;
+ broken = lib.versionAtLeast php.version "8.4";
};
}
diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix
index 84ac38f6c4b8..56fff995095e 100644
--- a/pkgs/development/php-packages/xdebug/default.nix
+++ b/pkgs/development/php-packages/xdebug/default.nix
@@ -1,6 +1,7 @@
{
buildPecl,
lib,
+ php,
fetchFromGitHub,
}:
@@ -29,5 +30,6 @@ buildPecl {
homepage = "https://xdebug.org/";
license = lib.licenses.php301;
maintainers = lib.teams.php.members;
+ broken = lib.versionAtLeast php.version "8.4";
};
}
diff --git a/pkgs/development/python-modules/aiohttp-client-cache/default.nix b/pkgs/development/python-modules/aiohttp-client-cache/default.nix
index 6f3116938465..e7e1812db0ff 100644
--- a/pkgs/development/python-modules/aiohttp-client-cache/default.nix
+++ b/pkgs/development/python-modules/aiohttp-client-cache/default.nix
@@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "aiohttp-client-cache";
- version = "0.11.1";
+ version = "0.12.4";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "aiohttp_client_cache";
inherit version;
- hash = "sha256-MuY60hAkD4Ik8+Encv5TrBAs8kx88Y3bhqy7n9+eS28=";
+ hash = "sha256-5g/oFhNrWx1m87trJyq4HZeFTqHk2bVwhaNgQmln0mU=";
};
build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/ansitable/default.nix b/pkgs/development/python-modules/ansitable/default.nix
index ea6362b605d3..e722d504d61f 100644
--- a/pkgs/development/python-modules/ansitable/default.nix
+++ b/pkgs/development/python-modules/ansitable/default.nix
@@ -7,29 +7,31 @@
colored,
pytestCheckHook,
numpy,
+ pandas,
}:
buildPythonPackage rec {
pname = "ansitable";
- version = "0.11.2";
+ version = "0.11.3";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-MQ6VLjFDt/dEHDK8PbQsBdfzogJCm+pzyVYDbqkDOao=";
+ hash = "sha256-navayezkSSHgwOysC3fbgTQahRZjIV24JzIAQl+X5Jk=";
};
- nativeBuildInputs = [ setuptools ];
+ build-system = [ setuptools ];
- propagatedBuildInputs = [ colored ];
+ dependencies = [ colored ];
pythonImportsCheck = [ "ansitable" ];
nativeCheckInputs = [
pytestCheckHook
numpy
+ pandas
];
meta = with lib; {
diff --git a/pkgs/development/python-modules/cachier/default.nix b/pkgs/development/python-modules/cachier/default.nix
index fc1bad68f3aa..e040c536c54e 100644
--- a/pkgs/development/python-modules/cachier/default.nix
+++ b/pkgs/development/python-modules/cachier/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "cachier";
- version = "3.1.1";
+ version = "3.1.2";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "python-cachier";
repo = "cachier";
rev = "refs/tags/v${version}";
- hash = "sha256-LVGdPBDPj3c7eyOMt+JM0WynkJjmxzgsBlsfQCa8Wv0=";
+ hash = "sha256-siighT6hMicN+F/LIXfUAPQ2kkRiyk7CtjqmyC/qCFg=";
};
pythonRemoveDeps = [ "setuptools" ];
diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix
index e078836c9121..ecdcd5759349 100644
--- a/pkgs/development/python-modules/confluent-kafka/default.nix
+++ b/pkgs/development/python-modules/confluent-kafka/default.nix
@@ -13,12 +13,13 @@
rdkafka,
requests,
requests-mock,
+ setuptools,
}:
buildPythonPackage rec {
pname = "confluent-kafka";
version = "2.5.3";
- format = "setuptools";
+ pyproject = true;
disabled = pythonOlder "3.7";
@@ -31,18 +32,24 @@ buildPythonPackage rec {
buildInputs = [ rdkafka ];
- propagatedBuildInputs = [ requests ];
+ build-system = [ setuptools ];
optional-dependencies = {
avro = [
avro
fastavro
+ requests
];
json = [
jsonschema
pyrsistent
+ requests
];
- protobuf = [ protobuf ];
+ protobuf = [
+ protobuf
+ requests
+ ];
+ schema-registry = [ requests ];
};
nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/django-parler/default.nix b/pkgs/development/python-modules/django-parler/default.nix
index b963f709a4d3..73e52c187cca 100644
--- a/pkgs/development/python-modules/django-parler/default.nix
+++ b/pkgs/development/python-modules/django-parler/default.nix
@@ -5,12 +5,13 @@
fetchFromGitHub,
pythonOlder,
python,
+ setuptools,
}:
buildPythonPackage rec {
pname = "django-parler";
version = "2.3";
- format = "setuptools";
+ pyproject = true;
disabled = pythonOlder "3.7";
@@ -21,7 +22,16 @@ buildPythonPackage rec {
hash = "sha256-tRGifFPCXF3aa3PQWKw3tl1H1TY+lgcChUP1VdwG1cE=";
};
- propagatedBuildInputs = [ django ];
+ build-system = [ setuptools ];
+
+ dependencies = [ django ];
+
+ # Disable failing test: article.tests.AdminArticleTestCase.test_admin_add
+ # AssertionError: 'Ajout de Article (Hollandais)
' not found in ...
+ # https://github.com/django-parler/django-parler/issues/358
+ preCheck = lib.optionalString (lib.versionAtLeast django.version "5.0") ''
+ rm example/article/tests.py
+ '';
checkPhase = ''
runHook preCheck
@@ -29,11 +39,11 @@ buildPythonPackage rec {
runHook postCheck
'';
- meta = with lib; {
+ meta = {
description = "Simple Django model translations without nasty hacks";
homepage = "https://github.com/django-parler/django-parler";
changelog = "https://github.com/django-parler/django-parler/releases/tag/v${version}";
- license = licenses.asl20;
- maintainers = with maintainers; [ derdennisop ];
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ derdennisop ];
};
}
diff --git a/pkgs/development/python-modules/jupyter-collaboration-ui/default.nix b/pkgs/development/python-modules/jupyter-collaboration-ui/default.nix
new file mode 100644
index 000000000000..2e571e222c25
--- /dev/null
+++ b/pkgs/development/python-modules/jupyter-collaboration-ui/default.nix
@@ -0,0 +1,44 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchPypi,
+ hatchling,
+ hatch-jupyter-builder,
+ jupyter-collaboration,
+}:
+
+buildPythonPackage rec {
+ pname = "jupyter-collaboration-ui";
+ version = "1.0.0";
+ pyproject = true;
+
+ src = fetchPypi {
+ pname = "jupyter_collaboration_ui";
+ inherit version;
+ hash = "sha256-hTyUmLzRvexNTZxTv4Mbflm+OTW9j0HReLpAJuk/WnY=";
+ };
+
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace-fail ', "jupyterlab>=4.0.0"' ""
+ '';
+
+ build-system = [
+ hatchling
+ hatch-jupyter-builder
+ ];
+
+ pythonImportsCheck = [ "jupyter_collaboration_ui" ];
+
+ # no tests
+ doCheck = false;
+
+ passthru.tests = jupyter-collaboration.tests;
+
+ meta = {
+ description = "JupyterLab/Jupyter Notebook 7+ extension providing user interface integration for real time collaboration";
+ homepage = "https://github.com/jupyterlab/jupyter-collaboration/tree/main/projects/jupyter-collaboration-ui";
+ license = lib.licenses.bsd3;
+ maintainers = lib.teams.jupyter.members;
+ };
+}
diff --git a/pkgs/development/python-modules/jupyter-collaboration/default.nix b/pkgs/development/python-modules/jupyter-collaboration/default.nix
index 0489550cfc68..4f6e29fee66d 100644
--- a/pkgs/development/python-modules/jupyter-collaboration/default.nix
+++ b/pkgs/development/python-modules/jupyter-collaboration/default.nix
@@ -4,73 +4,42 @@
fetchPypi,
# build-system
- hatch-jupyter-builder,
- hatch-nodejs-version,
hatchling,
- jupyterlab,
# dependencies
- jsonschema,
- jupyter-events,
- jupyter-server,
- jupyter-server-fileid,
- jupyter-ydoc,
- pycrdt,
- pycrdt-websocket,
+ jupyter-collaboration-ui,
+ jupyter-docprovider,
+ jupyter-server-ydoc,
# tests
- pytest-jupyter,
- pytestCheckHook,
- websockets,
+ callPackage,
}:
buildPythonPackage rec {
pname = "jupyter-collaboration";
- version = "2.1.4";
+ version = "3.0.0";
pyproject = true;
src = fetchPypi {
pname = "jupyter_collaboration";
inherit version;
- hash = "sha256-YT3wrTQ8imuTK8zeJbwscHtawtqspf1oItGzMMfg5io=";
+ hash = "sha256-eewAsh/EI8DV4FNWgjEhT61RUbaYE6suOAny4bf1CCw=";
};
- postPatch = ''
- sed -i "/^timeout/d" pyproject.toml
- '';
-
- build-system = [
- hatch-jupyter-builder
- hatch-nodejs-version
- hatchling
- jupyterlab
- ];
+ build-system = [ hatchling ];
dependencies = [
- jsonschema
- jupyter-events
- jupyter-server
- jupyter-server-fileid
- jupyter-ydoc
- pycrdt
- pycrdt-websocket
- ];
-
- nativeCheckInputs = [
- pytest-jupyter
- pytestCheckHook
- websockets
+ jupyter-collaboration-ui
+ jupyter-docprovider
+ jupyter-server-ydoc
];
pythonImportsCheck = [ "jupyter_collaboration" ];
- preCheck = ''
- export HOME=$TEMP
- '';
+ # no tests
+ doCheck = false;
- pytestFlagsArray = [ "-Wignore::DeprecationWarning" ];
-
- __darwinAllowLocalNetworking = true;
+ passthru.tests = callPackage ./test.nix { };
meta = {
description = "JupyterLab Extension enabling Real-Time Collaboration";
diff --git a/pkgs/development/python-modules/jupyter-collaboration/test.nix b/pkgs/development/python-modules/jupyter-collaboration/test.nix
new file mode 100644
index 000000000000..044b923a723d
--- /dev/null
+++ b/pkgs/development/python-modules/jupyter-collaboration/test.nix
@@ -0,0 +1,39 @@
+{
+ stdenvNoCC,
+ fetchFromGitHub,
+ jupyter-collaboration,
+ pytest-jupyter,
+ pytestCheckHook,
+ websockets,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+ pname = "jupyter-collaboration-test";
+ inherit (jupyter-collaboration) version;
+
+ src = fetchFromGitHub {
+ owner = "jupyterlab";
+ repo = "jupyter-collaboration";
+ rev = "refs/tags/v${finalAttrs.version}";
+ hash = "sha256-6hDYB1uC0WraB37s9EKLJF7jyFu0B3xLocuLYyKj4hs=";
+ };
+
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace-fail "timeout = 300" ""
+ '';
+
+ installPhase = ''
+ touch $out
+ '';
+
+ env.HOME = "$TMPDIR";
+
+ doCheck = true;
+
+ nativeCheckInputs = [
+ jupyter-collaboration
+ pytest-jupyter
+ pytestCheckHook
+ websockets
+ ];
+})
diff --git a/pkgs/development/python-modules/jupyter-docprovider/default.nix b/pkgs/development/python-modules/jupyter-docprovider/default.nix
new file mode 100644
index 000000000000..d32dc1b31140
--- /dev/null
+++ b/pkgs/development/python-modules/jupyter-docprovider/default.nix
@@ -0,0 +1,44 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchPypi,
+ hatchling,
+ hatch-jupyter-builder,
+ jupyter-collaboration,
+}:
+
+buildPythonPackage rec {
+ pname = "jupyter-docprovider";
+ version = "1.0.0";
+ pyproject = true;
+
+ src = fetchPypi {
+ pname = "jupyter_docprovider";
+ inherit version;
+ hash = "sha256-EcO3GqdbhRxawHwfSnjOHfFmYjpZy2NuuGc5CSW/xlY=";
+ };
+
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace-fail ', "jupyterlab>=4.0.0"' ""
+ '';
+
+ build-system = [
+ hatchling
+ hatch-jupyter-builder
+ ];
+
+ pythonImportsCheck = [ "jupyter_docprovider" ];
+
+ # no tests
+ doCheck = false;
+
+ passthru.tests = jupyter-collaboration.tests;
+
+ meta = {
+ description = "JupyterLab/Jupyter Notebook 7+ extension integrating collaborative shared models";
+ homepage = "https://github.com/jupyterlab/jupyter-collaboration/tree/main/projects/jupyter-docprovider";
+ license = lib.licenses.bsd3;
+ maintainers = lib.teams.jupyter.members;
+ };
+}
diff --git a/pkgs/development/python-modules/jupyter-server-ydoc/default.nix b/pkgs/development/python-modules/jupyter-server-ydoc/default.nix
new file mode 100644
index 000000000000..1e988383621b
--- /dev/null
+++ b/pkgs/development/python-modules/jupyter-server-ydoc/default.nix
@@ -0,0 +1,52 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchPypi,
+ hatchling,
+ jsonschema,
+ jupyter-events,
+ jupyter-server,
+ jupyter-server-fileid,
+ jupyter-ydoc,
+ pycrdt,
+ pycrdt-websocket,
+ jupyter-collaboration,
+}:
+
+buildPythonPackage rec {
+ pname = "jupyter-server-ydoc";
+ version = "1.0.0";
+ pyproject = true;
+
+ src = fetchPypi {
+ pname = "jupyter_server_ydoc";
+ inherit version;
+ hash = "sha256-MBdSTB2gaIFbdIyPHr5+wI7aBH/Fl85ywSWxgAmjkek=";
+ };
+
+ build-system = [ hatchling ];
+
+ dependencies = [
+ jsonschema
+ jupyter-events
+ jupyter-server
+ jupyter-server-fileid
+ jupyter-ydoc
+ pycrdt
+ pycrdt-websocket
+ ];
+
+ pythonImportsCheck = [ "jupyter_server_ydoc" ];
+
+ # no tests
+ doCheck = false;
+
+ passthru.tests = jupyter-collaboration.tests;
+
+ meta = {
+ description = "Jupyter-server extension integrating collaborative shared models";
+ homepage = "https://github.com/jupyterlab/jupyter-collaboration/tree/main/projects/jupyter-server-ydoc";
+ license = lib.licenses.bsd3;
+ maintainers = lib.teams.jupyter.members;
+ };
+}
diff --git a/pkgs/development/python-modules/jupyter-ydoc/default.nix b/pkgs/development/python-modules/jupyter-ydoc/default.nix
index 4bb08e6ed9a5..5fa69f424fbd 100644
--- a/pkgs/development/python-modules/jupyter-ydoc/default.nix
+++ b/pkgs/development/python-modules/jupyter-ydoc/default.nix
@@ -18,13 +18,13 @@
buildPythonPackage rec {
pname = "jupyter-ydoc";
- version = "2.1.2";
+ version = "3.0.0";
pyproject = true;
src = fetchPypi {
pname = "jupyter_ydoc";
inherit version;
- hash = "sha256-yYnIm0s9ljtYQJVzKJcimNTVSDTtjzz3Zo3WE9OfKsw=";
+ hash = "sha256-nPOU7nxpVSh+6tERJq2DYIOpyjze8uJyIdxN/gW7arE=";
};
build-system = [
diff --git a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix
index c4da40729c0f..79c5c99ff99e 100644
--- a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix
+++ b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix
@@ -1,32 +1,52 @@
{
lib,
buildPythonPackage,
+ fetchFromGitHub,
+ setuptools,
jupyterhub,
ldap3,
- fetchPypi,
+ traitlets,
+ pytestCheckHook,
+ pytest-asyncio,
}:
buildPythonPackage rec {
pname = "jupyterhub-ldapauthenticator";
- version = "1.3.2";
- format = "setuptools";
+ version = "2.0.1";
+ pyproject = true;
- src = fetchPypi {
- inherit pname version;
- sha256 = "758081bbdb28b26313bb18c9d8aa2b8fcdc9162e4d3ab196c626567e64f1ab8b";
+ src = fetchFromGitHub {
+ owner = "jupyterhub";
+ repo = "ldapauthenticator";
+ rev = "refs/tags/${version}";
+ hash = "sha256-pb1d0dqu3VGCsuibpYgncbqCM9fz09yyoKGcKb14f4k=";
};
- # No tests implemented
- doCheck = false;
+ build-system = [ setuptools ];
- propagatedBuildInputs = [
+ dependencies = [
jupyterhub
ldap3
+ traitlets
+ ];
+
+ pythonImportsCheck = [ "ldapauthenticator" ];
+
+ nativeCheckInputs = [
+ pytest-asyncio
+ pytestCheckHook
+ ];
+
+ disabledTests = [
+ # touch the socket
+ "test_allow_config"
+ "test_ldap_auth"
];
meta = with lib; {
description = "Simple LDAP Authenticator Plugin for JupyterHub";
homepage = "https://github.com/jupyterhub/ldapauthenticator";
+ changelog = "https://github.com/jupyterhub/ldapauthenticator/blob/${version}/CHANGELOG.md";
license = licenses.bsd3;
};
}
diff --git a/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix b/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix
index c40866fd3d82..ebcbfb71d7c5 100644
--- a/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix
+++ b/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "jupyterhub-systemdspawner";
- version = "1.0.1";
+ version = "1.0.2";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "jupyterhub";
repo = "systemdspawner";
rev = "refs/tags/v${version}";
- hash = "sha256-2Pxswa472umovHBUVTIX1l+Glj6bzzgBLsu+p4IA6jA=";
+ hash = "sha256-obM8HGCHsisRV1+kHMWdA7d6eb6awwPMBuDUAf3k0uI=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix
index 76fbe01ae3d1..5fb9cc969b59 100644
--- a/pkgs/development/python-modules/jupyterhub/default.nix
+++ b/pkgs/development/python-modules/jupyterhub/default.nix
@@ -42,7 +42,7 @@
buildPythonPackage rec {
pname = "jupyterhub";
- version = "5.1.0";
+ version = "5.2.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -51,12 +51,12 @@ buildPythonPackage rec {
owner = "jupyterhub";
repo = "jupyterhub";
rev = "refs/tags/${version}";
- hash = "sha256-3L83FLhLCdTgOuFRgRMbz316cYbai0Z+hJwxXUCYB2Y=";
+ hash = "sha256-zOWcXpByJRzI9sTjTl+w/vo99suKOEN0TvPn1ZWlNmc=";
};
npmDeps = fetchNpmDeps {
inherit src;
- hash = "sha256-b7j6iGYXrwco4YruqRPEEi4yWRF6otTUD2jKCEPcLTE=";
+ hash = "sha256-My7WUAqIvOrbbVTxSnA6a5NviM6u95+iyykx1xbudpw=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix b/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix
index 508608ca7362..84e899b288f1 100644
--- a/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix
+++ b/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix
@@ -27,13 +27,13 @@
buildPythonPackage rec {
pname = "langchain-azure-dynamic-sessions";
- version = "0.3.6";
+ version = "0.2.0";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
- rev = "refs/tags/langchain-core==${version}";
+ rev = "refs/tags/langchain-azure-dynamic-sessions==${version}";
hash = "sha256-ACR+JzKcnYXROGOQe6DlZeqcYd40KlesgXSUOybOT20=";
};
@@ -74,6 +74,9 @@ buildPythonPackage rec {
homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/azure-dynamic-sessions";
changelog = "https://github.com/langchain-ai/langchain/releases/tag/langchain-azure-dynamic-sessions==${version}";
license = lib.licenses.mit;
- maintainers = with lib.maintainers; [ natsukium ];
+ maintainers = with lib.maintainers; [
+ natsukium
+ sarahec
+ ];
};
}
diff --git a/pkgs/development/python-modules/langchain-chroma/default.nix b/pkgs/development/python-modules/langchain-chroma/default.nix
index e7ad5196c6fd..1ec6ce71ed5d 100644
--- a/pkgs/development/python-modules/langchain-chroma/default.nix
+++ b/pkgs/development/python-modules/langchain-chroma/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "langchain-chroma";
- version = "0.3.6";
+ version = "0.1.4";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
- rev = "refs/tags/langchain-core==${version}";
- hash = "sha256-ACR+JzKcnYXROGOQe6DlZeqcYd40KlesgXSUOybOT20=";
+ rev = "refs/tags/langchain-chroma==${version}";
+ hash = "sha256-pU7H8OYXa+JjdkSO36xESPI6r3xA+9cFXxeJnfpYuHc=";
};
sourceRoot = "${src.name}/libs/partners/chroma";
diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix
index 49ad6cf3c7a1..8bdc7ededc7b 100644
--- a/pkgs/development/python-modules/langchain-core/default.nix
+++ b/pkgs/development/python-modules/langchain-core/default.nix
@@ -34,14 +34,14 @@
buildPythonPackage rec {
pname = "langchain-core";
- version = "0.3.12";
+ version = "0.3.15";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
rev = "refs/tags/langchain-core==${version}";
- hash = "sha256-WWzEIP/JirA4btYVy4+U7PSg6S8VnkZqxPLgLriWbTY=";
+ hash = "sha256-lSXAqjjnihuucTZOSwQJk8gtrtFbUOTHN4J587iLKy0=";
};
sourceRoot = "${src.name}/libs/core";
@@ -143,6 +143,9 @@ buildPythonPackage rec {
homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/core";
changelog = "https://github.com/langchain-ai/langchain/releases/tag/v${version}";
license = lib.licenses.mit;
- maintainers = with lib.maintainers; [ natsukium ];
+ maintainers = with lib.maintainers; [
+ natsukium
+ sarahec
+ ];
};
}
diff --git a/pkgs/development/python-modules/langchain-huggingface/default.nix b/pkgs/development/python-modules/langchain-huggingface/default.nix
index 54c3c2f41285..074f87ee135e 100644
--- a/pkgs/development/python-modules/langchain-huggingface/default.nix
+++ b/pkgs/development/python-modules/langchain-huggingface/default.nix
@@ -30,13 +30,13 @@
buildPythonPackage rec {
pname = "langchain-huggingface";
- version = "0.3.6";
+ version = "0.1.2";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
- rev = "refs/tags/langchain-core==${version}";
+ rev = "refs/tags/langchain-huggingface==${version}";
hash = "sha256-ACR+JzKcnYXROGOQe6DlZeqcYd40KlesgXSUOybOT20=";
};
@@ -80,6 +80,9 @@ buildPythonPackage rec {
description = "An integration package connecting Huggingface related classes and LangChain";
homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/huggingface";
license = lib.licenses.mit;
- maintainers = with lib.maintainers; [ natsukium ];
+ maintainers = with lib.maintainers; [
+ natsukium
+ sarahec
+ ];
};
}
diff --git a/pkgs/development/python-modules/langchain-mongodb/default.nix b/pkgs/development/python-modules/langchain-mongodb/default.nix
index f58683581833..0c1422bbeb59 100644
--- a/pkgs/development/python-modules/langchain-mongodb/default.nix
+++ b/pkgs/development/python-modules/langchain-mongodb/default.nix
@@ -22,14 +22,14 @@
buildPythonPackage rec {
pname = "langchain-mongodb";
- version = "0.3.6";
+ version = "0.2.0";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
- rev = "refs/tags/langchain-core==${version}";
- hash = "sha256-ACR+JzKcnYXROGOQe6DlZeqcYd40KlesgXSUOybOT20=";
+ rev = "refs/tags/langchain-mongodb==${version}";
+ hash = "sha256-Jd9toXkS9dGtSIrJQ/5W+swV1z2BJOJKBtkyGzj3oSc=";
};
sourceRoot = "${src.name}/libs/partners/mongodb";
@@ -65,6 +65,9 @@ buildPythonPackage rec {
description = "Integration package connecting MongoDB and LangChain";
homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/mongodb";
license = lib.licenses.mit;
- maintainers = with lib.maintainers; [ natsukium ];
+ maintainers = with lib.maintainers; [
+ natsukium
+ sarahec
+ ];
};
}
diff --git a/pkgs/development/python-modules/langchain-ollama/default.nix b/pkgs/development/python-modules/langchain-ollama/default.nix
index 344aa5cc8616..72bcf180d414 100644
--- a/pkgs/development/python-modules/langchain-ollama/default.nix
+++ b/pkgs/development/python-modules/langchain-ollama/default.nix
@@ -21,14 +21,14 @@
buildPythonPackage rec {
pname = "langchain-ollama";
- version = "0.3.6";
+ version = "0.2.0";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
- rev = "refs/tags/langchain-core==${version}";
- hash = "sha256-ACR+JzKcnYXROGOQe6DlZeqcYd40KlesgXSUOybOT20=";
+ rev = "refs/tags/langchain-ollama==${version}";
+ hash = "sha256-NtlJqIevdaoOO4oDqKsL4OFbw8tHb3FjV9LrTytOGKE=";
};
sourceRoot = "${src.name}/libs/partners/ollama";
diff --git a/pkgs/development/python-modules/langchain-openai/default.nix b/pkgs/development/python-modules/langchain-openai/default.nix
index 96019d63e692..e58b03a7d2cd 100644
--- a/pkgs/development/python-modules/langchain-openai/default.nix
+++ b/pkgs/development/python-modules/langchain-openai/default.nix
@@ -28,14 +28,14 @@
buildPythonPackage rec {
pname = "langchain-openai";
- version = "0.3.6";
+ version = "0.2.5";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
- rev = "refs/tags/langchain-core==${version}";
- hash = "sha256-ACR+JzKcnYXROGOQe6DlZeqcYd40KlesgXSUOybOT20=";
+ rev = "refs/tags/langchain-openai==${version}";
+ hash = "sha256-Gm7MAOuG+kYQ3TRTRdQXJ+HcoUz+iL9j+pTXz+zAySg=";
};
sourceRoot = "${src.name}/libs/partners/openai";
@@ -96,6 +96,9 @@ buildPythonPackage rec {
description = "Integration package connecting OpenAI and LangChain";
homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/openai";
license = lib.licenses.mit;
- maintainers = with lib.maintainers; [ natsukium ];
+ maintainers = with lib.maintainers; [
+ natsukium
+ sarahec
+ ];
};
}
diff --git a/pkgs/development/python-modules/langchain-standard-tests/default.nix b/pkgs/development/python-modules/langchain-standard-tests/default.nix
index 3bec0ee76be3..34a7b5c2adcc 100644
--- a/pkgs/development/python-modules/langchain-standard-tests/default.nix
+++ b/pkgs/development/python-modules/langchain-standard-tests/default.nix
@@ -21,12 +21,11 @@
buildPythonPackage rec {
pname = "langchain-standard-tests";
- version = "0.1.1";
pyproject = true;
# this is an internal library, so there are no tags
# sync source with langchain-core for easy updates
- inherit (langchain-core) src;
+ inherit (langchain-core) src version;
sourceRoot = "${src.name}/libs/standard-tests";
build-system = [ poetry-core ];
@@ -51,6 +50,9 @@ buildPythonPackage rec {
description = "Build context-aware reasoning applications";
homepage = "https://github.com/langchain-ai/langchain";
license = lib.licenses.mit;
- maintainers = with lib.maintainers; [ natsukium ];
+ maintainers = with lib.maintainers; [
+ natsukium
+ sarahec
+ ];
};
}
diff --git a/pkgs/development/python-modules/langchain-text-splitters/default.nix b/pkgs/development/python-modules/langchain-text-splitters/default.nix
index 5e3412efacc9..aed23439349e 100644
--- a/pkgs/development/python-modules/langchain-text-splitters/default.nix
+++ b/pkgs/development/python-modules/langchain-text-splitters/default.nix
@@ -17,23 +17,21 @@
buildPythonPackage rec {
pname = "langchain-text-splitters";
- version = "0.3.6";
+ version = "0.3.2";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
- rev = "refs/tags/langchain-core==${version}";
- hash = "sha256-ACR+JzKcnYXROGOQe6DlZeqcYd40KlesgXSUOybOT20=";
+ rev = "refs/tags/langchain-text-splitters==${version}";
+ hash = "sha256-TaK8lnPxKUqwvKLtQIfzg2l8McQ1fd0g9vocHM0+kjY=";
};
sourceRoot = "${src.name}/libs/text-splitters";
build-system = [ poetry-core ];
- dependencies = [
- langchain-core
- ];
+ dependencies = [ langchain-core ];
pythonImportsCheck = [ "langchain_text_splitters" ];
@@ -54,6 +52,9 @@ buildPythonPackage rec {
description = "LangChain utilities for splitting into chunks a wide variety of text documents";
homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/text-splitters";
license = lib.licenses.mit;
- maintainers = with lib.maintainers; [ fab ];
+ maintainers = with lib.maintainers; [
+ fab
+ sarahec
+ ];
};
}
diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix
index 3d0ae4b72f48..ad7821606b96 100644
--- a/pkgs/development/python-modules/langchain/default.nix
+++ b/pkgs/development/python-modules/langchain/default.nix
@@ -12,6 +12,7 @@
# dependencies
aiohttp,
+ httpx-sse,
langchain-core,
langchain-text-splitters,
langsmith,
@@ -42,14 +43,14 @@
buildPythonPackage rec {
pname = "langchain";
- version = "0.3.4";
+ version = "0.3.7";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
rev = "refs/tags/langchain==${version}";
- hash = "sha256-MRpXR4nQDobzofhzkU5Y2OiEsi+VdjCcF/vcxcG/144=";
+ hash = "sha256-TaK8lnPxKUqwvKLtQIfzg2l8McQ1fd0g9vocHM0+kjY=";
};
sourceRoot = "${src.name}/libs/langchain";
@@ -62,6 +63,7 @@ buildPythonPackage rec {
dependencies = [
aiohttp
+ httpx-sse
langchain-core
langchain-text-splitters
langsmith
diff --git a/pkgs/development/python-modules/langgraph-checkpoint-duckdb/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-duckdb/default.nix
new file mode 100644
index 000000000000..b40afc694f52
--- /dev/null
+++ b/pkgs/development/python-modules/langgraph-checkpoint-duckdb/default.nix
@@ -0,0 +1,62 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchFromGitHub,
+ langgraph-checkpoint,
+ aiosqlite,
+ duckdb,
+ pytest-asyncio,
+ pytestCheckHook,
+ langgraph-sdk,
+ poetry-core,
+ pythonOlder,
+}:
+
+buildPythonPackage rec {
+ pname = "langgraph-checkpoint-duckdb";
+ version = "2.0.1";
+ pyproject = true;
+
+ disabled = pythonOlder "3.9";
+
+ src = fetchFromGitHub {
+ owner = "langchain-ai";
+ repo = "langgraph";
+ rev = "refs/tags/checkpointduckdb==${version}";
+ hash = "sha256-wSrlFBfTcTgyE46uwv9GCyxRT1xVafgWyP2g87KUTAU=";
+ };
+
+ sourceRoot = "${src.name}/libs/checkpoint-duckdb";
+
+ build-system = [ poetry-core ];
+
+ dependencies = [
+ aiosqlite
+ duckdb
+ langgraph-checkpoint
+ ];
+
+ pythonImportsCheck = [ "langgraph.checkpoint.duckdb" ];
+
+ nativeCheckInputs = [
+ pytest-asyncio
+ pytestCheckHook
+ ];
+
+ disabledTests = [ "test_basic_store_ops" ]; # depends on networking
+
+ passthru = {
+ updateScript = langgraph-sdk.updateScript;
+ };
+
+ meta = {
+ changelog = "https://github.com/langchain-ai/langgraph/releases/tag/checkpointduckdb==${version}";
+ description = "Library with a DuckDB implementation of LangGraph checkpoint saver";
+ homepage = "https://github.com/langchain-ai/langgraph/tree/main/libs/checkpoint-duckdb";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [
+ drupol
+ sarahec
+ ];
+ };
+}
diff --git a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
index 0161609fdd08..ce958ca954f2 100644
--- a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "langgraph-checkpoint-postgres";
- version = "2.0.1";
+ version = "2.0.2";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "langchain-ai";
repo = "langgraph";
rev = "refs/tags/checkpointpostgres==${version}";
- hash = "sha256-5gKgCd0hl2iPLBfh94n8kMojECknhd0r+W4gt3m4g+M=";
+ hash = "sha256-E3gdHWUYelR/xI3Cv3T2uVwsyt+tOkw9MjX7I2RAuiQ=";
};
postgresqlTestSetupPost = ''
diff --git a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix
index 3bf88e24f998..9d4df9530640 100644
--- a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "langgraph-checkpoint-sqlite";
- version = "2.0.0";
+ version = "2.0.1";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "langchain-ai";
repo = "langgraph";
rev = "refs/tags/checkpointsqlite==${version}";
- hash = "sha256-aG7kHdlOkrjfYcdDWwCum0mQvWNMlF2CcEDlkzbv4Zw=";
+ hash = "sha256-dh+cjcOp6rGFntz82VNfVyetcrQBdBFdXk5xFb0aR5c=";
};
sourceRoot = "${src.name}/libs/checkpoint-sqlite";
diff --git a/pkgs/development/python-modules/langgraph-checkpoint/default.nix b/pkgs/development/python-modules/langgraph-checkpoint/default.nix
index b895ab501eb1..eccfbe11935c 100644
--- a/pkgs/development/python-modules/langgraph-checkpoint/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "langgraph-checkpoint";
- version = "2.0.1";
+ version = "2.0.2";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "langchain-ai";
repo = "langgraph";
rev = "refs/tags/checkpoint==${version}";
- hash = "sha256-BDuc6PpziOFIsPpDets7OM2Z+VJ6ekxKpkAuoavDdmI=";
+ hash = "sha256-Mjo6NJ6vYb2E7nk0D/2M7jzr39xRvRRhUZE4tP247to=";
};
sourceRoot = "${src.name}/libs/checkpoint";
diff --git a/pkgs/development/python-modules/langgraph-cli/default.nix b/pkgs/development/python-modules/langgraph-cli/default.nix
index 026fcde7d7d3..347be2ffcfa3 100644
--- a/pkgs/development/python-modules/langgraph-cli/default.nix
+++ b/pkgs/development/python-modules/langgraph-cli/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "langgraph-cli";
- version = "0.2.28";
+ version = "0.1.52";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -20,8 +20,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langgraph";
- rev = "refs/tags/${version}";
- hash = "sha256-RbV4G5YPAUjS20B1sQsmFGBje1pbxgCu81pCESFbJLs=";
+ rev = "refs/tags/cli==${version}";
+ hash = "sha256-zTBeDJB1Xu/rWsvEC/L4BRzxyh04lPYV7HQNHoJcskk=";
};
sourceRoot = "${src.name}/libs/cli";
diff --git a/pkgs/development/python-modules/langgraph-sdk/default.nix b/pkgs/development/python-modules/langgraph-sdk/default.nix
index 3e53fd0b28aa..f1e1a2520e22 100644
--- a/pkgs/development/python-modules/langgraph-sdk/default.nix
+++ b/pkgs/development/python-modules/langgraph-sdk/default.nix
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "langgraph-sdk";
- version = "0.2.28";
+ version = "0.1.35";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langgraph";
- rev = "refs/tags/${version}";
- hash = "sha256-RbV4G5YPAUjS20B1sQsmFGBje1pbxgCu81pCESFbJLs=";
+ rev = "refs/tags/sdk==${version}";
+ hash = "sha256-HWUGRoe5S0HPfOEbqUnFYLVrHe3SJtk3U8cy1JON050=";
};
sourceRoot = "${src.name}/libs/sdk-py";
diff --git a/pkgs/development/python-modules/langgraph/default.nix b/pkgs/development/python-modules/langgraph/default.nix
index 6ddb731aab37..65f4e3aa23c7 100644
--- a/pkgs/development/python-modules/langgraph/default.nix
+++ b/pkgs/development/python-modules/langgraph/default.nix
@@ -17,6 +17,7 @@
dataclasses-json,
grandalf,
httpx,
+ langgraph-checkpoint-duckdb,
langgraph-checkpoint-postgres,
langgraph-checkpoint-sqlite,
langsmith,
@@ -34,14 +35,14 @@
buildPythonPackage rec {
pname = "langgraph";
- version = "0.2.39";
+ version = "0.2.43";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langgraph";
rev = "refs/tags/${version}";
- hash = "sha256-VZRGlE3MSOzur1TWC6swQjf/o5M62LsYncx2g8dtS+o=";
+ hash = "sha256-8xTjWBq6GSl6X2IId3roS3ZNM/h76EGPitS08YQ4e7Y=";
};
postgresqlTestSetupPost = ''
@@ -70,6 +71,7 @@ buildPythonPackage rec {
dataclasses-json
grandalf
httpx
+ langgraph-checkpoint-duckdb
langgraph-checkpoint-postgres
langgraph-checkpoint-sqlite
langsmith
@@ -86,6 +88,8 @@ buildPythonPackage rec {
postgresqlTestHook
];
+ pytestFlagsArray = [ "tests/unit_tests" ];
+
disabledTests = [
# test is flaky due to pydantic error on the exception
"test_doesnt_warn_valid_schema"
diff --git a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix
index fde261674c29..89366bc43f1d 100644
--- a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix
+++ b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix
@@ -6,8 +6,7 @@
autobahn,
mock,
twisted,
- pythonOlder,
- pythonAtLeast,
+ python,
pytestCheckHook,
}:
@@ -21,6 +20,13 @@ buildPythonPackage rec {
hash = "sha256-LvLvvk008OYkhw+EIln9czuncVLtMQr0NJd0piiEkA4=";
};
+ postPatch = ''
+ # Passing the environment to twistd is necessary to preserve Python's site path.
+ substituteInPlace src/wormhole_transit_relay/test/test_backpressure.py --replace-fail \
+ 'reactor.spawnProcess(proto, exe, args)' \
+ 'reactor.spawnProcess(proto, exe, args, None)'
+ '';
+
build-system = [ setuptools ];
dependencies = [
@@ -39,13 +45,16 @@ buildPythonPackage rec {
__darwinAllowLocalNetworking = true;
+ postCheck = ''
+ # Avoid collision with twisted's plugin cache (#164775).
+ rm "$out/${python.sitePackages}/twisted/plugins/dropin.cache"
+ '';
+
meta = {
description = "Transit Relay server for Magic-Wormhole";
homepage = "https://github.com/magic-wormhole/magic-wormhole-transit-relay";
changelog = "https://github.com/magic-wormhole/magic-wormhole-transit-relay/blob/${version}/NEWS.md";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.mjoerg ];
- # Python 3.12 support: https://github.com/magic-wormhole/magic-wormhole-transit-relay/issues/35
- broken = pythonOlder "3.7" || pythonAtLeast "3.12";
};
}
diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix
index 5abdff45c6d1..87404ab5b21e 100644
--- a/pkgs/development/python-modules/magic-wormhole/default.nix
+++ b/pkgs/development/python-modules/magic-wormhole/default.nix
@@ -2,7 +2,7 @@
lib,
stdenv,
buildPythonPackage,
- fetchPypi,
+ fetchFromGitHub,
# build-system
setuptools,
@@ -36,12 +36,14 @@
buildPythonPackage rec {
pname = "magic-wormhole";
- version = "0.16.0";
+ version = "0.17.0";
pyproject = true;
- src = fetchPypi {
- inherit pname version;
- hash = "sha256-FObBRomNvaem0ZAmJiOmlBmVU2Pn5DTWSq0tIz1tlMk=";
+ src = fetchFromGitHub {
+ owner = "magic-wormhole";
+ repo = "magic-wormhole";
+ rev = "refs/tags/${version}";
+ hash = "sha256-BxPF4iQ91wLBagdvQ/Y89VIZBkMxFiEHnK+BU55Bwr4=";
};
postPatch =
@@ -81,8 +83,12 @@ buildPythonPackage rec {
nativeCheckInputs =
# For Python 3.12, remove magic-wormhole-mailbox-server and magic-wormhole-transit-relay from test dependencies,
# which are not yet supported with this version.
- lib.optionals (!magic-wormhole-mailbox-server.meta.broken) [ magic-wormhole-mailbox-server ]
- ++ lib.optionals (!magic-wormhole-transit-relay.meta.broken) [ magic-wormhole-transit-relay ]
+ lib.optionals
+ (!magic-wormhole-mailbox-server.meta.broken && !magic-wormhole-transit-relay.meta.broken)
+ [
+ magic-wormhole-mailbox-server
+ magic-wormhole-transit-relay
+ ]
++ [
mock
pytestCheckHook
@@ -101,10 +107,10 @@ buildPythonPackage rec {
"src/wormhole/test/dilate/test_full.py"
"src/wormhole/test/test_args.py"
"src/wormhole/test/test_cli.py"
+ "src/wormhole/test/test_transit.py"
"src/wormhole/test/test_wormhole.py"
"src/wormhole/test/test_xfer_util.py"
- ]
- ++ lib.optionals magic-wormhole-transit-relay.meta.broken [ "src/wormhole/test/test_transit.py" ];
+ ];
postInstall = ''
install -Dm644 docs/wormhole.1 $out/share/man/man1/wormhole.1
diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix
index 07bf6ae8c078..3d135bd357f0 100644
--- a/pkgs/development/python-modules/marimo/default.nix
+++ b/pkgs/development/python-modules/marimo/default.nix
@@ -2,13 +2,17 @@
lib,
buildPythonPackage,
fetchPypi,
- pythonOlder,
- setuptools,
+
+ # build-system
+ hatchling,
+
+ # dependencies
click,
docutils,
itsdangerous,
jedi,
markdown,
+ narwhals,
packaging,
psutil,
pygments,
@@ -19,25 +23,25 @@
uvicorn,
websockets,
pyyaml,
- pytestCheckHook,
+
+ # tests
+ versionCheckHook,
}:
buildPythonPackage rec {
pname = "marimo";
- version = "0.9.1";
+ version = "0.9.14";
pyproject = true;
- disabled = pythonOlder "3.8";
-
+ # The github archive does not include the static assets
src = fetchPypi {
inherit pname version;
- hash = "sha256-7sG6i1WusNuCpuaojFXhSfPWCA2/nzHXvMF29ApGTDg=";
+ hash = "sha256-Q3dnRuAS8B4cWvF04GGg5OOZtmAJPKa2fHwnoO2DXDs=";
};
- build-system = [ setuptools ];
+ build-system = [ hatchling ];
- # ruff is not packaged as a python module in nixpkgs
- pythonRemoveDeps = [ "ruff" ];
+ pythonRelaxDeps = [ "websockets" ];
dependencies = [
click
@@ -45,6 +49,7 @@ buildPythonPackage rec {
itsdangerous
jedi
markdown
+ narwhals
packaging
psutil
pygments
@@ -57,17 +62,21 @@ buildPythonPackage rec {
pyyaml
];
- nativeCheckInputs = [ pytestCheckHook ];
-
pythonImportsCheck = [ "marimo" ];
- meta = with lib; {
+ # The pypi archive does not contain tests so we do not use `pytestCheckHook`
+ nativeCheckInputs = [
+ versionCheckHook
+ ];
+ versionCheckProgramArg = [ "--version" ];
+
+ meta = {
description = "Reactive Python notebook that's reproducible, git-friendly, and deployable as scripts or apps";
homepage = "https://github.com/marimo-team/marimo";
changelog = "https://github.com/marimo-team/marimo/releases/tag/${version}";
- license = licenses.asl20;
+ license = lib.licenses.asl20;
mainProgram = "marimo";
- maintainers = with maintainers; [
+ maintainers = with lib.maintainers; [
akshayka
dmadisetti
];
diff --git a/pkgs/development/python-modules/meep/default.nix b/pkgs/development/python-modules/meep/default.nix
index 1608a5e67ec9..ab8e238dc6d0 100644
--- a/pkgs/development/python-modules/meep/default.nix
+++ b/pkgs/development/python-modules/meep/default.nix
@@ -18,7 +18,6 @@
harminv,
libctl,
libGDSII,
- openssh,
guile,
python,
numpy,
@@ -124,7 +123,6 @@ buildPythonPackage rec {
*/
nativeCheckInputs = [
mpiCheckPhaseHook
- openssh
];
checkPhase = ''
runHook preCheck
diff --git a/pkgs/development/python-modules/mkdocs-jupyter/default.nix b/pkgs/development/python-modules/mkdocs-jupyter/default.nix
index dd0c300ab175..c0286491927c 100644
--- a/pkgs/development/python-modules/mkdocs-jupyter/default.nix
+++ b/pkgs/development/python-modules/mkdocs-jupyter/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "mkdocs-jupyter";
- version = "0.25.0";
+ version = "0.25.1";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "mkdocs_jupyter";
inherit version;
- hash = "sha256-4mwdNBkWvFf5bqP5PY0KiPx3yH1M7iIvZtIAd5jZJPU=";
+ hash = "sha256-DpJy/0lH4OxoPJJCOkv7QqJkd8EDqxpquCd+LcyPev4=";
};
pythonRelaxDeps = [ "nbconvert" ];
diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix
index dd6781fbfa2c..e8d3ac8be8ac 100644
--- a/pkgs/development/python-modules/mpi4py/default.nix
+++ b/pkgs/development/python-modules/mpi4py/default.nix
@@ -5,7 +5,6 @@
cython,
setuptools,
mpi,
- openssh,
pytestCheckHook,
mpiCheckPhaseHook,
}:
@@ -35,7 +34,6 @@ buildPythonPackage rec {
nativeCheckInputs = [
pytestCheckHook
- openssh
mpiCheckPhaseHook
];
doCheck = true;
diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 80f729e231cb..442bc4e246d6 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -62,8 +62,8 @@ rec {
"sha256-9hJo5ZV8ckN5+V/L6MOowyWr2eZoroVRmzooMDDA6WE=";
mypy-boto3-amp =
- buildMypyBoto3Package "amp" "1.35.0"
- "sha256-Pm/KyqcUUAQBZjQKaVhuL/9c+qfkgfeD51esgE+EgQw=";
+ buildMypyBoto3Package "amp" "1.35.53"
+ "sha256-kPQ6DAbf1hEmDyDu8SFAL4WwTrmhEkNsg3ndEbhgJvg=";
mypy-boto3-amplify =
buildMypyBoto3Package "amplify" "1.35.41"
@@ -150,8 +150,8 @@ rec {
"sha256-nr00I/1oqR16ZIw3+iA2BrS0C0Wr7UlJ48VnuOFIcb0=";
mypy-boto3-autoscaling =
- buildMypyBoto3Package "autoscaling" "1.35.45"
- "sha256-HQLkmsxLESKVXzNW+60XFLhYTT6oDeNFsm6WGNP1cgk=";
+ buildMypyBoto3Package "autoscaling" "1.35.53"
+ "sha256-cknZ2hZ8hV7gnOqBD6XWxrJZS7j3B4TiP29y6QBGCoQ=";
mypy-boto3-autoscaling-plans =
buildMypyBoto3Package "autoscaling-plans" "1.35.0"
@@ -166,8 +166,8 @@ rec {
"sha256-8IRkY4sMGkj2ZxZBM4n/7clzQHwuon8wmXIOAGa4nEI=";
mypy-boto3-batch =
- buildMypyBoto3Package "batch" "1.35.0"
- "sha256-LVwSfDll7H0xxvF6b2wlqr/gQ5nR4oqtev4ZT4hgJX0=";
+ buildMypyBoto3Package "batch" "1.35.53"
+ "sha256-1qJvWSYN94rV8xiIOoGO5FVKl2Q1hcLfooOfMYEp5M0=";
mypy-boto3-billingconductor =
buildMypyBoto3Package "billingconductor" "1.35.0"
@@ -422,8 +422,8 @@ rec {
"sha256-gRSlQ63BPat6gxy+jZP/vtZIn6a4fXN0tx6oPvvgROo=";
mypy-boto3-docdb-elastic =
- buildMypyBoto3Package "docdb-elastic" "1.35.0"
- "sha256-bmhGGMR9x0QKFl2p0p4xhxtE+A5PZQ/HO1FdLuAgLtI=";
+ buildMypyBoto3Package "docdb-elastic" "1.35.54"
+ "sha256-LMkXVrDNmfJPB5rl32i4OQSm0Q5gqdpV7PR4vNe0iIQ=";
mypy-boto3-drs =
buildMypyBoto3Package "drs" "1.35.0"
@@ -494,8 +494,8 @@ rec {
"sha256-fw/vfzKXXQSG7xj9FolkJgzciHBz4ELlFh2MlEJ6wQI=";
mypy-boto3-elbv2 =
- buildMypyBoto3Package "elbv2" "1.35.39"
- "sha256-k7IgKkdS2h5p+Xl+UhiQRtk9fjCZQMzc2FXRRTjscTc=";
+ buildMypyBoto3Package "elbv2" "1.35.53"
+ "sha256-MQYmmlnrK7sbbO9AiVavD79ImyUZIMavuHz/rn1gTTs=";
mypy-boto3-emr =
buildMypyBoto3Package "emr" "1.35.39"
@@ -574,8 +574,8 @@ rec {
"sha256-RJEZBr3yU/lGEainrpidLsdYBvVOPMq3cIaIpsTAziQ=";
mypy-boto3-glue =
- buildMypyBoto3Package "glue" "1.35.25"
- "sha256-hWpxnfHPaCUlxFg/3vNhluQnc2IHYoNVq9owH3D2eME=";
+ buildMypyBoto3Package "glue" "1.35.53"
+ "sha256-eUXh24klobdPHgxu3Wjg638PeAu3ArlO3tsxewthfDo=";
mypy-boto3-grafana =
buildMypyBoto3Package "grafana" "1.35.0"
@@ -810,8 +810,8 @@ rec {
"sha256-6Vs5eRibHCZvDDIcIEThPa6T1OmfJXjLg4GAZlworsM=";
mypy-boto3-logs =
- buildMypyBoto3Package "logs" "1.35.51"
- "sha256-MOzamNfZJdX4R/NO/1dEwErSdsCfFw8ZwGje5Ocb7oY=";
+ buildMypyBoto3Package "logs" "1.35.54"
+ "sha256-RnHt15tR/cGO0w9mLYbCW0T82fyhVsJbBkfxSwDZItw=";
mypy-boto3-lookoutequipment =
buildMypyBoto3Package "lookoutequipment" "1.35.0"
@@ -1174,8 +1174,8 @@ rec {
"sha256-P2Yg3qvcdAcjY+uwPg2DpTgT6ZXb1XYCOeu4bVfgFKI=";
mypy-boto3-sagemaker =
- buildMypyBoto3Package "sagemaker" "1.35.52"
- "sha256-i2XQmwv5AP0qSN6Bc1xM22XLaNSgo3FTbX8UIgOsFBQ=";
+ buildMypyBoto3Package "sagemaker" "1.35.53"
+ "sha256-Vj7lAt1eU47vE7XZ95QJBe95302681tJuy4nw02Bibc=";
mypy-boto3-sagemaker-a2i-runtime =
buildMypyBoto3Package "sagemaker-a2i-runtime" "1.35.0"
@@ -1254,8 +1254,8 @@ rec {
"sha256-+TyI+ffXN0M9HVWA3iQfg3T/xF49wslYFx9MTxHCfYw=";
mypy-boto3-sesv2 =
- buildMypyBoto3Package "sesv2" "1.35.41"
- "sha256-DUotfO7GlrWHOU8LuhbmF4U2oywMW48JzYomlXYS8Tg=";
+ buildMypyBoto3Package "sesv2" "1.35.53"
+ "sha256-jIxFFcXYJgwxH78gnMHxIaQWeF88DT7tH1pukUEpDc4=";
mypy-boto3-shield =
buildMypyBoto3Package "shield" "1.35.0"
diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix
index 7fc07f20a61a..8a428bce2e09 100644
--- a/pkgs/development/python-modules/pyvips/default.nix
+++ b/pkgs/development/python-modules/pyvips/default.nix
@@ -1,33 +1,33 @@
{
+ lib,
stdenv,
buildPythonPackage,
- pythonOlder,
- fetchFromGitHub,
- pytestCheckHook,
- glib,
- vips,
cffi,
- pkgconfig, # from pythonPackages
+ fetchFromGitHub,
+ glib,
pkg-config, # from pkgs
- lib,
+ pkgconfig, # from pythonPackages
+ pytestCheckHook,
+ pythonOlder,
+ setuptools,
+ vips,
}:
buildPythonPackage rec {
pname = "pyvips";
- version = "2.2.1";
- format = "setuptools";
+ version = "2.2.3";
+ pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "libvips";
repo = "pyvips";
- rev = "v${version}";
- hash = "sha256-9S7h3bkm+QP78cpemYS7l3c8t+wXsJ5MUAP2T50R/Mc=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-EGB1cOR1pVCXGjRj1NLj4Mk3kIy8luRqk3gGJqVNs7U=";
};
nativeBuildInputs = [
- pkgconfig
pkg-config
];
@@ -36,7 +36,12 @@ buildPythonPackage rec {
vips
];
- propagatedBuildInputs = [ cffi ];
+ build-system = [
+ pkgconfig
+ setuptools
+ ];
+
+ dependencies = [ cffi ];
env = lib.optionalAttrs stdenv.cc.isClang {
NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-function-pointer-types";
diff --git a/pkgs/development/python-modules/ropgadget/default.nix b/pkgs/development/python-modules/ropgadget/default.nix
index 53908cb4db73..eba60378a796 100644
--- a/pkgs/development/python-modules/ropgadget/default.nix
+++ b/pkgs/development/python-modules/ropgadget/default.nix
@@ -2,14 +2,15 @@
lib,
buildPythonPackage,
fetchFromGitHub,
+ setuptools,
capstone,
pythonOlder,
}:
buildPythonPackage rec {
pname = "ropgadget";
- version = "7.4";
- format = "setuptools";
+ version = "7.5";
+ pyproject = true;
disabled = pythonOlder "3.7";
@@ -17,10 +18,12 @@ buildPythonPackage rec {
owner = "JonathanSalwan";
repo = "ROPgadget";
rev = "refs/tags/v${version}";
- hash = "sha256-6m8opcTM4vrK+VCPXxNhZttUq6YmS8swLUDhjyfinWE=";
+ hash = "sha256-n7nVtR2HMAZeeSX/hNtDzmpEsnHbgDNO5gdzmPrgSuk=";
};
- propagatedBuildInputs = [ capstone ];
+ build-system = [ setuptools ];
+
+ dependencies = [ capstone ];
# Test suite is working with binaries
doCheck = false;
diff --git a/pkgs/development/python-modules/spatialmath-python/default.nix b/pkgs/development/python-modules/spatialmath-python/default.nix
index 16c43e079c30..48314a348209 100644
--- a/pkgs/development/python-modules/spatialmath-python/default.nix
+++ b/pkgs/development/python-modules/spatialmath-python/default.nix
@@ -1,5 +1,6 @@
{
lib,
+ stdenv,
buildPythonPackage,
fetchPypi,
pythonOlder,
@@ -10,18 +11,12 @@
numpy,
scipy,
typing-extensions,
- coverage,
- flake8,
- pytest,
- pytest-timeout,
- pytest-xvfb,
- sympy,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "spatialmath-python";
- version = "1.1.11";
+ version = "1.1.13";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -29,17 +24,19 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "spatialmath_python";
inherit version;
- hash = "sha256-9EUlDGkpV/a73XWvrbtZLK8wrR8Am5EOkv3iSf9J4rM=";
+ hash = "sha256-BhIB4VapnARkzyhps8xRWnQTAlRB8aVPDpNuN/FNezo=";
};
- nativeBuildInputs = [
+ build-system = [
oldest-supported-numpy
setuptools
];
pythonRemoveDeps = [ "pre-commit" ];
- propagatedBuildInputs = [
+ pythonRelaxDeps = [ "matplotlib" ];
+
+ dependencies = [
ansitable
matplotlib
numpy
@@ -47,21 +44,17 @@ buildPythonPackage rec {
typing-extensions
];
- optional-dependencies = {
- dev = [
- coverage
- flake8
- pytest
- pytest-timeout
- pytest-xvfb
- sympy
- ];
- };
-
pythonImportsCheck = [ "spatialmath" ];
nativeCheckInputs = [ pytestCheckHook ];
+ disabledTestPaths = [
+ # tests hang
+ "tests/test_spline.py"
+ ];
+
+ env.MPLBACKEND = lib.optionalString stdenv.hostPlatform.isDarwin "Agg";
+
meta = with lib; {
description = "Provides spatial maths capability for Python";
homepage = "https://pypi.org/project/spatialmath-python/";
diff --git a/pkgs/development/python-modules/speechrecognition/default.nix b/pkgs/development/python-modules/speechrecognition/default.nix
index ee20791679c0..d53493b0a992 100644
--- a/pkgs/development/python-modules/speechrecognition/default.nix
+++ b/pkgs/development/python-modules/speechrecognition/default.nix
@@ -17,16 +17,16 @@
buildPythonPackage rec {
pname = "speechrecognition";
- version = "3.10.4";
+ version = "3.11.0";
pyproject = true;
- disabled = pythonOlder "3.8";
+ disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "Uberi";
repo = "speech_recognition";
rev = "refs/tags/${version}";
- hash = "sha256-icXZUg2lVLo8Z5t9ptDj67BjQLnEgrG8geYZ/lZeJt4=";
+ hash = "sha256-5DZ5QhaYpVtd+AX5OSYD3cM+37Ez0+EL5a+zJ+X/uNg=";
};
postPatch = ''
@@ -47,6 +47,7 @@ buildPythonPackage rec {
];
optional-dependencies = {
+ audio = [ pyaudio ];
whisper-api = [ openai ];
whisper-local = [
openai-whisper
@@ -57,7 +58,7 @@ buildPythonPackage rec {
nativeCheckInputs = [
pytestCheckHook
pocketsphinx
- ] ++ optional-dependencies.whisper-local ++ optional-dependencies.whisper-api;
+ ] ++ lib.flatten (builtins.attrValues optional-dependencies);
pythonImportsCheck = [ "speech_recognition" ];
diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix
index 1c149e72190c..2afb45ce8ea2 100644
--- a/pkgs/development/tools/bazelisk/default.nix
+++ b/pkgs/development/tools/bazelisk/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "bazelisk";
- version = "1.22.0";
+ version = "1.22.1";
src = fetchFromGitHub {
owner = "bazelbuild";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-KD8lh3N9GFlht+HtcuE3i20noVha0lT21a5pSS3zbTw=";
+ sha256 = "sha256-C5kCCSvIcjZPRXS8ckoHusYCZ4IfsaHeyQC7jLdjZQY=";
};
- vendorHash = "sha256-zoiQ69y0EicH9Jq2XYn+fttKHZY64GD4m/Edk+kle9M=";
+ vendorHash = "sha256-q8W+WSOxR/VC0uU8c2PVZwIer2CDUdDQ64AA2K6KghM=";
doCheck = false;
diff --git a/pkgs/development/tools/djhtml/default.nix b/pkgs/development/tools/djhtml/default.nix
index 0d30fc4f3800..1859249eb0f3 100644
--- a/pkgs/development/tools/djhtml/default.nix
+++ b/pkgs/development/tools/djhtml/default.nix
@@ -1,28 +1,30 @@
{ lib
, buildPythonApplication
, fetchFromGitHub
-, pythonOlder
+, setuptools
}:
buildPythonApplication rec {
pname = "djhtml";
- version = "3.0.6";
-
- format = "setuptools";
- disabled = pythonOlder "3.7";
+ version = "3.0.7";
+ pyproject = true;
src = fetchFromGitHub {
owner = "rtts";
- repo = pname;
+ repo = "djhtml";
rev = "refs/tags/${version}";
- hash = "sha256-3bviLyTLpHcAUWAaAmNZukWBDwFs8yFOAxl2bSk9GNY=";
+ hash = "sha256-W93J3UFUrCqT718zoGcu96ORYFt0NLyYP7iVWbr8FYo=";
};
+ build-system = [ setuptools ];
+
pythonImportsCheck = [ "djhtml" ];
meta = with lib; {
homepage = "https://github.com/rtts/djhtml";
description = "Django/Jinja template indenter";
+ changelog = "https://github.com/rtts/djhtml/releases/tag/${version}";
license = licenses.gpl3Plus;
maintainers = [ ];
+ mainProgram = "djhtml";
};
}
diff --git a/pkgs/development/tools/parsing/spicy/default.nix b/pkgs/development/tools/parsing/spicy/default.nix
index 6751e7db17d0..6199fad8e637 100644
--- a/pkgs/development/tools/parsing/spicy/default.nix
+++ b/pkgs/development/tools/parsing/spicy/default.nix
@@ -7,11 +7,12 @@
, bison
, flex
, zlib
+, apple-sdk_11
}:
stdenv.mkDerivation rec {
pname = "spicy";
- version = "1.11.2";
+ version = "1.11.3";
strictDeps = true;
@@ -19,7 +20,7 @@ stdenv.mkDerivation rec {
owner = "zeek";
repo = "spicy";
rev = "v${version}";
- hash = "sha256-cWK/LdV73VkiUpXyK+M7AotD7ucmNvh3HOzpxtCfGQM=";
+ hash = "sha256-SKhNBqZRgeN2cZZ2lv/IsOqaa5LY666OlICewN/iPVA=";
fetchSubmodules = true;
};
@@ -34,6 +35,8 @@ stdenv.mkDerivation rec {
buildInputs = [
flex
zlib
+ ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ apple-sdk_11
];
postPatch = ''
@@ -64,5 +67,6 @@ stdenv.mkDerivation rec {
'';
license = licenses.bsd3;
maintainers = with maintainers; [ tobim ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix
index bf055522254a..a73f5f316157 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.209.0";
+ version = "0.213.0";
src = fetchFromGitHub {
owner = "planetscale";
repo = "cli";
rev = "v${version}";
- sha256 = "sha256-XbGxFpkAVPhOShZWE6W/Z26NSOumB+1oh/o0zVVswL8=";
+ sha256 = "sha256-WgivwlsT8QytB6oaB8lQASq+YQa8lbe/6PwpJUFZifU=";
};
- vendorHash = "sha256-5Uul5c8Lwu6SJ7DlLU8+k2Pxa3V/DhqdvK5xY2g6S40=";
+ vendorHash = "sha256-R0ZabOquZQLONbW6p5xtYKLi8P3Q5JieM4EATT1a83U=";
ldflags = [
"-s" "-w"
diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix
index 6d3c5434e20a..4a5972a4018e 100644
--- a/pkgs/development/tools/sauce-connect/default.nix
+++ b/pkgs/development/tools/sauce-connect/default.nix
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
};
aarch64-darwin = passthru.sources.x86_64-darwin;
};
+ updateScript = ./update.sh;
};
src = passthru.sources.${stdenv.hostPlatform.system}
diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix
index 8d7cf3313ff6..c4a4d3ece8c1 100644
--- a/pkgs/os-specific/linux/fwts/default.nix
+++ b/pkgs/os-specific/linux/fwts/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "fwts";
- version = "24.07.00";
+ version = "24.09.00";
src = fetchzip {
url = "https://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz";
- sha256 = "sha256-h+KDXa5wQsT0HMgd0WDfsZM4Tg3Un+CWKa0slZ5cVbA=";
+ sha256 = "sha256-ZJSlx8O38e7bJYTgZacayslr28TLHHJsISXq9Uzsnyc=";
stripRoot = false;
};
diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix
index 56e37ec0b847..3f6a1c71dc75 100644
--- a/pkgs/os-specific/linux/zfs/generic.nix
+++ b/pkgs/os-specific/linux/zfs/generic.nix
@@ -26,6 +26,7 @@ let
{ version
, hash
, kernelModuleAttribute
+ , extraLongDescription ? ""
, extraPatches ? []
, rev ? "zfs-${version}"
, kernelCompatible ? null
@@ -69,39 +70,39 @@ let
# The arrays must remain the same length, so we repeat a flag that is
# already part of the command and therefore has no effect.
substituteInPlace ./module/os/linux/zfs/zfs_ctldir.c \
- --replace '"/usr/bin/env", "umount"' '"${util-linux}/bin/umount", "-n"' \
- --replace '"/usr/bin/env", "mount"' '"${util-linux}/bin/mount", "-n"'
+ --replace-fail '"/usr/bin/env", "umount"' '"${util-linux}/bin/umount", "-n"' \
+ --replace-fail '"/usr/bin/env", "mount"' '"${util-linux}/bin/mount", "-n"'
'' + optionalString buildUser ''
- substituteInPlace ./lib/libshare/os/linux/nfs.c --replace "/usr/sbin/exportfs" "${
+ substituteInPlace ./lib/libshare/os/linux/nfs.c --replace-fail "/usr/sbin/exportfs" "${
# We don't *need* python support, but we set it like this to minimize closure size:
# If it's disabled by default, no need to enable it, even if we have python enabled
# And if it's enabled by default, only change that if we explicitly disable python to remove python from the closure
nfs-utils.override (old: { enablePython = old.enablePython or true && enablePython; })
}/bin/exportfs"
- substituteInPlace ./lib/libshare/smb.h --replace "/usr/bin/net" "${samba}/bin/net"
+ substituteInPlace ./lib/libshare/smb.h --replace-fail "/usr/bin/net" "${samba}/bin/net"
# Disable dynamic loading of libcurl
- substituteInPlace ./config/user-libfetch.m4 --replace "curl-config --built-shared" "true"
- substituteInPlace ./config/user-systemd.m4 --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d"
- substituteInPlace ./config/zfs-build.m4 --replace "\$sysconfdir/init.d" "$out/etc/init.d" \
- --replace "/etc/default" "$out/etc/default"
+ substituteInPlace ./config/user-libfetch.m4 --replace-fail "curl-config --built-shared" "true"
+ substituteInPlace ./config/user-systemd.m4 --replace-fail "/usr/lib/modules-load.d" "$out/etc/modules-load.d"
+ substituteInPlace ./config/zfs-build.m4 --replace-fail "\$sysconfdir/init.d" "$out/etc/init.d" \
+ --replace-fail "/etc/default" "$out/etc/default"
substituteInPlace ./contrib/initramfs/Makefile.am \
- --replace "/usr/share/initramfs-tools" "$out/usr/share/initramfs-tools"
+ --replace-fail "/usr/share/initramfs-tools" "$out/usr/share/initramfs-tools"
'' + optionalString isAtLeast22Series ''
substituteInPlace ./udev/vdev_id \
- --replace "PATH=/bin:/sbin:/usr/bin:/usr/sbin" \
+ --replace-fail "PATH=/bin:/sbin:/usr/bin:/usr/sbin" \
"PATH=${makeBinPath [ coreutils gawk gnused gnugrep systemd ]}"
+
+ substituteInPlace ./config/zfs-build.m4 \
+ --replace-fail "bashcompletiondir=/etc/bash_completion.d" \
+ "bashcompletiondir=$out/share/bash-completion/completions"
'' + optionalString (!isAtLeast22Series) ''
- substituteInPlace ./etc/zfs/Makefile.am --replace "\$(sysconfdir)/zfs" "$out/etc/zfs"
+ substituteInPlace ./etc/zfs/Makefile.am --replace-fail "\$(sysconfdir)/zfs" "$out/etc/zfs"
find ./contrib/initramfs -name Makefile.am -exec sed -i -e 's|/usr/share/initramfs-tools|'$out'/share/initramfs-tools|g' {} \;
substituteInPlace ./cmd/vdev_id/vdev_id \
- --replace "PATH=/bin:/sbin:/usr/bin:/usr/sbin" \
+ --replace-fail "PATH=/bin:/sbin:/usr/bin:/usr/sbin" \
"PATH=${makeBinPath [ coreutils gawk gnused gnugrep systemd ]}"
- '' + ''
- substituteInPlace ./config/zfs-build.m4 \
- --replace "bashcompletiondir=/etc/bash_completion.d" \
- "bashcompletiondir=$out/share/bash-completion/completions"
'';
nativeBuildInputs = [ autoreconfHook269 nukeReferences ]
@@ -176,7 +177,7 @@ let
continue
fi
sed -i '/zfs-import-scan.service/d' $i
- substituteInPlace $i --replace "zfs-import-cache.service" "zfs-import.target"
+ substituteInPlace $i --replace-warn "zfs-import-cache.service" "zfs-import.target"
done
# Remove tests because they add a runtime dependency on gcc
@@ -220,7 +221,7 @@ let
snapshotting, cloning, block devices, deduplication, and more.
${if buildUser then "This is the userspace tools package." else "This is the kernel module package."}
- '';
+ '' + extraLongDescription;
homepage = "https://github.com/openzfs/zfs";
changelog = "https://github.com/openzfs/zfs/releases/tag/zfs-${version}";
license = lib.licenses.cddl;
@@ -237,8 +238,6 @@ let
inherit maintainers;
mainProgram = "zfs";
- # If your Linux kernel version is not yet supported by zfs, try zfs_unstable.
- # On NixOS set the option `boot.zfs.package = pkgs.zfs_unstable`.
broken = buildKernel && (kernelCompatible != null) && !(kernelCompatible kernel);
};
};
diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix
index 0d75c8c7072c..7590481b6efb 100644
--- a/pkgs/os-specific/linux/zfs/unstable.nix
+++ b/pkgs/os-specific/linux/zfs/unstable.nix
@@ -28,4 +28,9 @@ callPackage ./generic.nix args {
};
hash = "sha256-/INlfiPpRm5JprcORzJJKyjpGIMY1LceY3yZ811uf2A=";
+
+ extraLongDescription = ''
+ This is "unstable" ZFS, and will usually be a pre-release version of ZFS.
+ It may be less well-tested and have critical bugs.
+ '';
}
diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index f741858b011a..383ab5af129f 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -1,64 +1,96 @@
-{ lib
-, stdenv
-, fetchurl
-, erlang
-, elixir
-, python3
-, libxml2
-, libxslt
-, xmlto
-, docbook_xml_dtd_45
-, docbook_xsl
-, zip
-, unzip
-, rsync
-, getconf
-, socat
-, procps
-, coreutils
-, gnused
-, systemd
-, glibcLocales
-, AppKit
-, Carbon
-, Cocoa
-, nixosTests
+{
+ lib,
+ stdenv,
+ fetchurl,
+ erlang,
+ elixir,
+ python3,
+ libxml2,
+ libxslt,
+ xmlto,
+ docbook_xml_dtd_45,
+ docbook_xsl,
+ zip,
+ unzip,
+ rsync,
+ getconf,
+ socat,
+ procps,
+ coreutils,
+ gnused,
+ systemd,
+ glibcLocales,
+ AppKit,
+ Carbon,
+ Cocoa,
+ nixosTests,
+ which,
}:
let
- runtimePath = lib.makeBinPath ([
- erlang
- getconf # for getting memory limits
- socat
- procps
- gnused
- coreutils # used by helper scripts
- ] ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd ]); # for systemd unit activation check
+ runtimePath = lib.makeBinPath (
+ [
+ erlang
+ getconf # for getting memory limits
+ socat
+ procps
+ gnused
+ coreutils # used by helper scripts
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd ]
+ ); # for systemd unit activation check
in
stdenv.mkDerivation rec {
pname = "rabbitmq-server";
- version = "3.13.7";
+ version = "4.0.2";
# when updating, consider bumping elixir version in all-packages.nix
src = fetchurl {
url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz";
- hash = "sha256-GDUyYudwhQSLrFXO21W3fwmH2tl2STF9gSuZsb3GZh0=";
+ hash = "sha256-mSwjQTLkEWBBbbMDLZ+qldS2YDcUvp8BB+J0+RLQvZE=";
};
- nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync python3 ];
+ nativeBuildInputs = [
+ unzip
+ xmlto
+ docbook_xml_dtd_45
+ docbook_xsl
+ zip
+ rsync
+ python3
+ which
+ ];
- buildInputs = [ erlang elixir libxml2 libxslt glibcLocales ]
- ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Carbon Cocoa ];
+ buildInputs =
+ [
+ erlang
+ elixir
+ libxml2
+ libxslt
+ glibcLocales
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ AppKit
+ Carbon
+ Cocoa
+ ];
- outputs = [ "out" "man" "doc" ];
+ outputs = [
+ "out"
+ "man"
+ "doc"
+ ];
installFlags = [
"PREFIX=${placeholder "out"}"
"RMQ_ERLAPP_DIR=${placeholder "out"}"
];
- installTargets = [ "install" "install-man" ];
+ installTargets = [
+ "install"
+ "install-man"
+ ];
preBuild = ''
export LANG=C.UTF-8 # fix elixir locale warning
@@ -91,6 +123,6 @@ stdenv.mkDerivation rec {
changelog = "https://github.com/rabbitmq/rabbitmq-server/releases/tag/v${version}";
license = lib.licenses.mpl20;
platforms = lib.platforms.unix;
- maintainers = [ ];
+ maintainers = with lib.maintainers; [ samueltardieu ];
};
}
diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/servers/bazarr/default.nix
index 3e8cac490961..86541b67996a 100644
--- a/pkgs/servers/bazarr/default.nix
+++ b/pkgs/servers/bazarr/default.nix
@@ -8,11 +8,11 @@ let
in
stdenv.mkDerivation rec {
pname = "bazarr";
- version = "1.4.4";
+ version = "1.4.5";
src = fetchzip {
url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip";
- hash = "sha256-FZKGHC7CLzIzOXH77iHwSb9+Mw1z+kiz+1rLO6XU/94=";
+ hash = "sha256-BV+ON+SavPc0ZUlIk6tlsvmWub8TiYSSJSRutZb1q+g=";
stripRoot = false;
};
diff --git a/pkgs/servers/ftp/bftpd/default.nix b/pkgs/servers/ftp/bftpd/default.nix
index 895e3cd063fc..b244bec5fddc 100644
--- a/pkgs/servers/ftp/bftpd/default.nix
+++ b/pkgs/servers/ftp/bftpd/default.nix
@@ -9,10 +9,15 @@ stdenv.mkDerivation rec {
sha256 = "sha256-lZGFsUV6LNjkBNUpV9UYedVt1yt1qTBJUorxGt4ApsI=";
};
- # utmp.h is deprecated on aarch64-darwin
- postPatch = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) ''
+ # utmp has been replaced by utmpx since Mac OS X 10.6 (Snow Leopard):
+ #
+ # https://stackoverflow.com/a/37913019
+ #
+ # bftpd does not have support for this, so disable it.
+ #
+ postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
for file in login.*; do
- substituteInPlace $file --replace "#ifdef HAVE_UTMP_H" "#if 0"
+ substituteInPlace $file --replace-fail "#ifdef HAVE_UTMP_H" "#if 0"
done
'';
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix
index c4ddd97b7749..f71bf6271f85 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix
@@ -41,6 +41,8 @@
valetudo-map-card = callPackage ./valetudo-map-card { };
+ weather-card = callPackage ./weather-card { };
+
zigbee2mqtt-networkmap = callPackage ./zigbee2mqtt-networkmap { };
}
// lib.optionalAttrs pkgs.config.allowAliases {
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/weather-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/weather-card/default.nix
new file mode 100644
index 000000000000..63bc63e29a93
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/weather-card/default.nix
@@ -0,0 +1,34 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+}:
+
+stdenv.mkDerivation rec {
+ pname = "weather-card";
+ version = "1.5.0";
+
+ src = fetchFromGitHub {
+ owner = "bramkragten";
+ repo = "weather-card";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-pod5cayaHP+4vgdBgBRMQ7szkyz9HLaKVJWQX36XdTY=";
+ };
+ dontBuild = true;
+ installPhase = ''
+ runHook preInstall
+
+ mkdir $out
+ cp dist/weather-card.js $out/
+
+ runHook postInstall
+ '';
+
+ meta = {
+ description = "Weather Card with animated icons for Home Assistant Lovelace";
+ homepage = "https://github.com/bramkragten/weather-card";
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ matthiasbeyer ];
+ platforms = lib.platforms.all;
+ };
+}
diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix
index bebd1278acc2..c45da6cdd48f 100644
--- a/pkgs/servers/http/apache-modules/mod_python/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_python/default.nix
@@ -1,5 +1,6 @@
{
apacheHttpd,
+ ensureNewerSourcesForZipFilesHook,
fetchFromGitHub,
lib,
libintl,
@@ -8,15 +9,15 @@
stdenv,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "mod_python";
version = "3.5.0.2";
src = fetchFromGitHub {
owner = "grisha";
- repo = pname;
- rev = "refs/tags/${version}";
- hash = "sha256-EH8wrXqUAOFWyPKfysGeiIezgrVc789RYO4AHeSA6t4=";
+ repo = "mod_python";
+ rev = "refs/tags/${finalAttrs.version}";
+ hash = "sha256-++yHNKVe1u3w47DaB0zvYyuTrBcQdmuDm22areAeejs=";
};
patches = [ ./install.patch ];
@@ -26,24 +27,34 @@ stdenv.mkDerivation rec {
"BINDIR=$(out)/bin"
];
- buildInputs = [
- apacheHttpd
- python3
- ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
- libintl
+ nativeBuildInputs = [
+ ensureNewerSourcesForZipFilesHook
];
+ buildInputs =
+ [
+ apacheHttpd
+ (python3.withPackages (ps: with ps; [
+ distutils
+ packaging
+ setuptools
+ ]))
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ libintl
+ ];
+
passthru = {
inherit apacheHttpd;
updateScript = nix-update-script { };
};
- meta = with lib; {
+ meta = {
homepage = "https://modpython.org/";
- changelog = "https://github.com/grisha/mod_python/blob/${version}/NEWS";
+ changelog = "https://github.com/grisha/mod_python/blob/master/NEWS";
description = "Apache module that embeds the Python interpreter within the server";
mainProgram = "mod_python";
- platforms = platforms.unix;
+ platforms = lib.platforms.unix;
maintainers = [ ];
};
-}
+})
diff --git a/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix b/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix
index 364abdb95196..0f7b3d7e4dd9 100644
--- a/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix
+++ b/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "matrix-synapse-mjolnir-antispam";
- version = "1.6.5";
+ version = "1.8.3";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "mjolnir";
rev = "refs/tags/v${version}";
- sha256 = "sha256-xejFKz2MmdjMFU0X0SdI+qXTBRAwIvkcfZPQqXB9LV0=";
+ sha256 = "sha256-yD7QGsS2Em8Z95po9pGRUDmHgHe4z0j0Jnvy3IG7xKY=";
};
sourceRoot = "${src.name}/synapse_antispam";
diff --git a/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix b/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix
index 640c09a7c00c..1dd3422f76ef 100644
--- a/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix
@@ -6,17 +6,17 @@
buildGoModule rec {
pname = "influxdb_exporter";
- version = "0.11.7";
+ version = "0.12.0";
rev = "v${version}";
src = fetchFromGitHub {
inherit rev;
owner = "prometheus";
repo = "influxdb_exporter";
- hash = "sha256-gaUBRDGbHvHH+Ll1fmOaYEVRAqy2q5HoTyty2PGTwBE=";
+ hash = "sha256-O3cH7fX29tr/rhsovoYnmTL6CE+sZQKGNj4mq1IV/5U=";
};
- vendorHash = "sha256-47ru0rzLl4/O0UOGqCojH+vqd4TS1S2Hk6zmSzrXriw=";
+ vendorHash = "sha256-RCf52lHpF4alljH/CNhCg+zgfvlYbO5WT2rFX63fyyo=";
ldflags = [
"-s"
diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix
index f85fd1117279..e814567f01ec 100644
--- a/pkgs/servers/radarr/default.nix
+++ b/pkgs/servers/radarr/default.nix
@@ -10,15 +10,15 @@ let
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
hash = {
- x64-linux_hash = "sha256-ZI4ALGEdc9ZBUp8TnvzzbejxVBy61WAIxlbp0VYyc7M=";
- arm64-linux_hash = "sha256-qN8CNV10q5JP+f1XdfsgCqnpbhzFlCPbM3TIAnGh9U8=";
- x64-osx_hash = "sha256-u7Ny3ppD/mdIKk+I/ywsk1bS7EjEt63mbvzaM8MpoCE=";
- arm64-osx_hash = "sha256-k5iOzyicXpoCWotGvC/J8euh0OQOuKLxU6OTWiWmWc8=";
+ x64-linux_hash = "sha256-RvzAWVm2rUSL296H0FNsvGp1aCGu2xSoiQEJJM3hLRI=";
+ arm64-linux_hash = "sha256-/j7yyiUBFJHDQ+14sQYrZDeWuBqNQ6Ipo2MOVWuYYlc=";
+ x64-osx_hash = "sha256-Q5M2t7fEVYxvtTuP8C7kqe/yMTlus3pDUmbDBw14u3Q=";
+ arm64-osx_hash = "sha256-Lgdlxwb5szkz2qRDs0eup3J4M/GQ4sYHzvhIJP+0ow0=";
}."${arch}-${os}_hash";
in stdenv.mkDerivation rec {
pname = "radarr";
- version = "5.11.0.9244";
+ version = "5.14.0.9383";
src = fetchurl {
url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz";
diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix
index eb96dbd5f355..bd4038cf3dee 100644
--- a/pkgs/servers/zigbee2mqtt/default.nix
+++ b/pkgs/servers/zigbee2mqtt/default.nix
@@ -10,16 +10,16 @@
buildNpmPackage rec {
pname = "zigbee2mqtt";
- version = "1.40.2";
+ version = "1.41.0";
src = fetchFromGitHub {
owner = "Koenkk";
repo = "zigbee2mqtt";
rev = version;
- hash = "sha256-gm4MQabvm8NipV6Szml6l2Dy7q3O6YsurGGg9DzahHI=";
+ hash = "sha256-WIU3fTONRckPmSdW5DJXripsf4QdEZM7UBVSru7JqYc=";
};
- npmDepsHash = "sha256-FF7RCV5SDzLUZ/dY8mnPEmYmBhJNjJScQ1R2yKDSawU=";
+ npmDepsHash = "sha256-yCFhHJCBSc8tCWib9ffqBg4sF9VURx+nXln9ghmBpyM=";
buildInputs = lib.optionals withSystemd [
systemdMinimal
diff --git a/pkgs/tools/games/minecraft/optifine/versions.json b/pkgs/tools/games/minecraft/optifine/versions.json
index f3df15597952..f5b02d748ba4 100644
--- a/pkgs/tools/games/minecraft/optifine/versions.json
+++ b/pkgs/tools/games/minecraft/optifine/versions.json
@@ -1,4 +1,8 @@
{
+ "optifine_1_21_1": {
+ "version": "1.21.1_HD_U_J1",
+ "sha256": "10lhnxang1zpvc30brg8ansm5b2snmf8x14g5pmbs280vca2svfv"
+ },
"optifine_1_20_4": {
"version": "1.20.4_HD_U_I7",
"sha256": "1zgz5cd2v299hayk5qx639nknd3mcz58y59rpik8srx48da8jw14"
@@ -152,7 +156,7 @@
"sha256": "18lzyh639mi7r2hzwnmxv0a6v1ay7dk9bzasvwff82dxq0y9zi7m"
},
"optifine-latest": {
- "version": "1.20.4_HD_U_I7",
- "sha256": "1zgz5cd2v299hayk5qx639nknd3mcz58y59rpik8srx48da8jw14"
+ "version": "1.21.1_HD_U_J1",
+ "sha256": "10lhnxang1zpvc30brg8ansm5b2snmf8x14g5pmbs280vca2svfv"
}
}
diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix
deleted file mode 100644
index c8f41167f865..000000000000
--- a/pkgs/tools/graphics/vips/default.nix
+++ /dev/null
@@ -1,139 +0,0 @@
-{ lib
-, stdenv
-, pkg-config
-, glib
-, libxml2
-, expat
-, ApplicationServices
-, Foundation
-, python3
-, fetchFromGitHub
-, meson
-, ninja
-, gtk-doc
-, docbook-xsl-nons
-, gobject-introspection
- # Optional dependencies
-, libjpeg
-, libexif
-, librsvg
-, poppler
-, libtiff
-, fftw
-, lcms2
-, libspng
-, libimagequant
-, imagemagick
-, pango
-, matio
-, cfitsio
-, libwebp
-, openexr
-, openjpeg
-, libjxl
-, openslide
-, libheif
-, cgif
-, libarchive
-, libhwy
-, testers
-, nix-update-script
-}:
-
-stdenv.mkDerivation (finalAttrs: {
- pname = "vips";
- version = "8.15.3";
-
- outputs = [ "bin" "out" "man" "dev" ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "devdoc" ];
-
- src = fetchFromGitHub {
- owner = "libvips";
- repo = "libvips";
- rev = "refs/tags/v${finalAttrs.version}";
- hash = "sha256-VQtHHitEpxv63wC41TtRWLLCKHDAK7fbrS+cByeWxT0=";
- # Remove unicode file names which leads to different checksums on HFS+
- # vs. other filesystems because of unicode normalisation.
- postFetch = ''
- rm -r $out/test/test-suite/images/
- '';
- };
-
- nativeBuildInputs = [
- pkg-config
- meson
- ninja
- docbook-xsl-nons
- gobject-introspection
- ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
- gtk-doc
- ];
-
- buildInputs = [
- glib
- libxml2
- expat
- (python3.withPackages (p: [ p.pycairo ]))
- # Optional dependencies
- libjpeg
- libexif
- librsvg
- poppler
- libtiff
- fftw
- lcms2
- libspng
- libimagequant
- imagemagick
- pango
- matio
- cfitsio
- libwebp
- openexr
- openjpeg
- libjxl
- openslide
- libheif
- cgif
- libarchive
- libhwy
- ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices Foundation ];
-
- # Required by .pc file
- propagatedBuildInputs = [
- glib
- ];
-
- mesonFlags = [
- "-Dpdfium=disabled"
- "-Dnifti=disabled"
- ]
- ++ lib.optional (!stdenv.hostPlatform.isDarwin) "-Dgtk_doc=true"
- ++ lib.optional (imagemagick == null) "-Dmagick=disabled"
- ;
-
- passthru = {
- tests = {
- pkg-config = testers.hasPkgConfigModules {
- package = finalAttrs.finalPackage;
- };
- version = testers.testVersion {
- package = finalAttrs.finalPackage;
- command = "vips --version";
- };
- };
- updateScript = nix-update-script {
- extraArgs = [ "--version-regex" "v([0-9.]+)" ];
- };
- };
-
- meta = with lib; {
- changelog = "https://github.com/libvips/libvips/blob/${finalAttrs.src.rev}/ChangeLog";
- homepage = "https://www.libvips.org/";
- description = "Image processing system for large images";
- license = licenses.lgpl2Plus;
- maintainers = with maintainers; [ kovirobi anthonyroussel ];
- pkgConfigModules = [ "vips" "vips-cpp" ];
- platforms = platforms.unix;
- mainProgram = "vips";
- };
-})
diff --git a/pkgs/tools/misc/abduco/default.nix b/pkgs/tools/misc/abduco/default.nix
index eef5fe0df344..1f454d40bc85 100644
--- a/pkgs/tools/misc/abduco/default.nix
+++ b/pkgs/tools/misc/abduco/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchpatch, fetchzip, writeText, conf ? null }:
+{ lib, stdenv, fetchpatch, fetchzip, writeText, darwin, conf ? null }:
let
rev = "8c32909a159aaa9484c82b71f05b7a73321eb491";
@@ -21,6 +21,10 @@ stdenv.mkDerivation {
installFlags = [ "install-completion" ];
CFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-D_DARWIN_C_SOURCE";
+ buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
+ darwin.libutil
+ ];
+
patches = [
# https://github.com/martanne/abduco/pull/22
(fetchpatch {
diff --git a/pkgs/tools/misc/mtm/default.nix b/pkgs/tools/misc/mtm/default.nix
index 8ecbc087894b..97d2c72d52be 100644
--- a/pkgs/tools/misc/mtm/default.nix
+++ b/pkgs/tools/misc/mtm/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, ncurses }:
+{ lib, stdenv, fetchFromGitHub, ncurses, darwin }:
stdenv.mkDerivation rec {
pname = "mtm";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "0gibrvah059z37jvn1qs4b6kvd4ivk2mfihmcpgx1vz6yg70zghv";
};
- buildInputs = [ ncurses ];
+ buildInputs = [ ncurses ] ++ lib.optionals stdenv.isDarwin [ darwin.libutil ];
makeFlags = [ "DESTDIR=${placeholder "out"}" "MANDIR=${placeholder "out"}/share/man/man1" ];
diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix
index 7a48cbe77529..c580d02a794f 100644
--- a/pkgs/tools/networking/eternal-terminal/default.nix
+++ b/pkgs/tools/networking/eternal-terminal/default.nix
@@ -8,6 +8,7 @@
, protobuf
, zlib
, catch2
+, darwin
}:
stdenv.mkDerivation rec {
@@ -31,6 +32,8 @@ stdenv.mkDerivation rec {
openssl
protobuf
zlib
+ ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ darwin.libutil
];
preBuild = ''
diff --git a/pkgs/tools/networking/grpc_cli/default.nix b/pkgs/tools/networking/grpc_cli/default.nix
index 582b8c017cc0..58915a3509e2 100644
--- a/pkgs/tools/networking/grpc_cli/default.nix
+++ b/pkgs/tools/networking/grpc_cli/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "grpc_cli";
- version = "1.66.2";
+ version = "1.67.1";
src = fetchFromGitHub {
owner = "grpc";
repo = "grpc";
rev = "v${version}";
- hash = "sha256-nka7ZzyZIeEAPaz7v/8RAeo9XmkgrOrHpor3siAx7Ec=";
+ hash = "sha256-x49mh7gLliAiFjOZM5U/CnMQqs7fAhoipo18OBoeD0w=";
fetchSubmodules = true;
};
nativeBuildInputs = [ automake cmake autoconf ];
diff --git a/pkgs/tools/security/osv-scanner/default.nix b/pkgs/tools/security/osv-scanner/default.nix
index 35835d0dcc59..3426e424ea95 100644
--- a/pkgs/tools/security/osv-scanner/default.nix
+++ b/pkgs/tools/security/osv-scanner/default.nix
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "osv-scanner";
- version = "1.9.0";
+ version = "1.9.1";
src = fetchFromGitHub {
owner = "google";
repo = "osv-scanner";
rev = "refs/tags/v${version}";
- hash = "sha256-hK8hvD59X+JzeBtYqwlfNBy2XX7slzMKoIHxL8DmRGc=";
+ hash = "sha256-s288EHtF/YRkPVwe7b1+q/1ky8tQdHvzb8GaOPpRqTw=";
};
- vendorHash = "sha256-IVtdZCwjGrGr0DuyPCkt5DJQhD8mN7bEFI41e0a3s8s=";
+ vendorHash = "sha256-DNUkUmxzej/NDwJ3lgPek/6C3/ytjlHmFIb1IvKvAQs=";
subPackages = [
"cmd/osv-scanner"
diff --git a/pkgs/tools/security/yubihsm-shell/default.nix b/pkgs/tools/security/yubihsm-shell/default.nix
index 90af2f22068a..107053ca00a7 100644
--- a/pkgs/tools/security/yubihsm-shell/default.nix
+++ b/pkgs/tools/security/yubihsm-shell/default.nix
@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "yubihsm-shell";
- version = "2.5.0";
+ version = "2.6.0";
src = fetchFromGitHub {
owner = "Yubico";
repo = "yubihsm-shell";
rev = version;
- hash = "sha256-QTDFL/UTnnG0TuojJ0eVKw8fNEqZz86CXWb6uHvzUbs=";
+ hash = "sha256-0IsdIhuKpzfArVB4xBaxCPqtk0fKWb6RuGImUj1E4Zs=";
};
postPatch = ''
@@ -70,5 +70,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/Yubico/yubihsm-shell";
maintainers = with maintainers; [ matthewcroughan ];
license = licenses.asl20;
+ platforms = platforms.all;
+ broken = stdenv.hostPlatform.isDarwin;
};
}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f95d4e7cde6d..d66ad450ec82 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21910,10 +21910,6 @@ with pkgs;
microsoft-gsl = callPackage ../development/libraries/microsoft-gsl { };
- microsoft-edge = callPackage (import ../applications/networking/browsers/microsoft-edge).stable { };
- microsoft-edge-beta = callPackage (import ../applications/networking/browsers/microsoft-edge).beta { };
- microsoft-edge-dev = callPackage (import ../applications/networking/browsers/microsoft-edge).dev { };
-
micronucleus = callPackage ../development/tools/misc/micronucleus { };
markdown-anki-decks = callPackage ../tools/misc/markdown-anki-decks { };
@@ -23835,17 +23831,17 @@ with pkgs;
faslExt = "fasl";
flags = [ "--dynamic-space-size" "3000" ];
};
- sbcl_2_4_8 = wrapLisp {
- pkg = callPackage ../development/compilers/sbcl { version = "2.4.8"; };
- faslExt = "fasl";
- flags = [ "--dynamic-space-size" "3000" ];
- };
sbcl_2_4_9 = wrapLisp {
pkg = callPackage ../development/compilers/sbcl { version = "2.4.9"; };
faslExt = "fasl";
flags = [ "--dynamic-space-size" "3000" ];
};
- sbcl = sbcl_2_4_9;
+ sbcl_2_4_10 = wrapLisp {
+ pkg = callPackage ../development/compilers/sbcl { version = "2.4.10"; };
+ faslExt = "fasl";
+ flags = [ "--dynamic-space-size" "3000" ];
+ };
+ sbcl = sbcl_2_4_10;
sbclPackages = recurseIntoAttrs sbcl.pkgs;
@@ -37832,7 +37828,7 @@ with pkgs;
vimb-unwrapped = callPackage ../applications/networking/browsers/vimb { };
vimb = wrapFirefox vimb-unwrapped { };
- vips = callPackage ../tools/graphics/vips {
+ vips = callPackage ../by-name/vi/vips/package.nix {
inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation;
};
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 0d864e837ff2..0307e5185a1d 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -663,7 +663,7 @@ in {
# Some tests are causing issues in the Darwin sandbox with issues
# such as
# Unknown: php_network_getaddresses: getaddrinfo for localhost failed: nodename nor servname provided
- doCheck = !stdenv.hostPlatform.isDarwin;
+ doCheck = !stdenv.hostPlatform.isDarwin && lib.versionOlder php.version "8.4";
internalDeps = [ php.extensions.session ];
patches = lib.optionals (lib.versions.majorMinor php.version == "8.1") [
# Fix tests with libxml2 2.12
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 75ce887ee4f7..e15b48dcb152 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6634,12 +6634,16 @@ self: super: with self; {
jupyter-collaboration = callPackage ../development/python-modules/jupyter-collaboration { };
+ jupyter-collaboration-ui = callPackage ../development/python-modules/jupyter-collaboration-ui { };
+
jupyter-contrib-core = callPackage ../development/python-modules/jupyter-contrib-core { };
jupyter-console = callPackage ../development/python-modules/jupyter-console { };
jupyter-core = callPackage ../development/python-modules/jupyter-core { };
+ jupyter-docprovider = callPackage ../development/python-modules/jupyter-docprovider { };
+
jupyter-events = callPackage ../development/python-modules/jupyter-events { };
jupyter-highlight-selected-word = callPackage ../development/python-modules/jupyter-highlight-selected-word { };
@@ -6654,6 +6658,8 @@ self: super: with self; {
jupyter-server-terminals = callPackage ../development/python-modules/jupyter-server-terminals { };
+ jupyter-server-ydoc = callPackage ../development/python-modules/jupyter-server-ydoc { };
+
jupyter-ui-poll = callPackage ../development/python-modules/jupyter-ui-poll { };
jupyter-ydoc = callPackage ../development/python-modules/jupyter-ydoc { };
@@ -6937,6 +6943,8 @@ self: super: with self; {
langgraph-checkpoint-postgres = callPackage ../development/python-modules/langgraph-checkpoint-postgres { };
+ langgraph-checkpoint-duckdb = callPackage ../development/python-modules/langgraph-checkpoint-duckdb { };
+
langgraph-checkpoint-sqlite = callPackage ../development/python-modules/langgraph-checkpoint-sqlite { };
langgraph-cli = callPackage ../development/python-modules/langgraph-cli { };