Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -19078,6 +19078,12 @@
|
||||
fingerprint = "640B EDDE 9734 310A BFA3 B257 52ED AE6A 3995 AFAB";
|
||||
}];
|
||||
};
|
||||
whiteley = {
|
||||
email = "mattwhiteley@gmail.com";
|
||||
github = "whiteley";
|
||||
githubId = 2215;
|
||||
name = "Matt Whiteley";
|
||||
};
|
||||
WhittlesJr = {
|
||||
email = "alex.joseph.whitt@gmail.com";
|
||||
github = "WhittlesJr";
|
||||
|
||||
@@ -82,6 +82,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
|
||||
castopod.succeed("curl -s http://localhost/cp-install | grep 'Create your Super Admin account' > /dev/null")
|
||||
|
||||
with subtest("Create superadmin and log in"):
|
||||
castopod.succeed("PYTHONUNBUFFERED=1 test-runner | systemd-cat -t test-runner")
|
||||
castopod.succeed("PYTHONUNBUFFERED=1 systemd-cat -t test-runner test-runner")
|
||||
'';
|
||||
})
|
||||
|
||||
@@ -176,22 +176,22 @@ import ../make-test-python.nix ({ package, ... }: {
|
||||
nn2.succeed("systemctl stop hdfs-zkfc")
|
||||
|
||||
# Initialize zookeeper for failover controller
|
||||
nn1.succeed("sudo -u hdfs hdfs zkfc -formatZK 2>&1 | systemd-cat")
|
||||
nn1.succeed("sudo -u hdfs systemd-cat hdfs zkfc -formatZK")
|
||||
|
||||
# Format NN1 and start it
|
||||
nn1.succeed("sudo -u hdfs hadoop namenode -format 2>&1 | systemd-cat")
|
||||
nn1.succeed("sudo -u hdfs systemd-cat hadoop namenode -format")
|
||||
nn1.succeed("systemctl start hdfs-namenode")
|
||||
nn1.wait_for_open_port(9870)
|
||||
nn1.wait_for_open_port(8022)
|
||||
nn1.wait_for_open_port(8020)
|
||||
|
||||
# Bootstrap NN2 from NN1 and start it
|
||||
nn2.succeed("sudo -u hdfs hdfs namenode -bootstrapStandby 2>&1 | systemd-cat")
|
||||
nn2.succeed("sudo -u hdfs systemd-cat hdfs namenode -bootstrapStandby")
|
||||
nn2.succeed("systemctl start hdfs-namenode")
|
||||
nn2.wait_for_open_port(9870)
|
||||
nn2.wait_for_open_port(8022)
|
||||
nn2.wait_for_open_port(8020)
|
||||
nn1.succeed("netstat -tulpne | systemd-cat")
|
||||
nn1.succeed("systemd-cat netstat -tulpne")
|
||||
|
||||
# Start failover controllers
|
||||
nn1.succeed("systemctl start hdfs-zkfc")
|
||||
@@ -200,10 +200,10 @@ import ../make-test-python.nix ({ package, ... }: {
|
||||
# DN should have started by now, but confirm anyway
|
||||
dn1.wait_for_unit("hdfs-datanode")
|
||||
# Print states of namenodes
|
||||
client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat")
|
||||
client.succeed("sudo -u hdfs systemd-cat hdfs haadmin -getAllServiceState")
|
||||
# Wait for cluster to exit safemode
|
||||
client.succeed("sudo -u hdfs hdfs dfsadmin -safemode wait")
|
||||
client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat")
|
||||
client.succeed("sudo -u hdfs systemd-cat hdfs haadmin -getAllServiceState")
|
||||
# test R/W
|
||||
client.succeed("echo testfilecontents | sudo -u hdfs hdfs dfs -put - /testfile")
|
||||
assert "testfilecontents" in client.succeed("sudo -u hdfs hdfs dfs -cat /testfile")
|
||||
@@ -211,7 +211,7 @@ import ../make-test-python.nix ({ package, ... }: {
|
||||
# Test NN failover
|
||||
nn1.succeed("systemctl stop hdfs-namenode")
|
||||
assert "active" in client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState")
|
||||
client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat")
|
||||
client.succeed("sudo -u hdfs systemd-cat hdfs haadmin -getAllServiceState")
|
||||
assert "testfilecontents" in client.succeed("sudo -u hdfs hdfs dfs -cat /testfile")
|
||||
|
||||
nn1.succeed("systemctl start hdfs-namenode")
|
||||
@@ -219,7 +219,7 @@ import ../make-test-python.nix ({ package, ... }: {
|
||||
nn1.wait_for_open_port(8022)
|
||||
nn1.wait_for_open_port(8020)
|
||||
assert "standby" in client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState")
|
||||
client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat")
|
||||
client.succeed("sudo -u hdfs systemd-cat hdfs haadmin -getAllServiceState")
|
||||
|
||||
#### YARN tests ####
|
||||
|
||||
@@ -236,18 +236,18 @@ import ../make-test-python.nix ({ package, ... }: {
|
||||
nm1.wait_for_open_port(8042)
|
||||
nm1.wait_for_open_port(8040)
|
||||
client.wait_until_succeeds("yarn node -list | grep Nodes:1")
|
||||
client.succeed("sudo -u yarn yarn rmadmin -getAllServiceState | systemd-cat")
|
||||
client.succeed("sudo -u yarn yarn node -list | systemd-cat")
|
||||
client.succeed("sudo -u yarn systemd-cat yarn rmadmin -getAllServiceState")
|
||||
client.succeed("sudo -u yarn systemd-cat yarn node -list")
|
||||
|
||||
# Test RM failover
|
||||
rm1.succeed("systemctl stop yarn-resourcemanager")
|
||||
assert "standby" not in client.succeed("sudo -u yarn yarn rmadmin -getAllServiceState")
|
||||
client.succeed("sudo -u yarn yarn rmadmin -getAllServiceState | systemd-cat")
|
||||
client.succeed("sudo -u yarn systemd-cat yarn rmadmin -getAllServiceState")
|
||||
rm1.succeed("systemctl start yarn-resourcemanager")
|
||||
rm1.wait_for_unit("yarn-resourcemanager")
|
||||
rm1.wait_for_open_port(8088)
|
||||
assert "standby" in client.succeed("sudo -u yarn yarn rmadmin -getAllServiceState")
|
||||
client.succeed("sudo -u yarn yarn rmadmin -getAllServiceState | systemd-cat")
|
||||
client.succeed("sudo -u yarn systemd-cat yarn rmadmin -getAllServiceState")
|
||||
|
||||
assert "Estimated value of Pi is" in client.succeed("HADOOP_USER_NAME=hdfs yarn jar $(readlink $(which yarn) | sed -r 's~bin/yarn~share/hadoop/mapreduce/hadoop-mapreduce-examples-*.jar~g') pi 2 10")
|
||||
assert "SUCCEEDED" in client.succeed("yarn application -list -appStates FINISHED")
|
||||
|
||||
@@ -50,8 +50,8 @@ import ../make-test-python.nix ({ package, lib, ... }:
|
||||
namenode.wait_for_unit("hdfs-namenode")
|
||||
namenode.wait_for_unit("network.target")
|
||||
namenode.wait_for_open_port(8020)
|
||||
namenode.succeed("ss -tulpne | systemd-cat")
|
||||
namenode.succeed("cat /etc/hadoop*/hdfs-site.xml | systemd-cat")
|
||||
namenode.succeed("systemd-cat ss -tulpne")
|
||||
namenode.succeed("systemd-cat cat /etc/hadoop*/hdfs-site.xml")
|
||||
namenode.wait_for_open_port(9870)
|
||||
|
||||
datanode.wait_for_unit("hdfs-datanode")
|
||||
|
||||
@@ -202,7 +202,7 @@ import ./make-test-python.nix (
|
||||
initiatorAuto.succeed("umount /mnt")
|
||||
|
||||
initiatorAuto.succeed("systemctl restart multipathd")
|
||||
initiatorAuto.succeed("multipath -ll | systemd-cat")
|
||||
initiatorAuto.succeed("systemd-cat multipath -ll")
|
||||
|
||||
# Install our RootDisk machine to 123456, the alias to the device that multipath is now managing
|
||||
initiatorAuto.succeed("mount /dev/mapper/123456 /mnt")
|
||||
@@ -223,7 +223,7 @@ import ./make-test-python.nix (
|
||||
initiatorRootDisk.fail("iscsiadm -m discovery -o update -t sendtargets -p 192.168.1.3 --login")
|
||||
initiatorRootDisk.fail("iscsiadm -m discovery -o update -t sendtargets -p 192.168.2.3 --login")
|
||||
initiatorRootDisk.succeed("systemctl restart multipathd")
|
||||
initiatorRootDisk.succeed("multipath -ll | systemd-cat")
|
||||
initiatorRootDisk.succeed("systemd-cat multipath -ll")
|
||||
|
||||
# Verify we can write and sync the root disk
|
||||
initiatorRootDisk.succeed("mkdir /scratch")
|
||||
|
||||
@@ -173,7 +173,7 @@ let
|
||||
)
|
||||
|
||||
with subtest("use the web interface to sign up, log in, and save a password"):
|
||||
server.succeed("PYTHONUNBUFFERED=1 test-runner | systemd-cat -t test-runner")
|
||||
server.succeed("PYTHONUNBUFFERED=1 systemd-cat -t test-runner test-runner")
|
||||
|
||||
with subtest("log in with the cli"):
|
||||
key = client.succeed(
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zam-plugins";
|
||||
version = "4.1";
|
||||
version = "4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zamaudio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-NKa6lOP3fpAFMYwzZAMFgW0tBSM/F89oB/nDbEUeflw=";
|
||||
sha256 = "sha256-6TPZMDhGHqXjY8UYEqlr4hweF+W19IpIfSa9Bo9Ta1A=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
# instead of adding this to `services.udev.packages` on NixOS,
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "solaar";
|
||||
version = "1.1.9";
|
||||
version = "1.1.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pwr-Solaar";
|
||||
repo = "Solaar";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-MdPZ9uLQYwgZ6xXWinzFg5A2gJ3ihTS9CbEmXnaNEkI=";
|
||||
hash = "sha256-cs1kj/spZtMUL9aUtBHINAH7uyjMSn9jRDF/hRPzIbo=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "udev" ];
|
||||
@@ -38,13 +38,14 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
evdev
|
||||
dbus-python
|
||||
gtk3
|
||||
hid-parser
|
||||
psutil
|
||||
pygobject3
|
||||
pyudev
|
||||
pyyaml
|
||||
xlib
|
||||
hid-parser
|
||||
];
|
||||
|
||||
# the -cli symlink is just to maintain compabilility with older versions where
|
||||
|
||||
@@ -772,13 +772,13 @@
|
||||
"vendorHash": "sha256-cufN4QYXE+bqDKLUV+Rdslr5CgbI0DvoFVWVQiBVomw="
|
||||
},
|
||||
"mongodbatlas": {
|
||||
"hash": "sha256-aS5TU9xnevgjK9TH0J4nzSr6ct2Cqw2Wa+d+jIjA9Qg=",
|
||||
"hash": "sha256-SMIc78haJiH0XdTr9OBGWOcvXfYQW9thcNkCOxmNxDw=",
|
||||
"homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas",
|
||||
"owner": "mongodb",
|
||||
"repo": "terraform-provider-mongodbatlas",
|
||||
"rev": "v1.12.2",
|
||||
"rev": "v1.12.3",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-on7kyb/AGdQK++5AOCEmkrRlbuW09u2653mda9gmvKE="
|
||||
"vendorHash": "sha256-B1trhV2/H5gP7EnUU7G45gIh95S2wYbANHsRM76CDWE="
|
||||
},
|
||||
"namecheap": {
|
||||
"hash": "sha256-cms8YUL+SjTeYyIOQibksi8ZHEBYq2JlgTEpOO1uMZE=",
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, aqbanking
|
||||
@@ -32,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
# raw source code doesn't work out of box; fetchFromGitHub not usable
|
||||
src = fetchurl {
|
||||
# Upstream uploaded a -1 tarball on the same release, remove on next release
|
||||
url = "https://github.com/Gnucash/gnucash/releases/download/${version}/${pname}-${version}-1.tar.bz2";
|
||||
url = "https://github.com/Gnucash/gnucash/releases/download/${version}/gnucash-${version}-1.tar.bz2";
|
||||
hash = "sha256-d0EWXW1lLqe0oehJjPQ5pWuBpcyLZTKRpZBU8jYqv8w=";
|
||||
};
|
||||
|
||||
@@ -97,12 +98,29 @@ stdenv.mkDerivation rec {
|
||||
enableParallelChecking = true;
|
||||
checkTarget = "check";
|
||||
|
||||
passthru.docs = stdenv.mkDerivation {
|
||||
pname = "gnucash-docs";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Gnucash";
|
||||
repo = "gnucash-docs";
|
||||
rev = version;
|
||||
hash = "sha256-aPxQEcpo8SPv8lPQbxMl1wg8ijH9Rz0oo4K5lp3C/bw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ libxml2 libxslt ];
|
||||
};
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
# documentation
|
||||
--prefix XDG_DATA_DIRS : ${passthru.docs}/share
|
||||
# db drivers location
|
||||
--set GNC_DBD_DIR ${libdbiDrivers}/lib/dbd
|
||||
# gsettings schema location on Nix
|
||||
--set GSETTINGS_SCHEMA_DIR ${glib.makeSchemaPath "$out" "${pname}-${version}"}
|
||||
--set GSETTINGS_SCHEMA_DIR ${glib.makeSchemaPath "$out" "gnucash-${version}"}
|
||||
)
|
||||
'';
|
||||
|
||||
|
||||
@@ -70,7 +70,9 @@ stdenv.mkDerivation rec {
|
||||
qtwayland
|
||||
];
|
||||
|
||||
preConfigure = lib.optionalString stdenv.isDarwin ''
|
||||
preConfigure = ''
|
||||
export SOURCE_DATE_EPOCH=$(date -d 20${lib.versions.major version}0101 +%s)
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
export LC_ALL=en_US.UTF-8
|
||||
'';
|
||||
|
||||
|
||||
@@ -102,11 +102,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "${optionalString onlyLibVLC "lib"}vlc";
|
||||
version = "3.0.18";
|
||||
version = "3.0.20";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://get.videolan.org/vlc/${finalAttrs.version}/vlc-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-VwlEOcNl2KqLm0H6MIDMDu8r7+YCW7XO9yKszGJa7ew=";
|
||||
hash = "sha256-rccoW00nIc3fQOtScMraKqoQozTLVG/VWgY1NEe6KbU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -220,12 +220,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
url = "https://code.videolan.org/videolan/vlc/uploads/eb1c313d2d499b8a777314f789794f9d/0001-Add-lssl-and-lcrypto-to-liblive555_plugin_la_LIBADD.patch";
|
||||
sha256 = "0kyi8q2zn2ww148ngbia9c7qjgdrijf4jlvxyxgrj29cb5iy1kda";
|
||||
})
|
||||
# patch to build with recent libplacebo
|
||||
# https://code.videolan.org/videolan/vlc/-/merge_requests/3027
|
||||
(fetchpatch {
|
||||
url = "https://code.videolan.org/videolan/vlc/-/commit/65ea8d19d91ac1599a29e8411485a72fe89c45e2.patch";
|
||||
hash = "sha256-Zz+g75V6X9OZI3sn614K9Uenxl3WtRHKSdLkWP3b17w=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
{ buildGoModule
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gerrit-queue";
|
||||
version = "0.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flokli";
|
||||
repo = "gerrit-queue";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JkAYqqet6y89RTBU9FuxkMwJiGM6opL0reXbojSal3Y=";
|
||||
};
|
||||
vendorHash = "sha256-+Ig4D46NphzpWKXO23Haea9EqVtpda8v9zLPJkbe3bQ=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Merge bot for Gerrit";
|
||||
homepage = "https://github.com/flokli/gerrit-queue";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ flokli ];
|
||||
mainProgram = "gerrit-queue";
|
||||
};
|
||||
}
|
||||
@@ -24,6 +24,13 @@ rustPlatform.buildRustPackage rec {
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
env.NUMBAT_SYSTEM_MODULE_PATH = "${placeholder "out"}/share/${pname}/modules";
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/${pname}
|
||||
cp -r $src/${pname}/modules $out/share/${pname}/
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = numbat;
|
||||
};
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
{ stdenv, lib, fetchFromGitHub, meson, ninja }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "simde";
|
||||
version = "0.7.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simd-everywhere";
|
||||
repo = "simde";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pj+zaD5o9XYkTavezcQFzM6ao0IdQP1zjP9L4vcCyEY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://simd-everywhere.github.io";
|
||||
description = "Implementations of SIMD instruction sets for systems which don't natively support them";
|
||||
license = with licenses; [mit];
|
||||
maintainers = with maintainers; [ whiteley ];
|
||||
platforms = flatten (with platforms; [
|
||||
arm
|
||||
armv7
|
||||
aarch64
|
||||
x86
|
||||
power
|
||||
mips
|
||||
]);
|
||||
};
|
||||
}
|
||||
@@ -20,16 +20,16 @@ assert waylandSupport -> stdenv.isLinux;
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "supersonic" + lib.optionalString waylandSupport "-wayland";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dweymouth";
|
||||
repo = "supersonic";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-elDVkhRW1mTez56OKQJJ0m0VxP8/Bq+HcXf5iokeY5I=";
|
||||
hash = "sha256-DVduZ1qPbcDlH+B5hibC2HUjwEUV+CpDDpMI8GdPwro";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-z1sDlyc7HW+tYfG0Z4EjUCEM3Su4JjmWIKxU2MV6GOA=";
|
||||
vendorHash = "sha256-Dj6I+gt0gB5HWTWdFXCV5UpLuvg+HhuygRJAdvV/Yp8";
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
|
||||
@@ -34,9 +34,6 @@ let
|
||||
else /* "4.8" */ isl_0_14;
|
||||
} // lib.optionalAttrs (majorMinorVersion == "4.8") {
|
||||
texinfo = texinfo5; # doesn't validate since 6.1 -> 6.3 bump
|
||||
} // lib.optionalAttrs (majorMinorVersion == "4.9") {
|
||||
# Build fails on Darwin with clang
|
||||
stdenv = if stdenv.isDarwin then gccStdenv else stdenv;
|
||||
} // lib.optionalAttrs (!(atLeast "6")) {
|
||||
cloog = if stdenv.isDarwin
|
||||
then null
|
||||
|
||||
@@ -33,6 +33,7 @@
|
||||
, nukeReferences
|
||||
, callPackage
|
||||
, majorMinorVersion
|
||||
, darwin
|
||||
|
||||
# only for gcc<=6.x
|
||||
, langJava ? false
|
||||
@@ -408,10 +409,15 @@ lib.pipe ((callFile ./common/builder.nix {}) ({
|
||||
maintainers
|
||||
;
|
||||
} // lib.optionalAttrs (!atLeast11) {
|
||||
badPlatforms = if !is49 then [ "aarch64-darwin" ] else lib.platforms.darwin;
|
||||
badPlatforms = if !(is48 || is49) then [ "aarch64-darwin" ] else lib.platforms.darwin;
|
||||
};
|
||||
} // optionalAttrs is7 {
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isClang && langFortran) "-Wno-unused-command-line-argument";
|
||||
} // lib.optionalAttrs (!atLeast10 && stdenv.hostPlatform.isDarwin) {
|
||||
# GCC <10 requires default cctools `strip` instead of `llvm-strip` used by Darwin bintools.
|
||||
preBuild = ''
|
||||
makeFlagsArray+=('STRIP=${lib.getBin darwin.cctools-port}/bin/${stdenv.cc.targetPrefix}strip')
|
||||
'';
|
||||
} // optionalAttrs (!atLeast7) {
|
||||
env.langJava = langJava;
|
||||
} // optionalAttrs atLeast6 {
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
diff -u a/libgcc/config.host b/libgcc/config.host
|
||||
--- a/libgcc/config.host 2023-11-05 11:01:55.778638446 -0500
|
||||
+++ b/libgcc/config.host 2023-11-05 11:07:29.405103979 -0500
|
||||
@@ -227,7 +227,7 @@
|
||||
tmake_file="$tmake_file t-slibgcc-darwin"
|
||||
# newer toolsets produce warnings when building for unsupported versions.
|
||||
case ${host} in
|
||||
- *-*-darwin1[89]* | *-*-darwin2* )
|
||||
+ *-*-darwin1[89]* | *-*-darwin2* | aarch64*-*-darwin*)
|
||||
tmake_file="t-darwin-min-8 $tmake_file"
|
||||
;;
|
||||
*-*-darwin9* | *-*-darwin1[0-7]*)
|
||||
diff -ur a/libgcc/config/t-darwin-rpath b/libgcc/config/t-darwin-rpath
|
||||
--- a/libgcc/config/t-darwin-rpath 2023-11-05 11:34:18.691150009 -0500
|
||||
+++ b/libgcc/config/t-darwin-rpath 2023-11-05 11:50:36.968920904 -0500
|
||||
@@ -2,4 +2,4 @@
|
||||
SHLIB_RPATH = @rpath
|
||||
|
||||
# Which does not work for Darwin < 9
|
||||
-HOST_LIBGCC2_CFLAGS += -mmacosx-version-min=10.5
|
||||
+SHLIB_LOADER_PATH = -Wl,-rpath,@loader_path
|
||||
@@ -0,0 +1,16 @@
|
||||
diff -ur a/libgcc/config/t-darwin b/libgcc/config/t-darwin
|
||||
--- a/libgcc/config/t-darwin 2012-07-14 09:50:59.000000000 -0400
|
||||
+++ b/libgcc/config/t-darwin 2023-11-05 21:26:11.696825584 -0500
|
||||
@@ -7,12 +7,6 @@
|
||||
crttme.o: $(srcdir)/config/darwin-crt-tm.c
|
||||
$(crt_compile) $(DARWIN_EXTRA_CRT_BUILD_CFLAGS) -DEND -c $<
|
||||
|
||||
-# -pipe because there's an assembler bug, 4077127, which causes
|
||||
-# it to not properly process the first # directive, causing temporary
|
||||
-# file names to appear in stabs, causing the bootstrap to fail. Using -pipe
|
||||
-# works around this by not having any temporary file names.
|
||||
-HOST_LIBGCC2_CFLAGS += -pipe
|
||||
-
|
||||
# Use unwind-dw2-fde-darwin
|
||||
LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/config/unwind-dw2-fde-darwin.c \
|
||||
$(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
|
||||
@@ -0,0 +1,96 @@
|
||||
Backported from https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=b2cee5e1e89c8f939bc36fe9756befcb93d96982
|
||||
|
||||
diff -ur a/gcc/config/darwin.h b/gcc/config/darwin.h
|
||||
--- a/gcc/config/darwin.h 2021-05-14 04:42:08.000000000 -0400
|
||||
+++ b/gcc/config/darwin.h 2023-11-06 08:53:27.629155053 -0500
|
||||
@@ -233,12 +233,18 @@
|
||||
|
||||
#define DSYMUTIL "\ndsymutil"
|
||||
|
||||
+/* Spec that controls whether the debug linker is run automatically for
|
||||
+ a link step. This needs to be done if there is a source file on the
|
||||
+ command line which will result in a temporary object (and debug is
|
||||
+ enabled). */
|
||||
+
|
||||
#define DSYMUTIL_SPEC \
|
||||
"%{!fdump=*:%{!fsyntax-only:%{!c:%{!M:%{!MM:%{!E:%{!S:\
|
||||
%{v} \
|
||||
- %{gdwarf-2:%{!gstabs*:%{%:debug-level-gt(0): -idsym}}}\
|
||||
- %{.c|.cc|.C|.cpp|.cp|.c++|.cxx|.CPP|.m|.mm: \
|
||||
- %{gdwarf-2:%{!gstabs*:%{%:debug-level-gt(0): -dsym}}}}}}}}}}}"
|
||||
+ %{g*:%{!gstabs*:%{%:debug-level-gt(0): -idsym}}}\
|
||||
+ %{.c|.cc|.C|.cpp|.cp|.c++|.cxx|.CPP|.m|.mm|.s|.f|.f90|\
|
||||
+ .f95|.f03|.f77|.for|.F|.F90|.F95|.F03: \
|
||||
+ %{g*:%{!gstabs*:%{%:debug-level-gt(0): -dsym}}}}}}}}}}}"
|
||||
|
||||
#define LINK_COMMAND_SPEC LINK_COMMAND_SPEC_A DSYMUTIL_SPEC
|
||||
|
||||
@@ -469,18 +475,31 @@
|
||||
/* Default ASM_DEBUG_SPEC. Darwin's as cannot currently produce dwarf
|
||||
debugging data. */
|
||||
|
||||
+#ifdef HAS_AS_STABS_DIRECTIVE
|
||||
+/* We only pass a debug option to the assembler if that supports stabs, since
|
||||
+ dwarf is not uniformly supported in the assemblers. */
|
||||
#define ASM_DEBUG_SPEC "%{g*:%{%:debug-level-gt(0):%{!gdwarf*:--gstabs}}}"
|
||||
+#else
|
||||
+#define ASM_DEBUG_SPEC ""
|
||||
+#endif
|
||||
+
|
||||
+#undef ASM_DEBUG_OPTION_SPEC
|
||||
+#define ASM_DEBUG_OPTION_SPEC ""
|
||||
+
|
||||
#define ASM_FINAL_SPEC \
|
||||
"%{gsplit-dwarf:%ngsplit-dwarf is not supported on this platform } %<gsplit-dwarf"
|
||||
|
||||
-/* We still allow output of STABS if the assembler supports it. */
|
||||
+/* We now require C++11 to bootstrap and newer tools than those based on
|
||||
+ stabs, so require DWARF-2, even if stabs is supported by the assembler. */
|
||||
+
|
||||
+#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
|
||||
+#define DARWIN_PREFER_DWARF
|
||||
+#define DWARF2_DEBUGGING_INFO 1
|
||||
+
|
||||
#ifdef HAVE_AS_STABS_DIRECTIVE
|
||||
#define DBX_DEBUGGING_INFO 1
|
||||
-#define PREFERRED_DEBUGGING_TYPE DBX_DEBUG
|
||||
#endif
|
||||
|
||||
-#define DWARF2_DEBUGGING_INFO 1
|
||||
-
|
||||
#define DEBUG_FRAME_SECTION "__DWARF,__debug_frame,regular,debug"
|
||||
#define DEBUG_INFO_SECTION "__DWARF,__debug_info,regular,debug"
|
||||
#define DEBUG_ABBREV_SECTION "__DWARF,__debug_abbrev,regular,debug"
|
||||
diff -ur a/gcc/config/darwin9.h b/gcc/config/darwin9.h
|
||||
--- a/gcc/config/darwin9.h 2021-05-14 04:42:08.000000000 -0400
|
||||
+++ b/gcc/config/darwin9.h 2023-11-06 08:54:02.663945206 -0500
|
||||
@@ -18,29 +18,6 @@
|
||||
along with GCC; see the file COPYING3. If not see
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
-/* Prefer DWARF2. */
|
||||
-#undef PREFERRED_DEBUGGING_TYPE
|
||||
-#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
|
||||
-#define DARWIN_PREFER_DWARF
|
||||
-
|
||||
-/* Since DWARF2 is default, conditions for running dsymutil are different. */
|
||||
-#undef DSYMUTIL_SPEC
|
||||
-#define DSYMUTIL_SPEC \
|
||||
- "%{!fdump=*:%{!fsyntax-only:%{!c:%{!M:%{!MM:%{!E:%{!S:\
|
||||
- %{v} \
|
||||
- %{g*:%{!gstabs*:%{%:debug-level-gt(0): -idsym}}}\
|
||||
- %{.c|.cc|.C|.cpp|.cp|.c++|.cxx|.CPP|.m|.mm|.s|.f|.f90|.f95|.f03|.f77|.for|.F|.F90|.F95|.F03: \
|
||||
- %{g*:%{!gstabs*:%{%:debug-level-gt(0): -dsym}}}}}}}}}}}"
|
||||
-
|
||||
-/* Tell collect2 to run dsymutil for us as necessary. */
|
||||
-#define COLLECT_RUN_DSYMUTIL 1
|
||||
-
|
||||
-/* Only ask as for debug data if the debug style is stabs (since as doesn't
|
||||
- yet generate dwarf.) */
|
||||
-
|
||||
-#undef ASM_DEBUG_SPEC
|
||||
-#define ASM_DEBUG_SPEC "%{g*:%{%:debug-level-gt(0):%{gstabs:--gstabs}}}"
|
||||
-
|
||||
#undef ASM_OUTPUT_ALIGNED_COMMON
|
||||
#define ASM_OUTPUT_ALIGNED_COMMON(FILE, NAME, SIZE, ALIGN) \
|
||||
do { \
|
||||
@@ -0,0 +1,99 @@
|
||||
Backported from https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=b2cee5e1e89c8f939bc36fe9756befcb93d96982
|
||||
|
||||
diff -ur a/gcc/config/darwin.h b/gcc/config/darwin.h
|
||||
--- a/gcc/config/darwin.h 2022-05-27 03:21:10.947379000 -0400
|
||||
+++ b/gcc/config/darwin.h 2023-11-06 12:18:27.209236423 -0500
|
||||
@@ -230,12 +230,18 @@
|
||||
|
||||
#define DSYMUTIL "\ndsymutil"
|
||||
|
||||
+/* Spec that controls whether the debug linker is run automatically for
|
||||
+ a link step. This needs to be done if there is a source file on the
|
||||
+ command line which will result in a temporary object (and debug is
|
||||
+ enabled). */
|
||||
+
|
||||
#define DSYMUTIL_SPEC \
|
||||
"%{!fdump=*:%{!fsyntax-only:%{!c:%{!M:%{!MM:%{!E:%{!S:\
|
||||
%{v} \
|
||||
- %{gdwarf-2:%{!gstabs*:%{%:debug-level-gt(0): -idsym}}}\
|
||||
- %{.c|.cc|.C|.cpp|.cp|.c++|.cxx|.CPP|.m|.mm: \
|
||||
- %{gdwarf-2:%{!gstabs*:%{%:debug-level-gt(0): -dsym}}}}}}}}}}}"
|
||||
+ %{g*:%{!gstabs*:%{%:debug-level-gt(0): -idsym}}}\
|
||||
+ %{.c|.cc|.C|.cpp|.cp|.c++|.cxx|.CPP|.m|.mm|.s|.f|.f90|\
|
||||
+ .f95|.f03|.f77|.for|.F|.F90|.F95|.F03: \
|
||||
+ %{g*:%{!gstabs*:%{%:debug-level-gt(0): -dsym}}}}}}}}}}}"
|
||||
|
||||
#define LINK_COMMAND_SPEC LINK_COMMAND_SPEC_A DSYMUTIL_SPEC
|
||||
|
||||
@@ -463,21 +469,31 @@
|
||||
%{Zforce_cpusubtype_ALL:-force_cpusubtype_ALL} \
|
||||
%{static}" ASM_MMACOSX_VERSION_MIN_SPEC
|
||||
|
||||
-/* Default ASM_DEBUG_SPEC. Darwin's as cannot currently produce dwarf
|
||||
- debugging data. */
|
||||
-
|
||||
+#ifdef HAS_AS_STABS_DIRECTIVE
|
||||
+/* We only pass a debug option to the assembler if that supports stabs, since
|
||||
+ dwarf is not uniformly supported in the assemblers. */
|
||||
#define ASM_DEBUG_SPEC "%{g*:%{%:debug-level-gt(0):%{!gdwarf*:--gstabs}}}"
|
||||
+#else
|
||||
+#define ASM_DEBUG_SPEC ""
|
||||
+#endif
|
||||
+
|
||||
+#undef ASM_DEBUG_OPTION_SPEC
|
||||
+#define ASM_DEBUG_OPTION_SPEC ""
|
||||
+
|
||||
#define ASM_FINAL_SPEC \
|
||||
"%{gsplit-dwarf:%ngsplit-dwarf is not supported on this platform} %<gsplit-dwarf"
|
||||
|
||||
-/* We still allow output of STABS if the assembler supports it. */
|
||||
+/* We now require C++11 to bootstrap and newer tools than those based on
|
||||
+ stabs, so require DWARF-2, even if stabs is supported by the assembler. */
|
||||
+
|
||||
+#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
|
||||
+#define DARWIN_PREFER_DWARF
|
||||
+#define DWARF2_DEBUGGING_INFO 1
|
||||
+
|
||||
#ifdef HAVE_AS_STABS_DIRECTIVE
|
||||
#define DBX_DEBUGGING_INFO 1
|
||||
-#define PREFERRED_DEBUGGING_TYPE DBX_DEBUG
|
||||
#endif
|
||||
|
||||
-#define DWARF2_DEBUGGING_INFO 1
|
||||
-
|
||||
#define DEBUG_FRAME_SECTION "__DWARF,__debug_frame,regular,debug"
|
||||
#define DEBUG_INFO_SECTION "__DWARF,__debug_info,regular,debug"
|
||||
#define DEBUG_ABBREV_SECTION "__DWARF,__debug_abbrev,regular,debug"
|
||||
diff -ur a/gcc/config/darwin9.h b/gcc/config/darwin9.h
|
||||
--- a/gcc/config/darwin9.h 2022-05-27 03:21:10.947379000 -0400
|
||||
+++ b/gcc/config/darwin9.h 2023-11-06 12:18:48.325260590 -0500
|
||||
@@ -18,29 +18,6 @@
|
||||
along with GCC; see the file COPYING3. If not see
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
-/* Prefer DWARF2. */
|
||||
-#undef PREFERRED_DEBUGGING_TYPE
|
||||
-#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
|
||||
-#define DARWIN_PREFER_DWARF
|
||||
-
|
||||
-/* Since DWARF2 is default, conditions for running dsymutil are different. */
|
||||
-#undef DSYMUTIL_SPEC
|
||||
-#define DSYMUTIL_SPEC \
|
||||
- "%{!fdump=*:%{!fsyntax-only:%{!c:%{!M:%{!MM:%{!E:%{!S:\
|
||||
- %{v} \
|
||||
- %{g*:%{!gstabs*:%{%:debug-level-gt(0): -idsym}}}\
|
||||
- %{.c|.cc|.C|.cpp|.cp|.c++|.cxx|.CPP|.m|.mm|.s|.f|.f90|.f95|.f03|.f77|.for|.F|.F90|.F95|.F03: \
|
||||
- %{g*:%{!gstabs*:%{%:debug-level-gt(0): -dsym}}}}}}}}}}}"
|
||||
-
|
||||
-/* Tell collect2 to run dsymutil for us as necessary. */
|
||||
-#define COLLECT_RUN_DSYMUTIL 1
|
||||
-
|
||||
-/* Only ask as for debug data if the debug style is stabs (since as doesn't
|
||||
- yet generate dwarf.) */
|
||||
-
|
||||
-#undef ASM_DEBUG_SPEC
|
||||
-#define ASM_DEBUG_SPEC "%{g*:%{%:debug-level-gt(0):%{gstabs:--gstabs}}}"
|
||||
-
|
||||
#undef ASM_OUTPUT_ALIGNED_COMMON
|
||||
#define ASM_OUTPUT_ALIGNED_COMMON(FILE, NAME, SIZE, ALIGN) \
|
||||
do { \
|
||||
@@ -0,0 +1,34 @@
|
||||
From https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92061#c5
|
||||
|
||||
--- a/gcc/genconditions.c 2019-01-01 12:37:19.064943662 +0100
|
||||
+++ b/gcc/genconditions.c 2019-10-11 10:57:11.464595789 +0200
|
||||
@@ -57,8 +57,9 @@ write_header (void)
|
||||
\n\
|
||||
/* It is necessary, but not entirely safe, to include the headers below\n\
|
||||
in a generator program. As a defensive measure, don't do so when the\n\
|
||||
- table isn't going to have anything in it. */\n\
|
||||
-#if GCC_VERSION >= 3001\n\
|
||||
+ table isn't going to have anything in it.\n\
|
||||
+ Clang 9 is buggy and doesn't handle __builtin_constant_p correctly. */\n\
|
||||
+#if GCC_VERSION >= 3001 && __clang_major__ < 9\n\
|
||||
\n\
|
||||
/* Do not allow checking to confuse the issue. */\n\
|
||||
#undef CHECKING_P\n\
|
||||
@@ -170,7 +171,7 @@ struct c_test\n\
|
||||
vary at run time. It works in 3.0.1 and later; 3.0 only when not\n\
|
||||
optimizing. */\n\
|
||||
\n\
|
||||
-#if GCC_VERSION >= 3001\n\
|
||||
+#if GCC_VERSION >= 3001 && __clang_major__ < 9\n\
|
||||
static const struct c_test insn_conditions[] = {\n");
|
||||
|
||||
traverse_c_tests (write_one_condition, 0);
|
||||
@@ -191,7 +192,7 @@ write_writer (void)
|
||||
" unsigned int i;\n"
|
||||
" const char *p;\n"
|
||||
" puts (\"(define_conditions [\");\n"
|
||||
- "#if GCC_VERSION >= 3001\n"
|
||||
+ "#if GCC_VERSION >= 3001 && __clang_major__ < 9\n"
|
||||
" for (i = 0; i < ARRAY_SIZE (insn_conditions); i++)\n"
|
||||
" {\n"
|
||||
" printf (\" (%d \\\"\", insn_conditions[i].value);\n"
|
||||
@@ -178,6 +178,9 @@ in
|
||||
# https://github.com/osx-cross/homebrew-avr/issues/280#issuecomment-1272381808
|
||||
++ optional (is11 && stdenv.isDarwin && targetPlatform.isAvr) ./avr-gcc-11.3-darwin.patch
|
||||
|
||||
# libgcc’s `configure` script misdetects aarch64-darwin, resulting in an invalid deployment target.
|
||||
++ optional (is11 && stdenv.isDarwin && stdenv.isAarch64) ./11/libgcc-aarch64-darwin-detection.patch
|
||||
|
||||
# openjdk build fails without this on -march=opteron; is upstream in gcc12
|
||||
++ optionals (is11) [ ./11/gcc-issue-103910.patch ]
|
||||
|
||||
@@ -191,12 +194,19 @@ in
|
||||
sha256 = "sha256-XtykrPd5h/tsnjY1wGjzSOJ+AyyNLsfnjuOZ5Ryq9vA=";
|
||||
})
|
||||
|
||||
# Fix undefined symbol errors when building older versions with clang
|
||||
++ optional (!atLeast11 && stdenv.cc.isClang && stdenv.hostPlatform.isDarwin) ./clang-genconditions.patch
|
||||
|
||||
|
||||
## gcc 9.0 and older ##############################################################################
|
||||
|
||||
++ optional (majorVersion == "9") ./9/fix-struct-redefinition-on-glibc-2.36.patch
|
||||
++ optional (atLeast7 && !atLeast10 && targetPlatform.isNetBSD) ./libstdc++-netbsd-ctypes.patch
|
||||
|
||||
# Make Darwin bootstrap respect whether the assembler supports `--gstabs`,
|
||||
# which is not supported by the clang integrated assembler used by default on Darwin.
|
||||
++ optional (is9 && hostPlatform.isDarwin) ./9/gcc9-darwin-as-gstabs.patch
|
||||
|
||||
|
||||
## gcc 8.0 and older ##############################################################################
|
||||
|
||||
@@ -204,6 +214,10 @@ in
|
||||
++ optional (atLeast49 && !is49 && !atLeast9) ./libsanitizer-no-cyclades-9.patch
|
||||
++ optional (is7 || is8) ./9/fix-struct-redefinition-on-glibc-2.36.patch
|
||||
|
||||
# Make Darwin bootstrap respect whether the assembler supports `--gstabs`,
|
||||
# which is not supported by the clang integrated assembler used by default on Darwin.
|
||||
++ optional (is8 && hostPlatform.isDarwin) ./8/gcc8-darwin-as-gstabs.patch
|
||||
|
||||
|
||||
## gcc 7.0 and older ##############################################################################
|
||||
|
||||
@@ -240,6 +254,12 @@ in
|
||||
./6/gnat-glibc234.patch
|
||||
]
|
||||
|
||||
# The clang-based assembler used in darwin.cctools-llvm (LLVM >11) does not support piping input.
|
||||
# Fortunately, it does not exhibit the problem GCC has with the cctools assembler.
|
||||
# This patch can be dropped should darwin.cctools-llvm ever implement support.
|
||||
++ optional (!atLeast7 && hostPlatform.isDarwin && lib.versionAtLeast (lib.getVersion stdenv.cc) "12") ./4.9/darwin-clang-as.patch
|
||||
|
||||
|
||||
## gcc 4.9 and older ##############################################################################
|
||||
|
||||
++ optional (!atLeast6) ./parallel-bconfig.patch
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
{ buildPecl
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, judy
|
||||
}:
|
||||
|
||||
let
|
||||
version = "3.0.2";
|
||||
in buildPecl {
|
||||
inherit version;
|
||||
pname = "memprof";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arnaud-lb";
|
||||
repo = "php-memory-profiler";
|
||||
rev = version;
|
||||
hash = "sha256-K8YcvCobErBkaWFTkVGLXXguQPOLIgQuRGWJF+HAIRA=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
"--with-judy-dir=${judy}"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/arnaud-lb/php-memory-profiler/releases/tag/${version}";
|
||||
description = "Memory profiler for PHP. Helps finding memory leaks in PHP scripts";
|
||||
homepage = "https://github.com/arnaud-lb/php-memory-profiler";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ gaelreyrol ];
|
||||
};
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, hatch-fancy-pypi-readme
|
||||
, hatchling
|
||||
, awkward-cpp
|
||||
@@ -23,14 +23,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "awkward";
|
||||
version = "2.4.6";
|
||||
version = "2.4.9";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-MRnrPChX3a26JELh4oH5nefwoQurpvpprZXeNnz1Cwo=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "scikit-hep";
|
||||
repo = "awkward";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-8MllMKf/xp5SdtF9P1Sa6Ytml4nQ5OX7vs7ITU8mCRU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -69,7 +71,6 @@ buildPythonPackage rec {
|
||||
# The following tests have been disabled because they need to be run on a GPU platform.
|
||||
disabledTestPaths = [
|
||||
"tests-cuda"
|
||||
"tests-cuda-kernels"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -49,5 +49,7 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/borisdayma/dalle-mini";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ r-burns ];
|
||||
# incompatible with recent versions of JAX
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,27 +1,43 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, celery
|
||||
, dash-core-components
|
||||
, dash-html-components
|
||||
, dash-table
|
||||
, diskcache
|
||||
, fetchFromGitHub
|
||||
, flask
|
||||
, flask-compress
|
||||
, mock
|
||||
, multiprocess
|
||||
, plotly
|
||||
, psutil
|
||||
, pytest-mock
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
, fetchFromGitHub
|
||||
|
||||
, nodejs
|
||||
, yarn
|
||||
, fixup_yarn_lock
|
||||
, fetchYarnDeps
|
||||
|
||||
, setuptools
|
||||
, flask
|
||||
, werkzeug
|
||||
, plotly
|
||||
, dash-html-components
|
||||
, dash-core-components
|
||||
, dash-table
|
||||
, importlib-metadata
|
||||
, typing-extensions
|
||||
, requests
|
||||
, retrying
|
||||
, ansi2html
|
||||
, nest-asyncio
|
||||
|
||||
, celery
|
||||
, redis
|
||||
, diskcache
|
||||
, multiprocess
|
||||
, psutil
|
||||
, flask-compress
|
||||
|
||||
, pytestCheckHook
|
||||
, pytest-mock
|
||||
, mock
|
||||
, pyyaml
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dash";
|
||||
version = "2.13.0";
|
||||
version = "2.14.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@@ -30,16 +46,52 @@ buildPythonPackage rec {
|
||||
owner = "plotly";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+pTxEPuXtcu+ZekphqXD/k2tQ5werH/1ueGJOxA8pZw=";
|
||||
hash = "sha256-vQOfX9RCIbr5lfUyT2knwrO374/vm7jH+/1+BeqmRjI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
yarn
|
||||
fixup_yarn_lock
|
||||
];
|
||||
|
||||
yarnDeps = fetchYarnDeps {
|
||||
yarnLock = src + "/@plotly/dash-jupyterlab/yarn.lock";
|
||||
hash = "sha256-mkiyrA0jGiP0zbabSjgHFLEUX3f+LZdJ8eARI5QA8CU=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
pushd @plotly/dash-jupyterlab
|
||||
|
||||
export HOME=$(mktemp -d)
|
||||
|
||||
yarn config --offline set yarn-offline-mirror ${yarnDeps}
|
||||
fixup_yarn_lock yarn.lock
|
||||
|
||||
substituteInPlace package.json --replace jlpm yarn
|
||||
yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts
|
||||
patchShebangs .
|
||||
|
||||
# Generates the jupyterlab extension files
|
||||
yarn run build:pack
|
||||
|
||||
popd
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dash-core-components
|
||||
dash-html-components
|
||||
dash-table
|
||||
setuptools # for importing pkg_resources
|
||||
flask
|
||||
flask-compress
|
||||
werkzeug
|
||||
plotly
|
||||
dash-html-components
|
||||
dash-core-components
|
||||
dash-table
|
||||
importlib-metadata
|
||||
typing-extensions
|
||||
requests
|
||||
retrying
|
||||
ansi2html
|
||||
nest-asyncio
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
@@ -52,35 +104,31 @@ buildPythonPackage rec {
|
||||
multiprocess
|
||||
psutil
|
||||
];
|
||||
compress = [
|
||||
flask-compress
|
||||
];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
mock
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
pytest-mock
|
||||
mock
|
||||
pyyaml
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
"tests/unit/test_browser.py"
|
||||
"tests/unit/test_app_runners.py" # Use selenium
|
||||
"tests/unit/test_app_runners.py" # Uses selenium
|
||||
"tests/integration"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Failed: DID NOT RAISE <class 'ImportError'>
|
||||
"test_missing_flask_compress_raises"
|
||||
];
|
||||
pythonImportsCheck = [ "dash" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"dash"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Python framework for building analytical web applications";
|
||||
homepage = "https://dash.plot.ly/";
|
||||
changelog = "https://github.com/plotly/dash/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ antoinerg ];
|
||||
changelog = "https://github.com/plotly/dash/blob/${src.rev}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ antoinerg tomasajt ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dask-awkward";
|
||||
version = "2023.10.1";
|
||||
version = "2023.11.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "dask-contrib";
|
||||
repo = "dask-awkward";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ov5vE9O+dq0ByfSMluQl7NN0vZAcvvBX27iwoYSruSs=";
|
||||
hash = "sha256-oOIXqKwKjF6wCgRNRJ2EZn4F7sMqUKDSNQuGUpvL7sA=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dask";
|
||||
version = "2023.10.0";
|
||||
version = "2023.10.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -47,7 +47,7 @@ buildPythonPackage rec {
|
||||
owner = "dask";
|
||||
repo = "dask";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-u7KuZT0uH833zqLNBfqRLU7EcMrUmXgszevYA3Z7G1Y=";
|
||||
hash = "sha256-asD5oLd7XcZ8ZFSrsSCAKgZ3Gsqs6T77nb1qesamgUI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -114,7 +114,7 @@ buildPythonPackage rec {
|
||||
--replace "cmdclass=versioneer.get_cmdclass()," ""
|
||||
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace ', "versioneer[toml]==0.28"' "" \
|
||||
--replace ', "versioneer[toml]==0.29"' "" \
|
||||
--replace " --durations=10" "" \
|
||||
--replace " --cov-config=pyproject.toml" "" \
|
||||
--replace "\"-v" "\" "
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dbus-fast";
|
||||
version = "2.12.0";
|
||||
version = "2.13.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ZeDQn+/b6WBCodZ7Ow5IlC9XlWieAifCMJtM1yse5P8=";
|
||||
hash = "sha256-ay/NaJ/u/XG9XQ7C2dzmJKs/j1s/vDHUnaE/qDhho9Q=";
|
||||
};
|
||||
|
||||
# The project can build both an optimized cython version and an unoptimized
|
||||
|
||||
@@ -5,17 +5,21 @@
|
||||
, pythonOlder
|
||||
, aiofiles
|
||||
, aiohttp
|
||||
, backports-datetime-fromisoformat
|
||||
, click
|
||||
, click-log
|
||||
, emoji
|
||||
, glom
|
||||
, jinja2
|
||||
, pyyaml
|
||||
, freezegun
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dinghy";
|
||||
version = "1.3.0";
|
||||
format = "setuptools";
|
||||
version = "1.3.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
@@ -23,12 +27,18 @@ buildPythonPackage rec {
|
||||
owner = "nedbat";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-a1CHbPSoiR3JbuAXYPJc1EsSq13DbrOttk9zLFF9+cM=";
|
||||
hash = "sha256-0U08QHQuNm7qaxhU8sNxeN0fZ4S8N0RYRsWjFUqhZSU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiofiles
|
||||
aiohttp
|
||||
backports-datetime-fromisoformat
|
||||
click
|
||||
click-log
|
||||
emoji
|
||||
glom
|
||||
@@ -37,6 +47,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
freezegun
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ducc0";
|
||||
version = "0.31.0";
|
||||
version = "0.32.0";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.mpcdf.mpg.de";
|
||||
owner = "mtr";
|
||||
repo = "ducc";
|
||||
rev = "ducc0_${lib.replaceStrings ["."] ["_"] version}";
|
||||
hash = "sha256-4aNIq5RNo1Qqiqr2wjYB/FXKyvbARsRF1yW1ZzZlAOo=";
|
||||
hash = "sha256-D+Gt5RrzljZQHBijaPuCuNsK08VxxJoWhqxSDu4bjH0=";
|
||||
};
|
||||
|
||||
buildInputs = [ pybind11 ];
|
||||
|
||||
@@ -0,0 +1,290 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonRelaxDepsHook
|
||||
, hatchling
|
||||
, boilerpy3
|
||||
, events
|
||||
, httpx
|
||||
, jsonschema
|
||||
, lazy-imports
|
||||
, more-itertools
|
||||
, networkx
|
||||
, pandas
|
||||
, pillow
|
||||
, platformdirs
|
||||
, posthog
|
||||
, prompthub-py
|
||||
, pydantic
|
||||
, quantulum3
|
||||
, rank-bm25
|
||||
, requests
|
||||
, requests-cache
|
||||
, scikit-learn
|
||||
, sseclient-py
|
||||
, tenacity
|
||||
, tiktoken
|
||||
, tqdm
|
||||
, transformers
|
||||
, openai-whisper
|
||||
, boto3
|
||||
, botocore
|
||||
# , beir
|
||||
, selenium
|
||||
, coverage
|
||||
, dulwich
|
||||
# , jupytercontrib
|
||||
, mkdocs
|
||||
, mypy
|
||||
, pre-commit
|
||||
, psutil
|
||||
# , pydoc-markdown
|
||||
, pylint
|
||||
, pytest
|
||||
, pytest-asyncio
|
||||
, pytest-cov
|
||||
# , pytest-custom-exit-code
|
||||
, python-multipart
|
||||
, reno
|
||||
, responses
|
||||
, toml
|
||||
, tox
|
||||
, watchdog
|
||||
, elastic-transport
|
||||
, elasticsearch
|
||||
# , azure-ai-formrecognizer
|
||||
, beautifulsoup4
|
||||
, markdown
|
||||
, python-docx
|
||||
, python-frontmatter
|
||||
, python-magic
|
||||
, tika
|
||||
, black
|
||||
, huggingface-hub
|
||||
, sentence-transformers
|
||||
, mlflow
|
||||
, rapidfuzz
|
||||
, scipy
|
||||
, seqeval
|
||||
, pdf2image
|
||||
, pytesseract
|
||||
, faiss
|
||||
# , faiss-gpu
|
||||
, pinecone-client
|
||||
, onnxruntime
|
||||
, onnxruntime-tools
|
||||
# , onnxruntime-gpu
|
||||
, opensearch-py
|
||||
, pymupdf
|
||||
, langdetect
|
||||
, nltk
|
||||
, canals
|
||||
, jinja2
|
||||
, openai
|
||||
, aiorwlock
|
||||
, ray
|
||||
, psycopg2
|
||||
, sqlalchemy
|
||||
, sqlalchemy-utils
|
||||
, weaviate-client
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "farm-haystack";
|
||||
version = "1.21.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deepset-ai";
|
||||
repo = "haystack";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-h+8F1e6fFoxT4Cu0DxtXTyDd+OFXpX1+uk21/k9qcxw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
hatchling
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
pythonRemoveDeps = [
|
||||
# We call it faiss, not faiss-cpu.
|
||||
"faiss-cpu"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
boilerpy3
|
||||
events
|
||||
httpx
|
||||
jsonschema
|
||||
lazy-imports
|
||||
more-itertools
|
||||
networkx
|
||||
pandas
|
||||
pillow
|
||||
platformdirs
|
||||
posthog
|
||||
prompthub-py
|
||||
pydantic
|
||||
quantulum3
|
||||
rank-bm25
|
||||
requests
|
||||
requests-cache
|
||||
scikit-learn
|
||||
sseclient-py
|
||||
tenacity
|
||||
tiktoken
|
||||
tqdm
|
||||
transformers
|
||||
];
|
||||
|
||||
env.HOME = "$(mktemp -d)";
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
# all = [
|
||||
# farm-haystack
|
||||
# ];
|
||||
# all-gpu = [
|
||||
# farm-haystack
|
||||
# ];
|
||||
audio = [
|
||||
openai-whisper
|
||||
];
|
||||
aws = [
|
||||
boto3
|
||||
botocore
|
||||
];
|
||||
# beir = [
|
||||
# beir
|
||||
# ];
|
||||
colab = [
|
||||
pillow
|
||||
];
|
||||
crawler = [
|
||||
selenium
|
||||
];
|
||||
dev = [
|
||||
coverage
|
||||
dulwich
|
||||
# jupytercontrib
|
||||
mkdocs
|
||||
mypy
|
||||
pre-commit
|
||||
psutil
|
||||
# pydoc-markdown
|
||||
pylint
|
||||
pytest
|
||||
pytest-asyncio
|
||||
pytest-cov
|
||||
# pytest-custom-exit-code
|
||||
python-multipart
|
||||
reno
|
||||
responses
|
||||
toml
|
||||
tox
|
||||
watchdog
|
||||
];
|
||||
elasticsearch7 = [
|
||||
elastic-transport
|
||||
elasticsearch
|
||||
];
|
||||
elasticsearch8 = [
|
||||
elastic-transport
|
||||
elasticsearch
|
||||
];
|
||||
file-conversion = [
|
||||
# azure-ai-formrecognizer
|
||||
beautifulsoup4
|
||||
markdown
|
||||
python-docx
|
||||
python-frontmatter
|
||||
python-magic
|
||||
# python-magic-bin
|
||||
tika
|
||||
];
|
||||
formatting = [
|
||||
black
|
||||
];
|
||||
inference = [
|
||||
huggingface-hub
|
||||
sentence-transformers
|
||||
transformers
|
||||
];
|
||||
metrics = [
|
||||
mlflow
|
||||
rapidfuzz
|
||||
scipy
|
||||
seqeval
|
||||
];
|
||||
ocr = [
|
||||
pdf2image
|
||||
pytesseract
|
||||
];
|
||||
only-faiss = [
|
||||
faiss
|
||||
];
|
||||
# only-faiss-gpu = [
|
||||
# faiss-gpu
|
||||
# ];
|
||||
only-pinecone = [
|
||||
pinecone-client
|
||||
];
|
||||
onnx = [
|
||||
onnxruntime
|
||||
onnxruntime-tools
|
||||
];
|
||||
# onnx-gpu = [
|
||||
# onnxruntime-gpu
|
||||
# onnxruntime-tools
|
||||
# ];
|
||||
opensearch = [
|
||||
opensearch-py
|
||||
];
|
||||
pdf = [
|
||||
pymupdf
|
||||
];
|
||||
preprocessing = [
|
||||
langdetect
|
||||
nltk
|
||||
];
|
||||
preview = [
|
||||
canals
|
||||
jinja2
|
||||
lazy-imports
|
||||
openai
|
||||
pandas
|
||||
rank-bm25
|
||||
requests
|
||||
tenacity
|
||||
tqdm
|
||||
];
|
||||
ray = [
|
||||
aiorwlock
|
||||
ray
|
||||
];
|
||||
sql = [
|
||||
psycopg2
|
||||
sqlalchemy
|
||||
sqlalchemy-utils
|
||||
];
|
||||
weaviate = [
|
||||
weaviate-client
|
||||
];
|
||||
};
|
||||
|
||||
# the setup for test is intensive, hopefully can be done at some point
|
||||
doCheck = false;
|
||||
|
||||
|
||||
pythonImportsCheck = [ "haystack" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "LLM orchestration framework to build customizable, production-ready LLM applications";
|
||||
longDescription = ''
|
||||
LLM orchestration framework to build customizable, production-ready LLM applications. Connect components (models, vector DBs, file converters) to pipelines or agents that can interact with your data. With advanced retrieval methods, it's best suited for building RAG, question answering, semantic search or conversational agent chatbots
|
||||
'';
|
||||
changelog = "https://github.com/deepset-ai/haystack/releases/tag/${src.rev}";
|
||||
homepage = "https://github.com/deepset-ai/haystack";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
};
|
||||
}
|
||||
@@ -1,36 +1,43 @@
|
||||
{ buildPythonPackage
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, jaxlib
|
||||
, pythonRelaxDepsHook
|
||||
, setuptools-scm
|
||||
, cloudpickle
|
||||
, jax
|
||||
, keras
|
||||
, lib
|
||||
, matplotlib
|
||||
, msgpack
|
||||
, numpy
|
||||
, optax
|
||||
, rich
|
||||
, tensorstore
|
||||
, keras
|
||||
, pytest-xdist
|
||||
, pytestCheckHook
|
||||
, pythonRelaxDepsHook
|
||||
, tensorflow
|
||||
, tensorstore
|
||||
, fetchpatch
|
||||
, rich
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flax";
|
||||
version = "0.7.4";
|
||||
version = "0.7.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = pname;
|
||||
repo = "flax";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-i48omag/1Si3mCCGfsUD9qeejyeCLWzvvwKJqH8vm8k=";
|
||||
hash = "sha256-NDah0ayQbiO1/sTU1DDf/crPq5oLTnSuosV7cFHlTM8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ jaxlib pythonRelaxDepsHook ];
|
||||
nativeBuildInputs = [
|
||||
jaxlib
|
||||
pythonRelaxDepsHook
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cloudpickle
|
||||
jax
|
||||
matplotlib
|
||||
msgpack
|
||||
|
||||
@@ -69,9 +69,6 @@ buildPythonPackage rec {
|
||||
doCheck = false; # Upstream has no tests
|
||||
|
||||
meta = with lib; {
|
||||
# Both protobuf3 and protobuf4 in the build closure.
|
||||
# related: https://github.com/onnx/onnx/issues/5563
|
||||
broken = true;
|
||||
description = "State-of-the-art 2D and 3D Face Analysis Project";
|
||||
homepage = "https://github.com/deepinsight/insightface";
|
||||
license = licenses.mit;
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mypy-boto3-builder";
|
||||
version = "7.19.0";
|
||||
version = "7.19.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "youtype";
|
||||
repo = "mypy_boto3_builder";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Wczk1DNoOpvd7efnZFUf4FSjYqHdkMKMNwNVeQOPeEg=";
|
||||
hash = "sha256-Gz6OJ2ER60R14aTmhPfodX22FlbicUClBtlqNglTjC4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nvidia-ml-py";
|
||||
version = "12.535.108";
|
||||
version = "12.535.133";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "tar.gz";
|
||||
hash = "sha256-FB/oGHcaFl+5P3Xb5/Afdnw7r6fBP2h29TWDURsHjuE=";
|
||||
hash = "sha256-sVWa8NV90glVv1jQWv/3sWbd1ElH6zBRyZBWOHmesdw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "optimum";
|
||||
version = "1.13.3";
|
||||
version = "1.14.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -31,7 +31,7 @@ buildPythonPackage rec {
|
||||
owner = "huggingface";
|
||||
repo = "optimum";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-4bKQcltUr7q8wHfiRXQcK5dw0TrnMr9/bTNXeOyg7oA=";
|
||||
hash = "sha256-fCLMDbWfEAG7pTFKWv67fpr6lNTxRTCBkppgDZR51eY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
}:
|
||||
let
|
||||
pname = "paddle2onnx";
|
||||
version = "1.0.9";
|
||||
version = "1.1.0";
|
||||
format = "wheel";
|
||||
pyShortVersion = "cp${builtins.replaceStrings ["."] [""] python.pythonVersion}";
|
||||
src = fetchPypi {
|
||||
@@ -18,7 +18,7 @@ let
|
||||
python = pyShortVersion;
|
||||
abi = pyShortVersion;
|
||||
platform = "manylinux_2_12_x86_64.manylinux2010_x86_64";
|
||||
hash = "sha256-QnXfcbfzRt1sSagnDLP3ZRLH3KNqK76L+KvifTU6MJQ=";
|
||||
hash = "sha256-HI/lIj9ezdCry5fYDi5Pia6hvOjN6/Slm9BMfLeq8AU=";
|
||||
};
|
||||
in
|
||||
buildPythonPackage {
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
, numpy
|
||||
}:
|
||||
let
|
||||
pname = "rank_bm25";
|
||||
pname = "rank-bm25";
|
||||
version = "0.2.2";
|
||||
in
|
||||
buildPythonPackage {
|
||||
@@ -17,12 +17,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "scikit-survival";
|
||||
version = "0.21.0";
|
||||
format = "setuptools";
|
||||
version = "0.22.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-rcdEtlmD3O2BQuwxRlOJ/HOEBdWJBRJR5UR6rZoeArw=";
|
||||
hash = "sha256-Ft0Hg5iF9Sb9VSOsFMgfAvc4Nsam216kzt5Xv2iykv8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -45,6 +45,11 @@ buildPythonPackage rec {
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
# treat numpy versions as lower bounds, same as setuptools build
|
||||
postPatch = ''
|
||||
sed -i 's/numpy==/numpy>=/' pyproject.toml
|
||||
'';
|
||||
|
||||
# Hack needed to make pytest + cython work
|
||||
# https://github.com/NixOS/nixpkgs/pull/82410#issuecomment-827186298
|
||||
preCheck = ''
|
||||
@@ -63,10 +68,13 @@ buildPythonPackage rec {
|
||||
"test_pandas_inputs"
|
||||
"test_survival_svm"
|
||||
"test_tree"
|
||||
];
|
||||
] ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64)
|
||||
# floating point mismatch on aarch64
|
||||
# 27079905.88052468 to far from 27079905.880496684
|
||||
"test_coxnet"
|
||||
;
|
||||
|
||||
meta = with lib; {
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64);
|
||||
description = "Survival analysis built on top of scikit-learn";
|
||||
homepage = "https://github.com/sebp/scikit-survival";
|
||||
license = licenses.gpl3Only;
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, matplotlib
|
||||
@@ -24,6 +25,15 @@ buildPythonPackage rec {
|
||||
hash = "sha256-1CU/Iz83CKRx7dsOTGfdJm98TUfc2kxCHKIEUXP36HQ=";
|
||||
};
|
||||
|
||||
# patch dated use of private matplotlib interface
|
||||
# https://github.com/aresio/simpful/issues/22
|
||||
postPatch = ''
|
||||
substituteInPlace simpful/simpful.py \
|
||||
--replace \
|
||||
"next(ax._get_lines.prop_cycler)['color']" \
|
||||
"ax._get_lines.get_next_color()"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
scipy
|
||||
@@ -46,6 +56,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "Library for fuzzy logic";
|
||||
homepage = "https://github.com/aresio/simpful";
|
||||
changelog = "https://github.com/aresio/simpful/releases/tag/${version}";
|
||||
|
||||
@@ -41,14 +41,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "spyder";
|
||||
version = "5.4.5";
|
||||
version = "5.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-/9p/8avjy1c3Dwos9Byx03kfVrRofVQus+Ae5beFnmo=";
|
||||
hash = "sha256-zjQmUmkqwtXNnZKssNpl24p4FQscZKGiiJj5iwYl2UM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
}:
|
||||
buildGo121Module rec {
|
||||
pname = "turso-cli";
|
||||
version = "0.86.3";
|
||||
version = "0.87.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tursodatabase";
|
||||
repo = "turso-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hTqjNQSScQzCUBs4pYgxRnRvUSoQXXeZIceSZAR1Oa0=";
|
||||
hash = "sha256-wPL4fYFkk1rtHIYIVOGk5GG6S/pmOpg6WcbnpleDkUA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-EqND/W+NNatoBUMXWrsjNPfxAtX0oUASUxN6Rmhp7SQ=";
|
||||
vendorHash = "sha256-Jf2ZLzODPnvNrED8ST0u7rHGWivPwcyptkJbu8mdnoA=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
-36
@@ -1,36 +0,0 @@
|
||||
From c39637720109dd5d97750907c51e9c0fb8f43f0b Mon Sep 17 00:00:00 2001
|
||||
From: Nick Cao <nickcao@nichi.co>
|
||||
Date: Wed, 11 Oct 2023 22:51:23 -0400
|
||||
Subject: [PATCH] launcher/translations: explicitly convert QVector iterators
|
||||
to pointers
|
||||
|
||||
---
|
||||
launcher/translations/TranslationsModel.cpp | 5 ++---
|
||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/launcher/translations/TranslationsModel.cpp b/launcher/translations/TranslationsModel.cpp
|
||||
index 2763cca2..64c21dbd 100644
|
||||
--- a/launcher/translations/TranslationsModel.cpp
|
||||
+++ b/launcher/translations/TranslationsModel.cpp
|
||||
@@ -524,7 +524,7 @@ Language * TranslationsModel::findLanguage(const QString& key)
|
||||
}
|
||||
else
|
||||
{
|
||||
- return found;
|
||||
+ return &(*found);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -655,8 +655,7 @@ QModelIndex TranslationsModel::selectedIndex()
|
||||
auto found = findLanguage(d->m_selectedLanguage);
|
||||
if(found)
|
||||
{
|
||||
- // QVector iterator freely converts to pointer to contained type
|
||||
- return index(found - d->m_languages.begin(), 0, QModelIndex());
|
||||
+ return index(found - &(*d->m_languages.begin()), 0, QModelIndex());
|
||||
}
|
||||
return QModelIndex();
|
||||
}
|
||||
--
|
||||
2.42.0
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, canonicalize-jars-hook
|
||||
, cmake
|
||||
, cmark
|
||||
@@ -23,53 +22,24 @@ let
|
||||
libnbtplusplus = fetchFromGitHub {
|
||||
owner = "PrismLauncher";
|
||||
repo = "libnbtplusplus";
|
||||
rev = "2203af7eeb48c45398139b583615134efd8d407f";
|
||||
sha256 = "sha256-TvVOjkUobYJD9itQYueELJX3wmecvEdCbJ0FinW2mL4=";
|
||||
rev = "a5e8fd52b8bf4ab5d5bcc042b2a247867589985f";
|
||||
hash = "sha256-A5kTgICnx+Qdq3Fir/bKTfdTt/T1NQP2SC+nhN1ENug=";
|
||||
};
|
||||
in
|
||||
|
||||
assert lib.assertMsg (stdenv.isLinux || !gamemodeSupport) "gamemodeSupport is only available on Linux";
|
||||
|
||||
stdenv.mkDerivation
|
||||
rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "prismlauncher-unwrapped";
|
||||
version = "7.2";
|
||||
version = "8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PrismLauncher";
|
||||
repo = "PrismLauncher";
|
||||
rev = version;
|
||||
sha256 = "sha256-RArg60S91YKp1Mt97a5JNfBEOf2cmuX4pK3VAx2WfqM=";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-WBajtfj3qAMq8zd2S53CQyHiyqtvffLOHOjmOpdALAA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0001-launcher-translations-explicitly-convert-QVector-ite.patch
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# https://github.com/PrismLauncher/PrismLauncher/pull/1452
|
||||
# These patches allow us to disable the Sparkle updater and cmake bundling
|
||||
# TODO: remove these when updating to 8.0
|
||||
(fetchpatch {
|
||||
name = "disable-sparkle-when-url-is-empty.patch";
|
||||
url = "https://github.com/PrismLauncher/PrismLauncher/commit/48e50401968a72846350c6fbd76cc957b64a6b5a.patch";
|
||||
hash = "sha256-IFxp6Sj87ogQcMooV4Ql5/4B+C7oTzEk+4tlMud2OLo=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "make-install_bundle-cached.patch";
|
||||
url = "https://github.com/PrismLauncher/PrismLauncher/commit/a8498b0dab94d0ab6c9e5cf395e5003db541b749.patch";
|
||||
hash = "sha256-ji5GGUnzVut9xFXkynqf9aVR9FO/zsqIbt3P9dexJ2I=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "dont-include-sparkle-when-not-enabled.patch";
|
||||
url = "https://github.com/PrismLauncher/PrismLauncher/commit/51bfda937d47837ed426150ed6f43a60b4ca0ce1.patch";
|
||||
hash = "sha256-7hMgANOg4zRIf3F2AfLXGR3dAEBqVmKm/J5SH0G5oCk=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "introduce-internal-updater-variable.patch";
|
||||
url = "https://github.com/PrismLauncher/PrismLauncher/commit/b1aa9e584624a0732dd55fc6c459524a8abfe6ba.patch";
|
||||
hash = "sha256-mm++EfnBxz7NVtKLMb889mMq8F/OdQmzob8OmlvNlRA=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules cmake jdk17 ninja canonicalize-jars-hook ];
|
||||
buildInputs =
|
||||
[
|
||||
@@ -113,4 +83,4 @@ rec {
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ minion3665 Scrumplex getchoo ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -21,7 +21,7 @@ diff --git a/build.gradle b/build.gradle
|
||||
appName = 'Summoning Pixel Dungeon'
|
||||
appPackageName = 'com.trashboxbobylev.summoningpixeldungeon'
|
||||
|
||||
appVersionCode = 430
|
||||
appVersionCode = 432
|
||||
- appVersionName = '@version@-' + details.gitHash.substring(0, 7)
|
||||
+ appVersionName = '@version@'
|
||||
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
callPackage ./generic.nix rec {
|
||||
pname = "summoning-pixel-dungeon";
|
||||
version = "1.2.5";
|
||||
version = "1.2.5a";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TrashboxBobylev";
|
||||
repo = "Summoning-Pixel-Dungeon";
|
||||
# The GH release is named "$version-$hash", but it's actually a mutable "_latest" tag
|
||||
rev = "fc63a89a0f9bdf9cb86a750dfec65bc56d9fddcb";
|
||||
hash = "sha256-n1YR7jYJ8TQFe654aERgmOHRgaPZ82eXxu0K12/5MGw=";
|
||||
rev = "89ff59e7f42abcc88b7a1f24391f95ddc30f9d29";
|
||||
hash = "sha256-VQcWkbGe/0qyt3M5WWgTxczwC5mE3lRHbYidOwRoukI=";
|
||||
};
|
||||
|
||||
patches = [(substitute {
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
mkPulumiPackage rec {
|
||||
owner = "pulumi";
|
||||
repo = "pulumi-azure-native";
|
||||
version = "2.11.0";
|
||||
version = "2.13.0";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qz/dCQR4BV+noJj7WPGuzDNMaR7I/D01F7FfvxU8z28=";
|
||||
vendorHash = "sha256-SICms1JJk8Q10XWC69bw/RXsIPL43l1s+Aqy+cLOwRI=";
|
||||
hash = "sha256-YyJxACeXyY7hZkTbLXT/ASNWa1uv9h3cvPoItR183fU=";
|
||||
vendorHash = "sha256-20wHbNE/fenxP9wgTSzAnx6b1UYlw4i1fi6SesTs0sc=";
|
||||
cmdGen = "pulumi-gen-azure-native";
|
||||
cmdRes = "pulumi-resource-azure-native";
|
||||
extraLdflags = [
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
name = "sigtop";
|
||||
version = "0.3.1";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tbvdm";
|
||||
repo = "sigtop";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-U+S+VXRkedq2LkO9Fw/AfNS97GvFEfjD8dq/VMlBOv4=";
|
||||
sha256 = "sha256-goGvgn1QyWqipcrBvO27BjzFbp7cIPFWzWJaOpp2/1Q=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xrJ/KLM/f/HVPL4MJzRc1xDlO4e+Iu2lcPG4GnjFRBo=";
|
||||
vendorHash = "sha256-K33VZeyOFoLLo64FuYt9bxJvaESSlHEy/2O8kLxxL5U=";
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=\${out}"
|
||||
@@ -20,7 +20,7 @@ buildGoModule rec {
|
||||
meta = with lib; {
|
||||
description = "Utility to export messages, attachments and other data from Signal Desktop";
|
||||
license = licenses.isc;
|
||||
platforms = platforms.darwin;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ fricklerhandwerk ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -43,13 +43,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fastfetch";
|
||||
version = "2.2.1";
|
||||
version = "2.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastfetch-cli";
|
||||
repo = "fastfetch";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-7g2p33j97hu26xwBLrakc7/bIpYHNTC5jqCj/Fs4fKo=";
|
||||
hash = "sha256-ejyAXwVsxI16J295WHfMLMtF/kGW89l3N0qV0mH4DX0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -270,6 +270,8 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||
|
||||
meminfo = callPackage ../development/php-packages/meminfo { };
|
||||
|
||||
memprof = callPackage ../development/php-packages/memprof { };
|
||||
|
||||
mongodb = callPackage ../development/php-packages/mongodb {
|
||||
inherit (pkgs) darwin;
|
||||
};
|
||||
|
||||
@@ -3787,6 +3787,8 @@ self: super: with self; {
|
||||
|
||||
farama-notifications = callPackage ../development/python-modules/farama-notifications { };
|
||||
|
||||
farm-haystack = callPackage ../development/python-modules/farm-haystack { };
|
||||
|
||||
fastai = callPackage ../development/python-modules/fastai { };
|
||||
|
||||
fastapi = callPackage ../development/python-modules/fastapi { };
|
||||
@@ -12009,7 +12011,7 @@ self: super: with self; {
|
||||
|
||||
rangehttpserver = callPackage ../development/python-modules/rangehttpserver { };
|
||||
|
||||
rank_bm25 = callPackage ../development/python-modules/rank_bm25 { };
|
||||
rank-bm25 = callPackage ../development/python-modules/rank-bm25 { };
|
||||
|
||||
rapidfuzz = callPackage ../development/python-modules/rapidfuzz { };
|
||||
|
||||
|
||||
Reference in New Issue
Block a user