Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -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 {
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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 " <file>${BASENAME}</file>\n")
|
||||
@@ -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
|
||||
];
|
||||
|
||||
@@ -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)
|
||||
@@ -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 ];
|
||||
|
||||
|
||||
@@ -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 = [
|
||||
|
||||
@@ -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""",
|
||||
)
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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 ];
|
||||
|
||||
|
||||
@@ -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 ];
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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 ];
|
||||
};
|
||||
}
|
||||
@@ -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=";
|
||||
};
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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 = [
|
||||
|
||||
@@ -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 = [
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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)" ];
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 ]
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 = {
|
||||
|
||||
@@ -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 = ''
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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 ];
|
||||
|
||||
@@ -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" ];
|
||||
|
||||
@@ -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=";
|
||||
|
||||
@@ -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 ];
|
||||
};
|
||||
})
|
||||
+5
-31
@@ -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()
|
||||
@@ -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 ];
|
||||
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
|
||||
|
||||
@@ -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";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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" ];
|
||||
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
|
||||
@@ -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; {
|
||||
|
||||
@@ -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=";
|
||||
|
||||
@@ -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";
|
||||
};
|
||||
})
|
||||
@@ -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 {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 = [
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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=";
|
||||
};
|
||||
}
|
||||
);
|
||||
|
||||
@@ -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' \
|
||||
|
||||
@@ -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" ];
|
||||
|
||||
|
||||
@@ -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 ./
|
||||
|
||||
|
||||
@@ -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')
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -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 = [
|
||||
|
||||
@@ -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=";
|
||||
};
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
, python3
|
||||
, libxsmm
|
||||
, mpi
|
||||
, openssh
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -62,7 +61,6 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
openssh
|
||||
mpiCheckPhaseHook
|
||||
];
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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" ];
|
||||
|
||||
@@ -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 ];
|
||||
|
||||
@@ -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";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -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";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -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";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -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 = {
|
||||
|
||||
@@ -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";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -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";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -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 ];
|
||||
|
||||
@@ -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; {
|
||||
|
||||
@@ -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" ];
|
||||
|
||||
@@ -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 = [
|
||||
|
||||
@@ -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: '<h1>Ajout de Article (Hollandais)</h1>' 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 ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
}
|
||||
@@ -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";
|
||||
|
||||
@@ -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
|
||||
];
|
||||
})
|
||||
@@ -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;
|
||||
};
|
||||
}
|
||||
@@ -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;
|
||||
};
|
||||
}
|
||||
@@ -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 = [
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -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 = ''
|
||||
|
||||
@@ -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 = ''
|
||||
|
||||
@@ -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
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -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
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -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
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -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
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -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
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -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 = ''
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user