Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
35b4d53616
|
|
@ -496,6 +496,7 @@ let
|
|||
in
|
||||
filter types.shellPackage.check shells;
|
||||
|
||||
lingeringUsers = map (u: u.name) (attrValues (flip filterAttrs cfg.users (n: u: u.linger)));
|
||||
in {
|
||||
imports = [
|
||||
(mkAliasOptionModuleMD [ "users" "extraUsers" ] [ "users" "users" ])
|
||||
|
|
@ -695,24 +696,31 @@ in {
|
|||
'';
|
||||
} else ""; # keep around for backwards compatibility
|
||||
|
||||
system.activationScripts.update-lingering = let
|
||||
lingerDir = "/var/lib/systemd/linger";
|
||||
lingeringUsers = map (u: u.name) (attrValues (flip filterAttrs cfg.users (n: u: u.linger)));
|
||||
lingeringUsersFile = builtins.toFile "lingering-users"
|
||||
(concatStrings (map (s: "${s}\n")
|
||||
(sort (a: b: a < b) lingeringUsers))); # this sorting is important for `comm` to work correctly
|
||||
in stringAfter [ "users" ] ''
|
||||
if [ -e ${lingerDir} ] ; then
|
||||
systemd.services.linger-users = lib.mkIf ((builtins.length lingeringUsers) > 0) {
|
||||
wantedBy = ["multi-user.target"];
|
||||
after = ["systemd-logind.service"];
|
||||
requires = ["systemd-logind.service"];
|
||||
|
||||
script = let
|
||||
lingerDir = "/var/lib/systemd/linger";
|
||||
lingeringUsersFile = builtins.toFile "lingering-users"
|
||||
(concatStrings (map (s: "${s}\n")
|
||||
(sort (a: b: a < b) lingeringUsers))); # this sorting is important for `comm` to work correctly
|
||||
in ''
|
||||
mkdir -vp ${lingerDir}
|
||||
cd ${lingerDir}
|
||||
for user in ${lingerDir}/*; do
|
||||
if ! id "$user" >/dev/null 2>&1; then
|
||||
for user in $(ls); do
|
||||
if ! id "$user" >/dev/null; then
|
||||
echo "Removing linger for missing user $user"
|
||||
rm --force -- "$user"
|
||||
fi
|
||||
done
|
||||
ls ${lingerDir} | sort | comm -3 -1 ${lingeringUsersFile} - | xargs -r ${pkgs.systemd}/bin/loginctl disable-linger
|
||||
ls ${lingerDir} | sort | comm -3 -2 ${lingeringUsersFile} - | xargs -r ${pkgs.systemd}/bin/loginctl enable-linger
|
||||
fi
|
||||
'';
|
||||
ls | sort | comm -3 -1 ${lingeringUsersFile} - | xargs -r ${pkgs.systemd}/bin/loginctl disable-linger
|
||||
ls | sort | comm -3 -2 ${lingeringUsersFile} - | xargs -r ${pkgs.systemd}/bin/loginctl enable-linger
|
||||
'';
|
||||
|
||||
serviceConfig.Type = "oneshot";
|
||||
};
|
||||
|
||||
# Warn about user accounts with deprecated password hashing schemes
|
||||
# This does not work when the users and groups are created by
|
||||
|
|
|
|||
|
|
@ -45,6 +45,8 @@ in {
|
|||
apply = steam: steam.override (prev: {
|
||||
extraEnv = (lib.optionalAttrs (cfg.extraCompatPackages != [ ]) {
|
||||
STEAM_EXTRA_COMPAT_TOOLS_PATHS = makeSearchPathOutput "steamcompattool" "" cfg.extraCompatPackages;
|
||||
}) // (optionalAttrs cfg.extest.enable {
|
||||
LD_PRELOAD = "${pkgs.pkgsi686Linux.extest}/lib/libextest.so";
|
||||
}) // (prev.extraEnv or {});
|
||||
extraLibraries = pkgs: let
|
||||
prevLibs = if prev ? extraLibraries then prev.extraLibraries pkgs else [ ];
|
||||
|
|
@ -59,8 +61,6 @@ in {
|
|||
# use the setuid wrapped bubblewrap
|
||||
bubblewrap = "${config.security.wrapperDir}/..";
|
||||
};
|
||||
} // optionalAttrs cfg.extest.enable {
|
||||
extraEnv.LD_PRELOAD = "${pkgs.pkgsi686Linux.extest}/lib/libextest.so";
|
||||
});
|
||||
description = lib.mdDoc ''
|
||||
The Steam package to use. Additional libraries are added from the system
|
||||
|
|
|
|||
|
|
@ -902,6 +902,7 @@ in {
|
|||
systemd-sysusers-immutable = runTest ./systemd-sysusers-immutable.nix;
|
||||
systemd-timesyncd = handleTest ./systemd-timesyncd.nix {};
|
||||
systemd-timesyncd-nscd-dnssec = handleTest ./systemd-timesyncd-nscd-dnssec.nix {};
|
||||
systemd-user-linger = handleTest ./systemd-user-linger.nix {};
|
||||
systemd-user-tmpfiles-rules = handleTest ./systemd-user-tmpfiles-rules.nix {};
|
||||
systemd-misc = handleTest ./systemd-misc.nix {};
|
||||
systemd-userdbd = handleTest ./systemd-userdbd.nix {};
|
||||
|
|
|
|||
|
|
@ -28,10 +28,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||
};
|
||||
group.root.exists = true;
|
||||
kernel-param."kernel.ostype".value = "Linux";
|
||||
service.goss = {
|
||||
enabled = true;
|
||||
running = true;
|
||||
};
|
||||
user.root.exists = true;
|
||||
};
|
||||
};
|
||||
|
|
@ -46,8 +42,8 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||
with subtest("returns health status"):
|
||||
result = json.loads(machine.succeed("curl -sS http://localhost:8080/healthz"))
|
||||
|
||||
assert len(result["results"]) == 10, f".results should be an array of 10 items, was {result['results']!r}"
|
||||
assert len(result["results"]) == 8, f".results should be an array of 10 items, was {result['results']!r}"
|
||||
assert result["summary"]["failed-count"] == 0, f".summary.failed-count should be zero, was {result['summary']['failed-count']}"
|
||||
assert result["summary"]["test-count"] == 10, f".summary.test-count should be 10, was {result['summary']['test-count']}"
|
||||
assert result["summary"]["test-count"] == 8, f".summary.test-count should be 10, was {result['summary']['test-count']}"
|
||||
'';
|
||||
})
|
||||
|
|
|
|||
|
|
@ -0,0 +1,39 @@
|
|||
import ./make-test-python.nix (
|
||||
{ lib, ... }:
|
||||
{
|
||||
name = "systemd-user-linger";
|
||||
|
||||
nodes.machine =
|
||||
{ ... }:
|
||||
{
|
||||
users.users = {
|
||||
alice = {
|
||||
isNormalUser = true;
|
||||
linger = true;
|
||||
uid = 1000;
|
||||
};
|
||||
|
||||
bob = {
|
||||
isNormalUser = true;
|
||||
linger = false;
|
||||
uid = 10001;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript =
|
||||
{ ... }:
|
||||
''
|
||||
machine.wait_for_file("/var/lib/systemd/linger/alice")
|
||||
machine.succeed("systemctl status user-1000.slice")
|
||||
|
||||
machine.fail("test -e /var/lib/systemd/linger/bob")
|
||||
machine.fail("systemctl status user-1001.slice")
|
||||
|
||||
with subtest("missing users have linger purged"):
|
||||
machine.succeed("touch /var/lib/systemd/linger/missing")
|
||||
machine.systemctl("restart linger-users")
|
||||
machine.succeed("test ! -e /var/lib/systemd/linger/missing")
|
||||
'';
|
||||
}
|
||||
)
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, xxd
|
||||
|
|
@ -14,13 +15,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mamba";
|
||||
version = "2.3";
|
||||
version = "2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brummer10";
|
||||
repo = "Mamba";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Dj8yPmuEtDVgu6Gm6aEY+dgJ0dtwB8RPg9EuaVAsiIs=";
|
||||
hash = "sha256-S1+nGnB1LHIUgYves0qtWh+QXYKjtKWICpOo38b3zbY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
@ -37,8 +38,5 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.bsd0;
|
||||
maintainers = with maintainers; [ magnetophon orivej ];
|
||||
platforms = platforms.linux;
|
||||
# 2023-08-19, `-Werror=format-security` fails for xputty
|
||||
# reported as https://github.com/brummer10/libxputty/issues/12
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,12 +14,12 @@ let
|
|||
sha256Hash = "sha256-ACZCdXKEnJy7DJTW+XGOoIvDRdzP47NytUEAqV//mbU=";
|
||||
};
|
||||
betaVersion = {
|
||||
version = "2023.2.1.23"; # "Android Studio Iguana | 2023.2.1"
|
||||
sha256Hash = "sha256-G2aPgMqBHNw1DetlaBQ9o3/VfX6QEh9VQqMZ5S/VoHM=";
|
||||
version = "2023.3.1.14"; # "Android Studio Jellyfish | 2023.3.1.1 Beta 1"
|
||||
sha256Hash = "sha256-2p/WwH6yPAMwUSJ5NrWvJBZG395eS9UgApFr/CB1fUo=";
|
||||
};
|
||||
latestVersion = {
|
||||
version = "2023.3.2.1"; # "Android Studio Jellyfish | 2023.3.2 Canary 1"
|
||||
sha256Hash = "sha256-99EWGh3+3HV8yO29ANg1pwoo/1ktI2aCwKrdIqlcgVs=";
|
||||
version = "2023.3.2.2"; # "Android Studio Koala | 2023.3.2 Canary 2"
|
||||
sha256Hash = "sha256-KrCNkKFyOUE2q2b1wjvmn3E5IedAp1kFKII+70i1Wwk=";
|
||||
};
|
||||
in {
|
||||
# Attributes are named by their corresponding release channels
|
||||
|
|
|
|||
|
|
@ -22,11 +22,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "keymapp";
|
||||
version = "1.0.8";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://oryx.nyc3.cdn.digitaloceanspaces.com/keymapp/keymapp-${version}.tar.gz";
|
||||
hash = "sha256-adFQCuHkorXixn/dId/vrCcnjQ2VDDQM049UrodjFgA=";
|
||||
hash = "sha256-tbRlJ65hHPBDwoXAXf++OdcW67RcqR1x1vfhbPCo1Ls=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -29,13 +29,13 @@ let
|
|||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "organicmaps";
|
||||
version = "2024.03.05-4";
|
||||
version = "2024.03.18-5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "organicmaps";
|
||||
repo = "organicmaps";
|
||||
rev = "${version}-android";
|
||||
hash = "sha256-vPpf7pZOkVjRlFcGULcxGy4eBLZRmqcINSFiNh8DUHI=";
|
||||
hash = "sha256-KoQlS2dW0tTZSDnGKF2F0+JeqMb0Fm0brz1gVCC8xY4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
(callPackage ./generic.nix { }) {
|
||||
channel = "edge";
|
||||
version = "24.2.4";
|
||||
sha256 = "0hh2sfjvqz085hl2dpsa9zgr3dwpyc85gcbx0c7lzpjg411bxmim";
|
||||
vendorHash = "sha256-g1e1uY43fUC2srKK9erVFlJDSwWrEvq4ni0PgeCFaOg=";
|
||||
version = "24.3.4";
|
||||
sha256 = "0v9yjcy5wlkg3z9gl25s75j2irvn9jkgc542cz5w1gbc88i4b69v";
|
||||
vendorHash = "sha256-TmH3OhiSmUaKv2QPzMuzTq6wRTMu8LejE1y4Vy/tVRg=";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,11 +27,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "PortfolioPerformance";
|
||||
version = "0.68.2";
|
||||
version = "0.68.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
|
||||
hash = "sha256-h/WCfF3jK/pkN911vxPe2xzGUfVY2Xy+3yJwoqBQ5mA=";
|
||||
hash = "sha256-7EQ/gKFflElga5LDwAkjPcqNl6HNtnAzno1ZGPBybJY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "glances";
|
||||
version = "3.4.0.3";
|
||||
version = "3.4.0.5";
|
||||
disabled = isPyPy;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nicolargo";
|
||||
repo = "glances";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-TakQqyHKuiFdBL73JQzflNUMYmBINyY0flqitqoIpmg=";
|
||||
hash = "sha256-Ho4vcmTEVja7rkgLSfNkXvnpopYupRxPL1UVlnmdGCg=";
|
||||
};
|
||||
|
||||
# On Darwin this package segfaults due to mismatch of pure and impure
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "meld";
|
||||
version = "3.22.1";
|
||||
version = "3.22.2";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-bdO9MtvUNBq6djD7lTd393x3aB7qIjazZB1iKo+QaDY=";
|
||||
sha256 = "sha256-RqCnE/vNGxU7N3oeB1fIziVcmCJGdljqz72JsekjFu8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
buildLua rec {
|
||||
pname = "mpv-reload";
|
||||
|
||||
version = "unstable-2023-12-19";
|
||||
version = "unstable-2024-03-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "4e6";
|
||||
repo = pname;
|
||||
rev = "133d596f6d369f320b4595bbed1f4a157b7b9ee5";
|
||||
hash = "sha256-B+4TCmf1T7MuwtbL+hGZoN1ktI31hnO5yayMG1zW8Ng=";
|
||||
rev = "1a6a9383ba1774708fddbd976e7a9b72c3eec938";
|
||||
hash = "sha256-BshxCjec/UNGyiC0/g1Rai2NvG2qOIHXDDEUYwwdij0=";
|
||||
};
|
||||
passthru.updateScript = unstableGitUpdater {};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "amazon-ecs-agent";
|
||||
version = "1.82.0";
|
||||
version = "1.82.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "aws";
|
||||
repo = pname;
|
||||
hash = "sha256-joI2jNfH4++mpReVGO9V3Yc7cRpykc3F166WEGZ09HA=";
|
||||
hash = "sha256-WXxuFJnqWUm+XgFNdtf0WBBGa7fP8Qv7hRd4xfGeVeg=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -1,20 +1,26 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, darwin
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "csvlens";
|
||||
version = "0.7.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "YS-L";
|
||||
repo = "csvlens";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-b8SuXx1uN9lBrCoEDLeudZwylHu+f2i/PQkfHA56YlE=";
|
||||
hash = "sha256-4lKiqojBF8mqAp56eTDfJcK276IzEDLA3pORKIZpC94=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-SPUEK+8rLXBR8cdxN3qUajvN6PxbAZX2i7vYcyMzqyw=";
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
darwin.apple_sdk.frameworks.AppKit
|
||||
];
|
||||
|
||||
cargoHash = "sha256-EzM7qGor/B17N4KDTsQzgiV4pgXE2D47RZcrmKVkPu8=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command line csv viewer";
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
resholve.mkDerivation rec {
|
||||
pname = "dgoss";
|
||||
version = "0.4.2";
|
||||
version = "0.4.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goss-org";
|
||||
repo = "goss";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-FDn1OETkYIpMenk8QAAHvfNZcSzqGl5xrD0fAZPVmRM=";
|
||||
hash = "sha256-4LJD70Y6nxRWdcaPe074iP2MVUMDgoTOwWbC1JecVcI=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
@ -16,30 +16,27 @@ buildGoModule rec {
|
|||
pname = "goss";
|
||||
|
||||
# Don't forget to update dgoss to the same version.
|
||||
version = "0.4.4";
|
||||
version = "0.4.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goss-org";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-dH052t30unWmrFTZK5niXNvbg1nngzWY7mwuZr4ULbM=";
|
||||
hash = "sha256-4LJD70Y6nxRWdcaPe074iP2MVUMDgoTOwWbC1JecVcI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4fEEz/c/xIeWxIzyyjwgSn2/2FWLA2tIedK65jGgYhY=";
|
||||
vendorHash = "sha256-5/vpoJZu/swNwQQXtW6wuEVCtOq6HsbFywuipaiwHfs=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w" "-X main.version=v${version}"
|
||||
"-s"
|
||||
"-w"
|
||||
"-X main.version=v${version}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
checkFlags = [
|
||||
# Prometheus tests are skipped upstream
|
||||
# See https://github.com/goss-org/goss/blob/master/ci/go-test.sh
|
||||
"-skip" "^TestPrometheus"
|
||||
];
|
||||
|
||||
postInstall = let
|
||||
runtimeDependencies = [ bash getent ]
|
||||
++ lib.optionals stdenv.isLinux [ systemd ];
|
||||
|
|
@ -16,14 +16,14 @@
|
|||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "home-manager";
|
||||
version = "unstable-2024-03-19";
|
||||
version = "unstable-2024-03-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "home-manager-source";
|
||||
owner = "nix-community";
|
||||
repo = "home-manager";
|
||||
rev = "022464438a85450abb23d93b91aa82e0addd71fb";
|
||||
hash = "sha256-2bNMraoRB4pdw/HtxgYTFeMhEekBZeQ53/a8xkqpbZc=";
|
||||
rev = "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb";
|
||||
hash = "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,37 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "integresql";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "allaboutapps";
|
||||
repo = "integresql";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-heRa1H4ZSCZzSMCejhakBpJfnEnGQLmNFERKqMxbC04=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-8qI7mLgQB0GK2QV6tZmWU8hJX+Ax1YhEPisQbjGoJRc=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/allaboutapps/integresql/internal/config.Commit=${src.rev}"
|
||||
"-X github.com/allaboutapps/integresql/internal/config.ModuleName=github.com/allaboutapps/integresql"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/server $out/bin/integresql
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "IntegreSQL manages isolated PostgreSQL databases for your integration tests";
|
||||
homepage = "https://github.com/allaboutapps/integresql";
|
||||
changelog = "https://github.com/allaboutapps/integresql/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.marsam ];
|
||||
mainProgram = "integresql";
|
||||
};
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,31 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "markdown-oxide";
|
||||
version = "0.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Feel-ix-343";
|
||||
repo = "markdown-oxide";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RGT8Th4hXmfOyGPYQYqwUtcwz3zVU8ph3l57P5rZHr4=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"tower-lsp-0.20.0" = "sha256-QRP1LpyI52KyvVfbBG95LMpmI8St1cgf781v3oyC3S4=";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A markdown LSP server inspired by Obsidian";
|
||||
homepage = "https://github.com/Feel-ix-343/markdown-oxide";
|
||||
license = with licenses; [ cc0 ];
|
||||
maintainers = with maintainers; [ linsui ];
|
||||
mainProgram = "markdown-oxide";
|
||||
};
|
||||
}
|
||||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "nwg-hello";
|
||||
version = "0.1.7";
|
||||
version = "0.1.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nwg-piotr";
|
||||
repo = "nwg-hello";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-HDH5B15MQqJhRNCPeg4IJSeX/676AdCNhmJ7iqn8yco=";
|
||||
hash = "sha256-WNich+DsRvYS4GiLWZLWRvvWxCAlzrK9Q7aRX7dKjeQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "orchard";
|
||||
version = "0.15.1";
|
||||
version = "0.15.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cirruslabs";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-bDXb8yKaDSYw9fZ/VBvacUebRMdlI+lzIe9KFa7uVyk=";
|
||||
hash = "sha256-ccmG94OrsfQDmyBKJiPPI97uMFlnL26epsVMdAqO/1o=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,70 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, libusb1
|
||||
, pkg-config
|
||||
, installShellFiles
|
||||
, git
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ratslap";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "krayon";
|
||||
repo = "ratslap";
|
||||
rev = version;
|
||||
sha256 = "sha256-PO/79tTiO4TBtojrEtkSf5W6zuG+Ml2iJGAtYHDwHEY=";
|
||||
leaveDotGit = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
installShellFiles
|
||||
git
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libusb1
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
makeFlagsArray+=(
|
||||
"-W gitup"
|
||||
"VDIRTY="
|
||||
"MAJVER=${version}"
|
||||
"APPBRANCH=main"
|
||||
"BINNAME=${pname}"
|
||||
"MARKDOWN_GEN="
|
||||
"BUILD_DATE=$(git show -s --date=format:'%Y-%m-%d %H:%M:%S%z' --format=%cd)"
|
||||
"BUILD_MONTH=$(git show -s --date=format:'%B' --format=%cd)"
|
||||
"BUILD_YEAR=$(git show -s --date=format:'%Y' --format=%cd)"
|
||||
)
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp ratslap $out/bin
|
||||
|
||||
mv manpage.1 ${pname}.1
|
||||
installManPage ${pname}.1
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Configure G300 and G300s Logitech mice";
|
||||
longDescription = ''
|
||||
A tool to configure Logitech mice on Linux. Supports remapping
|
||||
all buttons and configuring modes, DPI settings and the LED.
|
||||
'';
|
||||
homepage = "https://github.com/krayon/ratslap";
|
||||
changelog = "https://github.com/krayon/ratslap/releases/tag/${version}";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ zebreus ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -5,16 +5,18 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rcp";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wykurz";
|
||||
repo = "rcp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-a/gjphldS17W2OWUXpo+bayqaxINVLI7B27wlicT4Ks=";
|
||||
hash = "sha256-kVO2WMwB/Lv4fCcdXaWL/Gfmenky6uMNVrUwhWU9y7A=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-i8CrS0WlqlyXmI1waYrbiSFifAn5vqRW0YeQ1Izu0XE=";
|
||||
cargoHash = "sha256-Pa8YgFAT9nue/QLhHQm6PlTJU/myK60UcND5TthMOxc=";
|
||||
|
||||
RUSTFLAGS = "--cfg tokio_unstable";
|
||||
|
||||
checkFlags = [
|
||||
# this test also sets setuid permissions on a test file (3oXXX) which doesn't work in a sandbox
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tenv";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tofuutils";
|
||||
repo = "tenv";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-yLNdBwKF6Jts661P+YZhFGNr71TG7Scb6RGvFxTLqYQ=";
|
||||
hash = "sha256-v8Llk9TpTXg8yddNfNc3yh476adokdllOPdPGQDcrMs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-GGWiP1rIDF6qxST2ZmnKNkgbS+15hxaCs1d1+UEiYgU=";
|
||||
vendorHash = "sha256-3R6UW0jCIcHY1weX8PTFU3nEKTS7VbRD0l78tycIXaE=";
|
||||
|
||||
# Tests disabled for requiring network access to release.hashicorp.com
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, cmake
|
||||
, darwin
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, openssl
|
||||
, pkg-config
|
||||
, rustPlatform
|
||||
|
|
@ -30,6 +31,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
installShellFiles
|
||||
pkg-config
|
||||
];
|
||||
|
||||
|
|
@ -48,6 +50,14 @@ rustPlatform.buildRustPackage rec {
|
|||
OPENSSL_NO_VENDOR = true;
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
export HOME=$TMPDIR
|
||||
installShellCompletion --cmd uv \
|
||||
--bash <($out/bin/uv --generate-shell-completion bash) \
|
||||
--fish <($out/bin/uv --generate-shell-completion fish) \
|
||||
--zsh <($out/bin/uv --generate-shell-completion zsh)
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,10 +1,13 @@
|
|||
{ lib
|
||||
, mkXfceDerivation
|
||||
, fetchpatch2
|
||||
, gobject-introspection
|
||||
, glib
|
||||
, gtk3
|
||||
, gtksourceview4
|
||||
, gspell
|
||||
, libxfce4ui
|
||||
, xfconf
|
||||
, enablePolkit ? true
|
||||
, polkit
|
||||
}:
|
||||
|
|
@ -17,6 +20,15 @@ mkXfceDerivation {
|
|||
|
||||
sha256 = "sha256-A4siNxbTf9ObJJg8inPuH7Lo4dckLbFljV6aPFQxRto=";
|
||||
|
||||
patches = [
|
||||
# shortcuts-plugin: Fix shortcuts-editor include
|
||||
# https://gitlab.xfce.org/apps/mousepad/-/merge_requests/131
|
||||
(fetchpatch2 {
|
||||
url = "https://gitlab.xfce.org/apps/mousepad/-/commit/d2eb43ae4d692cc4753647111eb3deebfa26abbb.patch";
|
||||
hash = "sha256-Ldn0ZVmCzqG8lOkeaazkodEMip3lTm/lJEhfsL8TyT8=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ gobject-introspection ];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -24,6 +36,8 @@ mkXfceDerivation {
|
|||
gtk3
|
||||
gtksourceview4
|
||||
gspell
|
||||
libxfce4ui # for shortcut plugin
|
||||
xfconf # required by libxfce4kbd-private-3
|
||||
] ++ lib.optionals enablePolkit [
|
||||
polkit
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
diff -urNZ a/configure.ac.in b/configure.ac.in
|
||||
--- a/configure.ac.in 2017-12-16 19:46:13.784914017 +0000
|
||||
+++ b/configure.ac.in 2017-12-16 19:46:38.612477052 +0000
|
||||
@@ -53,6 +53,7 @@
|
||||
dnl ***********************************
|
||||
dnl *** Check for required packages ***
|
||||
dnl ***********************************
|
||||
+XDT_CHECK_PACKAGE([GIO], [gio-unix-2.0], [2.32.0])
|
||||
XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.24.0])
|
||||
XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.20.0])
|
||||
XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.12.0])
|
||||
|
|
@ -1,6 +1,5 @@
|
|||
{ lib
|
||||
, mkXfceDerivation
|
||||
, automakeAddFlags
|
||||
, glib
|
||||
, gtk3
|
||||
, libxfce4ui
|
||||
|
|
@ -15,14 +14,6 @@ mkXfceDerivation {
|
|||
|
||||
sha256 = "sha256-a7St9iH+jzwq/llrMJkuqwgQrDFEjqebs/N6Lxa3dkI=";
|
||||
|
||||
patches = [ ./configure-gio.patch ];
|
||||
|
||||
nativeBuildInputs = [ automakeAddFlags ];
|
||||
|
||||
postPatch = ''
|
||||
automakeAddFlags lib/Makefile.am libdict_la_CFLAGS GIO_CFLAGS
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk3
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
automakeAddFlags() {
|
||||
local file="$1"
|
||||
local target="$2"
|
||||
local source="$3"
|
||||
|
||||
sed "/$target/a\$($source) \\\\" -i $file
|
||||
}
|
||||
|
|
@ -18,10 +18,6 @@ makeScopeWithSplicing' {
|
|||
|
||||
mkXfceDerivation = callPackage ./mkXfceDerivation.nix { };
|
||||
|
||||
automakeAddFlags = pkgs.makeSetupHook {
|
||||
name = "xfce-automake-add-flags-hook";
|
||||
} ./automakeAddFlags.sh;
|
||||
|
||||
#### CORE
|
||||
|
||||
exo = callPackage ./core/exo { };
|
||||
|
|
@ -169,6 +165,8 @@ makeScopeWithSplicing' {
|
|||
} // lib.optionalAttrs config.allowAliases {
|
||||
#### ALIASES
|
||||
|
||||
automakeAddFlags = throw "xfce.automakeAddFlags has been removed: this setup-hook is no longer used in Nixpkgs"; # added 2024-03-24
|
||||
|
||||
xinitrc = self.xfce4-session.xinitrc; # added 2019-11-04
|
||||
|
||||
thunar-bare = self.thunar.override { thunarPlugins = [ ]; }; # added 2019-11-04
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{ lib
|
||||
, mkXfceDerivation
|
||||
, automakeAddFlags
|
||||
, exo
|
||||
, gtk3
|
||||
, libcanberra
|
||||
|
|
@ -20,10 +19,6 @@ mkXfceDerivation {
|
|||
version = "0.4.8";
|
||||
sha256 = "sha256-7vcjARm0O+/hVNFzOpxcgAnqD+wRNg5/eqXLcq4t/iU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
automakeAddFlags
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace configure.ac.in --replace gio-2.0 gio-unix-2.0
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -4,12 +4,12 @@
|
|||
|
||||
let
|
||||
pname = "elixir-ls";
|
||||
version = "0.19.0";
|
||||
version = "0.20.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "elixir-lsp";
|
||||
repo = "elixir-ls";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pd/ZkDpzlheEJfX7X6fFWY4Y5B5Y2EnJMBtuNHPuUJw=";
|
||||
hash = "sha256-LVMwDoGR516rwNhhvibu7g4EsaG2O8WOb+Ja+nCQA+k=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
in
|
||||
|
|
@ -21,7 +21,7 @@ mixRelease {
|
|||
mixFodDeps = fetchMixDeps {
|
||||
pname = "mix-deps-${pname}";
|
||||
inherit src version elixir;
|
||||
hash = "sha256-yxcUljclKKVFbY6iUphnTUSqMPpsEiPcw4yUs6atU0c=";
|
||||
hash = "sha256-yq2shufOZsTyg8iBGsRrAs6bC3iAa9vtUeS96c5xJl0=";
|
||||
};
|
||||
|
||||
# elixir-ls is an umbrella app
|
||||
|
|
|
|||
|
|
@ -1,6 +1,10 @@
|
|||
{ lib, fetchFromGitHub, ocamlPackages }:
|
||||
|
||||
with ocamlPackages; buildDunePackage rec {
|
||||
let
|
||||
inherit (ocamlPackages) buildDunePackage js_of_ocaml menhir;
|
||||
in
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "eff";
|
||||
version = "5.1";
|
||||
|
||||
|
|
|
|||
|
|
@ -25,24 +25,24 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioesphomeapi";
|
||||
version = "23.1.0";
|
||||
version = "23.2.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "esphome";
|
||||
repo = pname;
|
||||
repo = "aioesphomeapi";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-1Y2hcgvn0Msx17t1sH5N8cg2wmYo6YqFWPUqUNTNN5M=";
|
||||
hash = "sha256-GFQ87Ic0xHXs8ZgmzH7kOFbDSNmtj0hx+YHKnrz/sG0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
cython_3
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
aiohappyeyeballs
|
||||
async-interrupt
|
||||
chacha20poly1305-reuseable
|
||||
|
|
|
|||
|
|
@ -2,16 +2,12 @@
|
|||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, setuptools
|
||||
, sphinx
|
||||
, hypothesis
|
||||
, py
|
||||
, pytest-xdist
|
||||
, pytestCheckHook
|
||||
, pytest-benchmark
|
||||
, sortedcollections
|
||||
, sortedcontainers
|
||||
, typing-extensions
|
||||
, pythonOlder
|
||||
, wheel
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -19,7 +15,7 @@ buildPythonPackage rec {
|
|||
version = "0.23.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jab";
|
||||
|
|
@ -28,31 +24,31 @@ buildPythonPackage rec {
|
|||
hash = "sha256-WE0YaRT4a/byvU2pzcByuf1DfMlOpYA9i0PPrKXsS+M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
sphinx
|
||||
wheel
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
hypothesis
|
||||
py
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
pytest-benchmark
|
||||
sortedcollections
|
||||
sortedcontainers
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
# Pass -c /dev/null so that pytest does not use the bundled pytest.ini, which adds
|
||||
# options to run additional integration tests that are overkill for our purposes.
|
||||
"-c"
|
||||
"/dev/null"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "bidict" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/jab/bidict";
|
||||
changelog = "https://github.com/jab/bidict/blob/v${version}/CHANGELOG.rst";
|
||||
description = "Efficient, Pythonic bidirectional map data structures and related functionality";
|
||||
homepage = "https://bidict.readthedocs.io";
|
||||
changelog = "https://bidict.readthedocs.io/changelog.html";
|
||||
description = "The bidirectional mapping library for Python.";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ jakewaksbaum ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -365,14 +365,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.34.69";
|
||||
version = "1.34.70";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-k/tPhkDNAacOnTyUOVxn+2GX9eZiPS858YNXtbmtvfw=";
|
||||
hash = "sha256-WlF4VNAeHKXYEX7NYP0Ehw9uuRAI+tZ13Wr/NinzF7U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -17,13 +17,14 @@
|
|||
, rich
|
||||
, schema
|
||||
, setuptools
|
||||
, tabulate
|
||||
, tqdm
|
||||
, tritonclient
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "clarifai";
|
||||
version = "10.1.1";
|
||||
version = "10.2.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -32,7 +33,7 @@ buildPythonPackage rec {
|
|||
owner = "Clarifai";
|
||||
repo = "clarifai-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-36XceC40cL0SywY0Mus/s8OCO0ujWqxEIKZW+fvd7lw=";
|
||||
hash = "sha256-jI85xMApeEd0Hl6h4Am5qxWoSSTWHsmb7FxUjJPmBQM=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
@ -43,12 +44,12 @@ buildPythonPackage rec {
|
|||
"opencv-python"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
pythonRelaxDepsHook
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
clarifai-grpc
|
||||
inquirerpy
|
||||
llama-index-core
|
||||
|
|
@ -60,6 +61,7 @@ buildPythonPackage rec {
|
|||
pyyaml
|
||||
rich
|
||||
schema
|
||||
tabulate
|
||||
tqdm
|
||||
tritonclient
|
||||
];
|
||||
|
|
@ -87,6 +89,7 @@ buildPythonPackage rec {
|
|||
# Tests require network access and API key
|
||||
"tests/test_app.py"
|
||||
"tests/test_data_upload.py"
|
||||
"tests/test_eval.py"
|
||||
"tests/test_model_predict.py"
|
||||
"tests/test_model_train.py"
|
||||
"tests/test_search.py"
|
||||
|
|
@ -102,10 +105,10 @@ buildPythonPackage rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Clarifai Python Utilities";
|
||||
mainProgram = "clarifai";
|
||||
homepage = "https://github.com/Clarifai/clarifai-python";
|
||||
changelog = "https://github.com/Clarifai/clarifai-python/releases/tag/${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ natsukium ];
|
||||
mainProgram = "clarifai";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "duo-client";
|
||||
version = "5.2.0";
|
||||
version = "5.3.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -21,20 +21,20 @@ buildPythonPackage rec {
|
|||
owner = "duosecurity";
|
||||
repo = "duo_client_python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-MnSAFxKgExq+e8TOwgsPAoO4GEfsc3sjPNGLxzch5f0=";
|
||||
hash = "sha256-7cifxNSBHbX7QZ52Sy1hm5xzZYcLZOkloT6q9P7TO6A=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace requirements-dev.txt \
|
||||
--replace "dlint" "" \
|
||||
--replace "flake8" ""
|
||||
--replace-fail "dlint" "" \
|
||||
--replace-fail "flake8" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
six
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, gitUpdater
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
# pyproject
|
||||
|
|
@ -27,7 +28,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "gradio-client";
|
||||
version = "0.10.1";
|
||||
version = "0.14.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -36,9 +37,9 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "gradio-app";
|
||||
repo = "gradio";
|
||||
rev = "refs/tags/gradio_client@${version}";
|
||||
rev = "refs/tags/@gradio/client@${version}";
|
||||
sparseCheckout = [ "client/python" ];
|
||||
hash = "sha256-cRsYqNMmzuybJI823lpUOmNcTdcTO8dJkp3cpjATZQU=";
|
||||
hash = "sha256-7oC/Z3YUiOFZdv/60q7PkfluV77broRkHgWiY9Vim9Y=";
|
||||
};
|
||||
prePatch = ''
|
||||
cd client/python
|
||||
|
|
@ -95,6 +96,8 @@ buildPythonPackage rec {
|
|||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
passthru.updateScript = gitUpdater { rev-prefix = "@gradio/client@"; };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.gradio.app/";
|
||||
description = "Lightweight library to use any Gradio app as an API";
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
, setuptools
|
||||
, aiofiles
|
||||
, altair
|
||||
, diffusers
|
||||
, fastapi
|
||||
, ffmpy
|
||||
, gradio-client
|
||||
|
|
@ -40,6 +41,10 @@
|
|||
, typer
|
||||
, tomlkit
|
||||
|
||||
# oauth
|
||||
, authlib
|
||||
, itsdangerous
|
||||
|
||||
# check
|
||||
, pytestCheckHook
|
||||
, boto3
|
||||
|
|
@ -57,7 +62,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "gradio";
|
||||
version = "4.20.1";
|
||||
version = "4.22.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -66,7 +71,7 @@ buildPythonPackage rec {
|
|||
# and upstream has stopped tagging releases since 3.41.0
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-nvuIpOFib09FJGfkX0TDfb2LV/eDn3EybsFp5A3lzas=";
|
||||
hash = "sha256-nhrT509xB3+R+HF6TF5AQGnfufT6iNmzjxZgcVL7fBo=";
|
||||
};
|
||||
|
||||
# fix packaging.ParserSyntaxError, which can't handle comments
|
||||
|
|
@ -98,6 +103,7 @@ buildPythonPackage rec {
|
|||
setuptools # needed for 'pkg_resources'
|
||||
aiofiles
|
||||
altair
|
||||
diffusers
|
||||
fastapi
|
||||
ffmpy
|
||||
gradio-client
|
||||
|
|
@ -123,6 +129,11 @@ buildPythonPackage rec {
|
|||
tomlkit
|
||||
] ++ typer.passthru.optional-dependencies.all;
|
||||
|
||||
passthru.optional-dependencies.oauth = [
|
||||
authlib
|
||||
itsdangerous
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
boto3
|
||||
|
|
@ -138,9 +149,11 @@ buildPythonPackage rec {
|
|||
transformers
|
||||
vega-datasets
|
||||
|
||||
# mock npm to make `shutil.which("npm")` pass
|
||||
# mock calls to `shutil.which(...)`
|
||||
(writeShellScriptBin "npm" "false")
|
||||
] ++ pydantic.passthru.optional-dependencies.email;
|
||||
]
|
||||
++ passthru.optional-dependencies.oauth
|
||||
++ pydantic.passthru.optional-dependencies.email;
|
||||
|
||||
# Add a pytest hook skipping tests that access network, marking them as "Expected fail" (xfail).
|
||||
# We additionally xfail FileNotFoundError, since the gradio devs often fail to upload test assets to pypi.
|
||||
|
|
@ -173,6 +186,9 @@ buildPythonPackage rec {
|
|||
|
||||
# fails without network
|
||||
"test_download_if_url_correct_parse"
|
||||
|
||||
# tests if pip and other tools are installed
|
||||
"test_get_executable_path"
|
||||
];
|
||||
disabledTestPaths = [
|
||||
# 100% touches network
|
||||
|
|
@ -196,19 +212,17 @@ buildPythonPackage rec {
|
|||
|
||||
# Cyclic dependencies are fun!
|
||||
# This is gradio without gradio-client and gradio-pdf
|
||||
passthru = {
|
||||
sans-reverse-dependencies = (gradio.override (old: {
|
||||
passthru.sans-reverse-dependencies = (gradio.override (old: {
|
||||
gradio-client = null;
|
||||
gradio-pdf = null;
|
||||
})).overridePythonAttrs (old: {
|
||||
pname = old.pname + "-sans-client";
|
||||
pname = old.pname + "-sans-reverse-dependencies";
|
||||
pythonRemoveDeps = (old.pythonRemoveDeps or []) ++ [ "gradio-client" ];
|
||||
doInstallCheck = false;
|
||||
doCheck = false;
|
||||
pythonImportsCheck = null;
|
||||
dontCheckRuntimeDeps = true;
|
||||
});
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.gradio.app/";
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "latexify-py";
|
||||
version = "0.4.2";
|
||||
version = "0.4.3-post1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -18,14 +18,14 @@ buildPythonPackage rec {
|
|||
owner = "google";
|
||||
repo = "latexify_py";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-bBtAtBJfpStNYWhOJoypDI9hhE4g1ZFHBU8p6S1yCgU=";
|
||||
hash = "sha256-4924pqgc+C8VDTTK5Dac6UJV0tcicVBdnkWvE1ynyvY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
dill
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-core";
|
||||
version = "0.10.20";
|
||||
version = "0.10.23";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -39,7 +39,7 @@ buildPythonPackage rec {
|
|||
owner = "run-llama";
|
||||
repo = "llama_index";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-F7k5gtmhFdn369Ws5PSJ/xTid6ONstoWPotk+DmDtLw=";
|
||||
hash = "sha256-koFdHpcMX4Qg+LLDcjHx4wYxHnrJaAqebpba0ejINzo=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/${pname}";
|
||||
|
|
|
|||
|
|
@ -1,28 +1,43 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchPypi
|
||||
, llama-index-core
|
||||
, poetry-core
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-embeddings-openai";
|
||||
|
||||
inherit (llama-index-core) version src meta;
|
||||
|
||||
version = "0.1.7";
|
||||
pyproject = true;
|
||||
|
||||
sourceRoot = "${src.name}/llama-index-integrations/embeddings/${pname}";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
nativeBuildInputs = [
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_embeddings_openai";
|
||||
inherit version;
|
||||
hash = "sha256-xxzJggaAxM7fyYRdyHuU9oUdHMzh5Ib8kSmPj6jZ8n0=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
llama-index-core
|
||||
];
|
||||
|
||||
# Tests are only available in the mono repo
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"llama_index.embeddings.openai"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "LlamaIndex Embeddings Integration for OpenAI";
|
||||
homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/readers/llama-index-readers-s3";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,28 +1,43 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchPypi
|
||||
, poetry-core
|
||||
, llama-index-core
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-indices-managed-llama-cloud";
|
||||
|
||||
inherit (llama-index-core) version src meta;
|
||||
|
||||
version = "0.1.5";
|
||||
pyproject = true;
|
||||
|
||||
sourceRoot = "${src.name}/llama-index-integrations/indices/${pname}";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
nativeBuildInputs = [
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_indices_managed_llama_cloud";
|
||||
inherit version;
|
||||
hash = "sha256-R83enwa73dUI8O/PQd5CXoUXGsLI/ail+yqJZz4cjHE=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
llama-index-core
|
||||
];
|
||||
|
||||
# Tests are only available in the mono repo
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"llama_index.indices.managed.llama_cloud"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "LlamaCloud Index and Retriever";
|
||||
homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/indices/llama-index-indices-managed-llama-cloud";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,24 +1,39 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, fetchPypi
|
||||
, llama-index-core
|
||||
, poetry-core
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-legacy";
|
||||
|
||||
inherit (llama-index-core) version src meta;
|
||||
|
||||
version = "0.9.48";
|
||||
pyproject = true;
|
||||
|
||||
sourceRoot = "${src.name}/${pname}";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
nativeBuildInputs = [
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_legacy";
|
||||
inherit version;
|
||||
hash = "sha256-gt3EaR7b9JUz1lWCwkm6IsA/6W+9PpL3dY3M7yjkODQ=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
llama-index-core
|
||||
];
|
||||
|
||||
# Tests are only available in the mono repo
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "LlamaIndex Readers Integration for files";
|
||||
homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-legacy";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,28 +1,43 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, fetchPypi
|
||||
, llama-index-core
|
||||
, poetry-core
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-llms-openai";
|
||||
|
||||
inherit (llama-index-core) version src meta;
|
||||
|
||||
version = "0.1.12";
|
||||
pyproject = true;
|
||||
|
||||
sourceRoot = "${src.name}/llama-index-integrations/llms/${pname}";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
nativeBuildInputs = [
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_llms_openai";
|
||||
inherit version;
|
||||
hash = "sha256-QAygCDlRvWaM6Lwkh1znC2NufbMosnxqUObRorCBueY=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
llama-index-core
|
||||
];
|
||||
|
||||
# Tests are only available in the mono repo
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"llama_index.llms.openai"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "LlamaIndex LLMS Integration for OpenAI";
|
||||
homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/llms/llama-index-llms-openai";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,30 +1,45 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchPypi
|
||||
, llama-index-core
|
||||
, llama-index-llms-openai
|
||||
, poetry-core
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-multi-modal-llms-openai";
|
||||
|
||||
inherit (llama-index-core) version src meta;
|
||||
|
||||
version = "0.1.4";
|
||||
pyproject = true;
|
||||
|
||||
sourceRoot = "${src.name}/llama-index-integrations/multi_modal_llms/${pname}";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
nativeBuildInputs = [
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_multi_modal_llms_openai";
|
||||
inherit version;
|
||||
hash = "sha256-al1lhMM6nRsGz1yHTGOvJgP8k7ZgveSBqMVH6HbG4sM=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
llama-index-core
|
||||
llama-index-llms-openai
|
||||
];
|
||||
|
||||
# Tests are only available in the mono repo
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"llama_index.multi_modal_llms.openai"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "LlamaIndex Multi-Modal-Llms Integration for OpenAI";
|
||||
homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/multi_modal_llms/llama-index-multi-modal-llms-openai";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,26 +1,31 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchPypi
|
||||
, llama-index-agent-openai
|
||||
, llama-index-core
|
||||
, llama-index-llms-openai
|
||||
, poetry-core
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-program-openai";
|
||||
|
||||
inherit (llama-index-core) version src meta;
|
||||
|
||||
version = "0.1.4";
|
||||
pyproject = true;
|
||||
|
||||
sourceRoot = "${src.name}/llama-index-integrations/program/${pname}";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
nativeBuildInputs = [
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_program_openai";
|
||||
inherit version;
|
||||
hash = "sha256-Vz6Zot0WrTyvOCyKso0awQ6yVxvJSB2EptiYBq1qpdQ=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
llama-index-agent-openai
|
||||
llama-index-core
|
||||
llama-index-llms-openai
|
||||
|
|
@ -29,4 +34,11 @@ buildPythonPackage rec {
|
|||
pythonImportsCheck = [
|
||||
"llama_index.program.openai"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "LlamaIndex Program Integration for OpenAI";
|
||||
homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/program/llama-index-program-openai";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,15 +25,15 @@ buildPythonPackage rec {
|
|||
poetry-core
|
||||
];
|
||||
|
||||
# Tests are only available in the mono repo
|
||||
doCheck = false;
|
||||
|
||||
dependencies = [
|
||||
llama-index-core
|
||||
llama-index-llms-openai
|
||||
llama-index-program-openai
|
||||
];
|
||||
|
||||
# Tests are only available in the mono repo
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"llama_index.question_gen.openai"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,45 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchPypi
|
||||
, llama-index-core
|
||||
, poetry-core
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-readers-database";
|
||||
version = "0.1.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_readers_database";
|
||||
inherit version;
|
||||
hash = "sha256-9hbaUioGe8KVWX1O+Bwx0aOvJtVGb4lX/SZwYNJ/Xp0=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
llama-index-core
|
||||
];
|
||||
|
||||
# Tests are only available in the mono repo
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"llama_index.readers.database"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "LlamaIndex Readers Integration for Databases";
|
||||
homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/readers/llama-index-readers-database";
|
||||
changelog = "https://github.com/run-llama/llama_index/blob/main/llama-index-integrations/readers/llama-index-readers-database/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,47 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, llama-index-core
|
||||
, llama-index-readers-file
|
||||
, poetry-core
|
||||
, pythonOlder
|
||||
, s3fs
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-readers-s3";
|
||||
version = "0.1.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_readers_s3";
|
||||
inherit version;
|
||||
hash = "sha256-FjRIo0sJGJikX4T4Esew3pBxEp7E3kK7Ds2uXDJqMzQ=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
llama-index-core
|
||||
llama-index-readers-file
|
||||
s3fs
|
||||
];
|
||||
|
||||
# Tests are only available in the mono repo
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"llama_index.readers.s3"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "LlamaIndex Readers Integration for S3";
|
||||
homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/readers/llama-index-readers-s3";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,46 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchPypi
|
||||
, llama-index-core
|
||||
, poetry-core
|
||||
, pythonOlder
|
||||
, tweepy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-readers-twitter";
|
||||
version = "0.1.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_readers_twitter";
|
||||
inherit version;
|
||||
hash = "sha256-ZPwluiPdSkwMZ3JQy/HHhR7erYhUE9BWtplkfHk+TK8=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
llama-index-core
|
||||
tweepy
|
||||
];
|
||||
|
||||
# Tests are only available in the mono repo
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"llama_index.readers.twitter"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "LlamaIndex Readers Integration for Twitter";
|
||||
homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/readers/llama-index-readers-twitter";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,43 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, llama-index-core
|
||||
, poetry-core
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-readers-txtai";
|
||||
version = "0.1.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_readers_txtai";
|
||||
inherit version;
|
||||
hash = "sha256-F1P3/ZICFDTqowpqu0AF2RIKfLTH9Phuw0O+VsHpI4U=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
llama-index-core
|
||||
];
|
||||
|
||||
# Tests are only available in the mono repo
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"llama_index.readers.txtai"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "LlamaIndex Readers Integration for txtai";
|
||||
homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/readers/llama-index-readers-txtai";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,27 +1,31 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchPypi
|
||||
, llama-index-core
|
||||
, poetry-core
|
||||
, pyowm
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-readers-weather";
|
||||
version = "0.1.4";
|
||||
|
||||
inherit (llama-index-core) src meta;
|
||||
|
||||
version = "0.1.3";
|
||||
pyproject = true;
|
||||
|
||||
sourceRoot = "${src.name}/llama-index-integrations/readers/${pname}";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
nativeBuildInputs = [
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_readers_weather";
|
||||
inherit version;
|
||||
hash = "sha256-LJy2nU9f+yZZQm9stNn9mIqOkT5lOHaMIIm1Ezf2D0Q=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
llama-index-core
|
||||
pyowm
|
||||
];
|
||||
|
|
@ -30,7 +34,17 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
# Tests are only available in the mono repo
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"llama_index.readers.weather"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "LlamaIndex Readers Integration for Weather";
|
||||
homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/readers/llama-index-readers-weather";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,41 +1,42 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, chromadb
|
||||
, fetchFromGitHub
|
||||
, fetchPypi
|
||||
, llama-index-core
|
||||
, onnxruntime
|
||||
, pythonOlder
|
||||
, poetry-core
|
||||
, pythonRelaxDepsHook
|
||||
, tokenizers
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-vector-stores-chroma";
|
||||
|
||||
inherit (llama-index-core) version src meta;
|
||||
|
||||
version = "0.1.6";
|
||||
pyproject = true;
|
||||
|
||||
sourceRoot = "${src.name}/llama-index-integrations/vector_stores/${pname}";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"onnxruntime"
|
||||
"tokenizers"
|
||||
];
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_vector_stores_chroma";
|
||||
inherit version;
|
||||
hash = "sha256-bf89ydecQDn6Rs1Sjl5Lbe1kc+XvYyQkE0SRAH2k69s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
chromadb
|
||||
llama-index-core
|
||||
onnxruntime
|
||||
tokenizers
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"llama_index.vector_stores.chroma"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "LlamaIndex Vector Store Integration for Chroma";
|
||||
homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/vector_stores/llama-index-vector-stores-chroma";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pipdeptree";
|
||||
version = "2.16.1";
|
||||
format = "pyproject";
|
||||
version = "2.16.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
|
|
@ -23,15 +23,15 @@ buildPythonPackage rec {
|
|||
owner = "tox-dev";
|
||||
repo = "pipdeptree";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-aOAFM8b0kOZT5/afZigZjJDvS2CyqghY6GATzeyySB4=";
|
||||
hash = "sha256-g0O0ndHd2ehBUmHwb0HoWgCGSsqbjmlPFOd6KrkUv2Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
hatchling
|
||||
hatch-vcs
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
pip
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "playwrightcapture";
|
||||
version = "1.23.13";
|
||||
version = "1.23.14";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
|||
owner = "Lookyloo";
|
||||
repo = "PlaywrightCapture";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-jNTVdGrUQaYHgTxz6zYTdxNQoXEfy/zshherC/gGmng=";
|
||||
hash = "sha256-ZOElXI2JSo+/wPw58WjCO7hiOUutfC2TvBFAP2DpT7I=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
@ -39,12 +39,12 @@ buildPythonPackage rec {
|
|||
"tzdata"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
beautifulsoup4
|
||||
dateparser
|
||||
playwright
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "prisma";
|
||||
version = "0.13.0";
|
||||
version = "0.13.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
owner = "RobertCraigie";
|
||||
repo = "prisma-client-py";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-j9HJZTt4VTq29Q+nynYmRWKx02GVdyA+iZzxZwspXn8=";
|
||||
hash = "sha256-7pibexiFsyrwC6rVv0CGHRbQU4G3rOXVhQW/7c/vKJA=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "riscv-config";
|
||||
version = "3.17.0";
|
||||
version = "3.17.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "riscv-software-src";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-dMs900w5sXggqxU+2W8qKrKjGpyrXhA2QEbXQeaKZTs=";
|
||||
hash = "sha256-M36xS9rBnCPHWmHvAA6qC9J21K/zIjgsqEyhApJDKrE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "tencentcloud-sdk-python";
|
||||
version = "3.0.1115";
|
||||
version = "3.0.1116";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "TencentCloud";
|
||||
repo = "tencentcloud-sdk-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-3tkkLB27R4trvS3LY0tRv0+q37SfT7S6gr9i1OWaNUU=";
|
||||
hash = "sha256-TeS5ymvVbebzGdCbQL7HEtB4J4VgnzfEsB31zwjs6aE=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
|
|
@ -1,27 +1,35 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, deprecation
|
||||
, docker
|
||||
, wrapt }:
|
||||
, wrapt
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "testcontainers";
|
||||
version = "4.0.0";
|
||||
version = "4.2.0";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "testcontainers";
|
||||
repo = "testcontainers-python";
|
||||
rev = "refs/tags/testcontainers-v${version}";
|
||||
hash = "sha256-cVVP9nGRTLC09KHalQDz7KOszjuFVVpMlee4btPNgd4=";
|
||||
hash = "sha256-vHCrfeL3fPLZQgH7nlugIlADQaBbUQKsTBFhhq7kYWQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
echo "${version}" > VERSION
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
deprecation
|
||||
docker
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "trimesh";
|
||||
version = "4.2.0";
|
||||
version = "4.2.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-uS6oVNS+JBN61SEVDwLQDoCf60SwqXV7831E2J+hb7I=";
|
||||
hash = "sha256-lyscb7YYnT4A7juT1+9CBlb4DoeE1MT46ZPhRJgCa64=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ttn-client";
|
||||
version = "0.0.3";
|
||||
version = "0.0.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "angelnu";
|
||||
repo = "thethingsnetwork_python_client";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-oHGv9huk400nPl4ytV8uxzK7eENpoBHt8uFjD2Ck67w=";
|
||||
hash = "sha256-ZLSMxFyzfPtz51fsY2wgucHzcAnSrL7VPOuW7DXTNbQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "3.2.45";
|
||||
version = "3.2.47";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = "checkov";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-mVGfWBQEWKS5WsWQUi8NdsR1bX21MbUnNDijZ/l/ksY=";
|
||||
hash = "sha256-vwkTbHhgXaGeHrAkOM8gRDJ2VgbSmqt9Ia+qdOMxkko=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, fetchFromGitHub
|
||||
, fetchYarnDeps
|
||||
, fetchurl
|
||||
, fixup_yarn_lock
|
||||
, prefetch-yarn-deps
|
||||
, git
|
||||
, lib
|
||||
, makeDesktopItem
|
||||
|
|
@ -51,11 +51,11 @@ let
|
|||
pname = "${pname}-unwrapped";
|
||||
inherit version src;
|
||||
|
||||
nativeBuildInputs = [ fixup_yarn_lock git nodejs util-linux yarn zip ];
|
||||
nativeBuildInputs = [ prefetch-yarn-deps git nodejs util-linux yarn zip ];
|
||||
|
||||
configurePhase = ''
|
||||
export HOME=$TMPDIR
|
||||
fixup_yarn_lock yarn.lock
|
||||
fixup-yarn-lock yarn.lock
|
||||
yarn config --offline set yarn-offline-mirror ${offlineCache}
|
||||
yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive
|
||||
patchShebangs node_modules
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
{ lib, fetchFromGitHub, nix-update-script, ocamlPackages }:
|
||||
|
||||
with ocamlPackages;
|
||||
let
|
||||
inherit (ocamlPackages) buildDunePackage camomile;
|
||||
in
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "headache";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,10 @@
|
|||
{ lib, fetchFromGitHub, ocamlPackages }:
|
||||
|
||||
with ocamlPackages; buildDunePackage rec {
|
||||
let
|
||||
inherit (ocamlPackages) buildDunePackage lablgtk3-sourceview3 ocp-index;
|
||||
in
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "ocaml-top";
|
||||
version = "1.2.0";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,17 @@
|
|||
{ lib, fetchFromGitHub, ocamlPackages }:
|
||||
|
||||
with ocamlPackages;
|
||||
let
|
||||
inherit (ocamlPackages)
|
||||
buildDunePackage
|
||||
cmdliner
|
||||
github
|
||||
github-unix
|
||||
lwt_ssl
|
||||
opam-core
|
||||
opam-format
|
||||
opam-state
|
||||
;
|
||||
in
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "opam-publish";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "okteto";
|
||||
version = "2.25.3";
|
||||
version = "2.25.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okteto";
|
||||
repo = "okteto";
|
||||
rev = version;
|
||||
hash = "sha256-jxt6YfYcpwOygzxMlqX+icwKFXrDljS1vmg+OpA3pWc=";
|
||||
hash = "sha256-F3tvk3vC6h8fJ2hZMKo2eQ0uUj0UsK7MEujo//wXJi0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+Adnveutg8soqK2Zwn2SNq7SEHd/Z91diHbPYHrGVrA=";
|
||||
|
|
|
|||
|
|
@ -1,14 +1,21 @@
|
|||
{ lib, stdenv, fetchFromGitHub, makeWrapper, freeglut, libGLU, libGL }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, freeglut
|
||||
, libGLU
|
||||
, libGL
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "newtonwars";
|
||||
version = "20150609";
|
||||
version = "unstable-2023-04-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Draradech";
|
||||
repo = "NewtonWars";
|
||||
rev = "98bb99a1797fd0073e0fd25ef9218468d3a9f7cb";
|
||||
sha256 = "0g63fwfcdxxlnqlagj1fb8ngm385gmv8f7p8b4r1z5cny2znxdvs";
|
||||
rev = "a32ea49f8f1d2bdb8983c28d24735696ac987617";
|
||||
hash = "sha256-qkvgQraYR+EXWUQkEvSOcbNFn2oRTjwj5U164tVto8M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,38 @@
|
|||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchurl
|
||||
, unzip
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "mousecape";
|
||||
version = "1813";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/alexzielenski/Mousecape/releases/download/${finalAttrs.version}/Mousecape_${finalAttrs.version}.zip";
|
||||
hash = "sha256-lp7HFGr1J+iQCUWVDplF8rFcTrGf+DX4baYzLsUi/9I=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/Applications
|
||||
mv Mousecape.app $out/Applications
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A cursor manager for macOS built using private, nonintrusive CoreGraphics APIs";
|
||||
homepage = "https://github.com/alexzielenski/Mousecape";
|
||||
license = with lib; licenses.free;
|
||||
maintainers = with lib; with maintainers; [ DontEatOreo ];
|
||||
platforms = with lib; platforms.darwin;
|
||||
sourceProvenance = with lib; with sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
})
|
||||
|
||||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bpftrace";
|
||||
version = "0.20.2";
|
||||
version = "0.20.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iovisor";
|
||||
repo = "bpftrace";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AndqOqwDTQIFr5vVJ8i4tarCfg9Vz2i58eB+/7OVHNE=";
|
||||
hash = "sha256-B4BxoZSPSpDWLUgcYgQEmuhVr2mX04hrFCLu04vp1so=";
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fwupd-efi";
|
||||
version = "1.4";
|
||||
version = "1.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://people.freedesktop.org/~hughsient/releases/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-J928Ck4yCVQ+q0nmnxoBTrntlfk/9R+WbzEILTt7/7w=";
|
||||
sha256 = "sha256-RdKneTGzYkFt7CY22r9O/w0doQvBzMoayYDoMv7buhI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ in {
|
|||
};
|
||||
|
||||
tomcat10 = common {
|
||||
version = "10.1.19";
|
||||
hash = "sha256-w+pp2SvPw+15Ko2AeUrNuFbxwF2KBF4XpxoliKDHULc=";
|
||||
version = "10.1.20";
|
||||
hash = "sha256-hCfFUJ8U5IKUCgFfP2DeIDQtPXLI3qmYKk1xEstxpu4=";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, tzdata, wire
|
||||
, yarn, nodejs, python3, cacert
|
||||
, jq, moreutils
|
||||
, nix-update-script, nixosTests
|
||||
, nix-update-script, nixosTests, xcbuild
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -32,13 +32,21 @@ buildGoModule rec {
|
|||
hash = "sha256-Rp2jGspbmqJFzSbiVy2/5oqQJnAdGG/T+VNBHVsHSwg=";
|
||||
};
|
||||
|
||||
# borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22
|
||||
env = lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) {
|
||||
# Fix error: no member named 'aligned_alloc' in the global namespace.
|
||||
# Occurs while building @esfx/equatable@npm:1.0.2 on x86_64-darwin
|
||||
NIX_CFLAGS_COMPILE = "-D_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION=1";
|
||||
};
|
||||
|
||||
offlineCache = stdenv.mkDerivation {
|
||||
name = "${pname}-${version}-yarn-offline-cache";
|
||||
inherit src;
|
||||
inherit src env;
|
||||
nativeBuildInputs = [
|
||||
yarn nodejs cacert
|
||||
jq moreutils python3
|
||||
];
|
||||
# @esfx/equatable@npm:1.0.2 fails to build on darwin as it requires `xcbuild`
|
||||
] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcbuild ];
|
||||
postPatch = ''
|
||||
${patchAwayGrafanaE2E}
|
||||
'';
|
||||
|
|
@ -47,7 +55,7 @@ buildGoModule rec {
|
|||
export HOME="$(mktemp -d)"
|
||||
yarn config set enableTelemetry 0
|
||||
yarn config set cacheFolder $out
|
||||
yarn config set --json supportedArchitectures.os '[ "linux" ]'
|
||||
yarn config set --json supportedArchitectures.os '[ "linux", "darwin" ]'
|
||||
yarn config set --json supportedArchitectures.cpu '["arm", "arm64", "ia32", "x64"]'
|
||||
yarn
|
||||
runHook postBuild
|
||||
|
|
@ -56,14 +64,21 @@ buildGoModule rec {
|
|||
dontInstall = true;
|
||||
dontFixup = true;
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "sha256-QdyXSPshzugkDTJoUrJlHNuhPAyR9gae5Cbk8Q8FSl4=";
|
||||
outputHash = rec {
|
||||
x86_64-linux = "sha256-3CZgs732c6Z64t2sfWjPAmMFKVTzoolv2TwrbjeRCBA=";
|
||||
aarch64-linux = x86_64-linux;
|
||||
aarch64-darwin = "sha256-NKEajOe9uDZw0MF5leiKBIRH1CHUELRho7gyCa96BO8=";
|
||||
x86_64-darwin = aarch64-darwin;
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
disallowedRequisites = [ offlineCache ];
|
||||
|
||||
vendorHash = "sha256-cNkMVLXp3hPMcW0ilOM0VlrrDX/IsZaze+/6qlTfmRs=";
|
||||
vendorHash = "sha256-puPgbgfRqbPvMVks+gyOPOTTfdClWqbOf89X0ihMLPY=";
|
||||
|
||||
nativeBuildInputs = [ wire yarn jq moreutils removeReferencesTo python3 ];
|
||||
proxyVendor = true;
|
||||
|
||||
nativeBuildInputs = [ wire yarn jq moreutils removeReferencesTo python3 ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcbuild ];
|
||||
|
||||
postPatch = ''
|
||||
${patchAwayGrafanaE2E}
|
||||
|
|
@ -137,7 +152,7 @@ buildGoModule rec {
|
|||
license = licenses.agpl3Only;
|
||||
homepage = "https://grafana.com";
|
||||
maintainers = with maintainers; [ offline fpletz willibutz globin ma27 Frostman ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
|
||||
mainProgram = "grafana-server";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
{ lib, fetchFromGitHub, buildGoModule, nixosTests, fetchpatch }:
|
||||
{ lib, fetchFromGitHub, buildGoModule, nixosTests }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "prometheus-nextcloud-exporter";
|
||||
version = "0.6.2";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xperimental";
|
||||
repo = "nextcloud-exporter";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-OiuhxawEpD29EhbzA9DYeJ1J1/uMQGgBTZR9m/5egHI=";
|
||||
sha256 = "sha256-tbzXxrAzMZyyePeI+Age31+XJFJcp+1RqoCAGCKaLmQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QlMj4ATpJATlQAsrxIHG/1vrD5E/4brsda3BoGGzDgk=";
|
||||
vendorHash = "sha256-9ABGc5uSOIjhKcnTH5WOuwg0kXhFsxOlAkatcOQy3dg=";
|
||||
|
||||
passthru.tests = { inherit (nixosTests.prometheus-exporters) nextcloud; };
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "syft";
|
||||
version = "1.0.1";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anchore";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/jfaVgavi3ncwbILJk5SCco1f2yC1R9MoFi+Bi6xohI=";
|
||||
hash = "sha256-VLCxbD9LFXH8bdc2v9RB/vlLZtg1ekDotZi1xwORdjc=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
|
|
@ -22,7 +22,7 @@ buildGoModule rec {
|
|||
};
|
||||
# hash mismatch with darwin
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-gXE75fAbWxQdTogvub9BRl7VJVVP2I3uwgDIJUmGIPQ=";
|
||||
vendorHash = "sha256-eJCXRXeYAk3VTe+RcFjjKUbKCniPKY1wPXsBpZjeCNw=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
}:
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "nbqa";
|
||||
version = "1.8.4";
|
||||
version = "1.8.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nbQA-dev";
|
||||
repo = "nbQA";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-clxIe97pWeA9IGt+650tJfxTmU+qbrL/9B2VRVIML+s=";
|
||||
hash = "sha256-vRJxpWs2i4A8gi8F4YrTlmgBSnA73KeMCrmjLNF1zpA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "katana";
|
||||
version = "1.0.5";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "katana";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-phxJhrZaJ+gw7gZWwQK0pvWWxkS4UDi77s+qgTvS/fo=";
|
||||
hash = "sha256-upqsQQlrDRRcLMAe7nI86Sc2y3hNpELEeM5Im4XfLl8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-go+6NOQOnmds7EuA5k076Qdib2CqGthH9BHOm0YYKaA=";
|
||||
vendorHash = "sha256-OehyKcO8AwQ8D+KeMg9T/0/T9wSuzdkVVfbginlQJro=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/katana"
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "automatic-timezoned";
|
||||
version = "2.0.9";
|
||||
version = "2.0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxbrunet";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-v8oPKjMG3IRZoXSw349ftcQmjk4zojgmPoLBR6x1+9E=";
|
||||
sha256 = "sha256-NAnVPTH1pRFVsEPg4NV+TLBjMEFOmmBOP90z88TGZ9s=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-M7OWLPmHwG+Vt/agkq0YqKiefXsVdmeMdXI5CkxQrwg=";
|
||||
cargoHash = "sha256-60CuoGqDSwb5YPeM+ueeU80R7F86eVS2SH2bY91yfu0=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Automatically update system timezone based on location";
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
let
|
||||
pname = "validator-nu";
|
||||
version = "22.9.29";
|
||||
version = "23.4.11-unstable-2023-12-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "validator";
|
||||
repo = "validator";
|
||||
rev = version;
|
||||
rev = "c3a401feb6555affdc891337f5a40af238f9ac2d";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-NH/OyaKGITAL2yttB1kmuKVuZuYzhVuS0Oohj1N4icI=";
|
||||
hash = "sha256-pcA3HXduzFKzoOHhor12qvzbGSSvo3k3Bpy2MvvQlCI=";
|
||||
};
|
||||
|
||||
deps = stdenvNoCC.mkDerivation {
|
||||
|
|
@ -61,7 +61,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
description = "Helps you catch problems in your HTML/CSS/SVG";
|
||||
homepage = "https://validator.github.io/validator/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ andersk ];
|
||||
maintainers = with maintainers; [ andersk ivan ];
|
||||
mainProgram = "vnu";
|
||||
sourceProvenance = with sourceTypes; [ binaryBytecode fromSource ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,74 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, writeScript
|
||||
, mupdf
|
||||
, SDL2
|
||||
, re2c
|
||||
, freetype
|
||||
, jbig2dec
|
||||
, harfbuzz
|
||||
, openjpeg
|
||||
, gumbo
|
||||
, libjpeg
|
||||
, texpresso-tectonic
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "texpresso";
|
||||
version = "0-unstable-2024-03-24";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
mupdf
|
||||
SDL2
|
||||
re2c
|
||||
freetype
|
||||
jbig2dec
|
||||
harfbuzz
|
||||
openjpeg
|
||||
gumbo
|
||||
libjpeg
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "let-def";
|
||||
repo = "texpresso";
|
||||
rev = "08d4ae8632ef0da349595310d87ac01e70f2c6ae";
|
||||
hash = "sha256-a0yBVtLfmE0oTl599FXp7A10JoiKusofLSeXigx4GvA=";
|
||||
};
|
||||
|
||||
buildFlags = [ "texpresso" ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm0755 -t "$out/bin/" "build/${pname}"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# needs to have texpresso-tonic on its path
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/texpresso \
|
||||
--prefix PATH : ${lib.makeBinPath [ texpresso-tectonic ]}
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tectonic = texpresso-tectonic;
|
||||
updateScript = writeScript "update-texpresso" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq nix-update
|
||||
|
||||
tectonic_version="$(curl -s "https://api.github.com/repos/let-def/texpresso/contents/tectonic" | jq -r '.sha')"
|
||||
nix-update --version=branch texpresso
|
||||
nix-update --version=branch=$tectonic_version texpresso.tectonic
|
||||
'';
|
||||
};
|
||||
|
||||
meta = {
|
||||
inherit (src.meta) homepage;
|
||||
description = "Live rendering and error reporting for LaTeX.";
|
||||
maintainers = with lib.maintainers; [ nickhu ];
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
{ tectonic-unwrapped, fetchFromGitHub }:
|
||||
tectonic-unwrapped.override (old: {
|
||||
rustPlatform = old.rustPlatform // {
|
||||
buildRustPackage = args: old.rustPlatform.buildRustPackage (args // {
|
||||
pname = "texpresso-tonic";
|
||||
src = fetchFromGitHub {
|
||||
owner = "let-def";
|
||||
repo = "tectonic";
|
||||
rev = "a6d47e45cd610b271a1428898c76722e26653667";
|
||||
hash = "sha256-CDky1NdSQoXpTVDQ7sJWjcx3fdsBclO9Eun/70iClcI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
cargoHash = "sha256-M4XYjBK2MN4bOrk2zTSyuixmAjZ0t6IYI/MlYWrmkIk=";
|
||||
# binary has a different name, bundled tests won't work
|
||||
doCheck = false;
|
||||
meta.mainProgram = "texpresso-tonic";
|
||||
});
|
||||
};
|
||||
})
|
||||
|
|
@ -5000,8 +5000,6 @@ with pkgs;
|
|||
|
||||
ioport = callPackage ../os-specific/linux/ioport { };
|
||||
|
||||
dgoss = callPackage ../tools/misc/dgoss { };
|
||||
|
||||
diagrams-builder = callPackage ../tools/graphics/diagrams-builder {
|
||||
inherit (haskellPackages) ghcWithPackages diagrams-builder;
|
||||
};
|
||||
|
|
@ -5533,8 +5531,6 @@ with pkgs;
|
|||
|
||||
godu = callPackage ../tools/misc/godu { };
|
||||
|
||||
goss = callPackage ../tools/misc/goss { };
|
||||
|
||||
gosu = callPackage ../tools/misc/gosu { };
|
||||
|
||||
gotify-cli = callPackage ../tools/misc/gotify-cli { };
|
||||
|
|
@ -24871,6 +24867,10 @@ with pkgs;
|
|||
|
||||
tet = callPackage ../development/tools/misc/tet { };
|
||||
|
||||
texpresso = callPackage ../tools/typesetting/tex/texpresso {
|
||||
texpresso-tectonic = callPackage ../tools/typesetting/tex/texpresso/tectonic.nix { };
|
||||
};
|
||||
|
||||
text-engine = callPackage ../development/libraries/text-engine { };
|
||||
|
||||
the-foundation = callPackage ../development/libraries/the-foundation { };
|
||||
|
|
|
|||
|
|
@ -6782,12 +6782,20 @@ self: super: with self; {
|
|||
|
||||
llama-index-question-gen-openai = callPackage ../development/python-modules/llama-index-question-gen-openai { };
|
||||
|
||||
llama-index-readers-database = callPackage ../development/python-modules/llama-index-readers-database { };
|
||||
|
||||
llama-index-readers-file = callPackage ../development/python-modules/llama-index-readers-file { };
|
||||
|
||||
llama-index-readers-json = callPackage ../development/python-modules/llama-index-readers-json { };
|
||||
|
||||
llama-index-readers-llama-parse = callPackage ../development/python-modules/llama-index-readers-llama-parse { };
|
||||
|
||||
llama-index-readers-s3 = callPackage ../development/python-modules/llama-index-readers-s3 { };
|
||||
|
||||
llama-index-readers-twitter = callPackage ../development/python-modules/llama-index-readers-twitter { };
|
||||
|
||||
llama-index-readers-txtai = callPackage ../development/python-modules/llama-index-readers-txtai { };
|
||||
|
||||
llama-index-readers-weather = callPackage ../development/python-modules/llama-index-readers-weather { };
|
||||
|
||||
llama-index-vector-stores-chroma = callPackage ../development/python-modules/llama-index-vector-stores-chroma { };
|
||||
|
|
|
|||
Loading…
Reference in New Issue