Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
d277c2e8ce
|
|
@ -4838,6 +4838,12 @@
|
|||
githubId = 4708206;
|
||||
name = "Daniel Fox Franke";
|
||||
};
|
||||
dghubble = {
|
||||
email = "dghubble@gmail.com";
|
||||
github = "dghubble";
|
||||
githubId = 2253428;
|
||||
name = "Dalton Hubble";
|
||||
};
|
||||
dgliwka = {
|
||||
email = "dawid.gliwka@gmail.com";
|
||||
github = "dgliwka";
|
||||
|
|
@ -16188,6 +16194,15 @@
|
|||
githubId = 104558;
|
||||
name = "Benjamin Saunders";
|
||||
};
|
||||
ramblurr = {
|
||||
name = "Casey Link";
|
||||
email = "nix@caseylink.com";
|
||||
github = "Ramblurr";
|
||||
githubId = 14830;
|
||||
keys = [{
|
||||
fingerprint = "978C 4D08 058B A26E B97C B518 2078 2DBC ACFA ACDA";
|
||||
}];
|
||||
};
|
||||
ramkromberg = {
|
||||
email = "ramkromberg@mail.com";
|
||||
github = "RamKromberg";
|
||||
|
|
@ -19084,6 +19099,12 @@
|
|||
githubId = 321799;
|
||||
name = "Paul Colomiets";
|
||||
};
|
||||
takac = {
|
||||
email = "cammann.tom@gmail.com";
|
||||
github = "takac";
|
||||
githubId = 1015381;
|
||||
name = "Tom Cammann";
|
||||
};
|
||||
takagiy = {
|
||||
email = "takagiy.4dev@gmail.com";
|
||||
github = "takagiy";
|
||||
|
|
|
|||
|
|
@ -146,14 +146,12 @@ default because it's not free software. You can enable it as follows:
|
|||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
```
|
||||
|
||||
Or if you have an older card, you may have to use one of the legacy
|
||||
drivers:
|
||||
If you have an older card, you may have to use one of the legacy drivers:
|
||||
|
||||
```nix
|
||||
services.xserver.videoDrivers = [ "nvidiaLegacy470" ];
|
||||
services.xserver.videoDrivers = [ "nvidiaLegacy390" ];
|
||||
services.xserver.videoDrivers = [ "nvidiaLegacy340" ];
|
||||
services.xserver.videoDrivers = [ "nvidiaLegacy304" ];
|
||||
hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.legacy_470;
|
||||
hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.legacy_390;
|
||||
hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.legacy_340;
|
||||
```
|
||||
|
||||
You may need to reboot after enabling this driver to prevent a clash
|
||||
|
|
|
|||
|
|
@ -114,6 +114,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
|||
|
||||
- [Pretix](https://pretix.eu/about/en/), an open source ticketing software for events. Available as [services.pretix]($opt-services-pretix.enable).
|
||||
|
||||
- [microsocks](https://github.com/rofl0r/microsocks), a tiny, portable SOCKS5 server with very moderate resource usage. Available as [services.microsocks]($opt-services-microsocks.enable).
|
||||
|
||||
- [Clevis](https://github.com/latchset/clevis), a pluggable framework for automated decryption, used to unlock encrypted devices in initrd. Available as [boot.initrd.clevis.enable](#opt-boot.initrd.clevis.enable).
|
||||
|
||||
- [fritz-exporter](https://github.com/pdreker/fritz_exporter), a Prometheus exporter for extracting metrics from [FRITZ!](https://avm.de/produkte/) devices. Available as [services.prometheus.exporters.fritz](#opt-services.prometheus.exporters.fritz.enable).
|
||||
|
|
|
|||
|
|
@ -396,6 +396,9 @@ in {
|
|||
modules = [nvidia_x11.bin];
|
||||
display = !offloadCfg.enable;
|
||||
deviceSection =
|
||||
''
|
||||
Option "SidebandSocketPath" "/run/nvidia-xdriver/"
|
||||
'' +
|
||||
lib.optionalString primeEnabled
|
||||
''
|
||||
BusID "${pCfg.nvidiaBusId}"
|
||||
|
|
@ -533,8 +536,14 @@ in {
|
|||
|
||||
hardware.firmware = lib.optional cfg.open nvidia_x11.firmware;
|
||||
|
||||
systemd.tmpfiles.rules =
|
||||
lib.optional (nvidia_x11.persistenced != null && config.virtualisation.docker.enableNvidia)
|
||||
systemd.tmpfiles.rules = [
|
||||
# Remove the following log message:
|
||||
# (WW) NVIDIA: Failed to bind sideband socket to
|
||||
# (WW) NVIDIA: '/var/run/nvidia-xdriver-b4f69129' Permission denied
|
||||
#
|
||||
# https://bbs.archlinux.org/viewtopic.php?pid=1909115#p1909115
|
||||
"d /run/nvidia-xdriver 0770 root users"
|
||||
] ++ lib.optional (nvidia_x11.persistenced != null && config.virtualisation.docker.enableNvidia)
|
||||
"L+ /run/nvidia-docker/extras/bin/nvidia-persistenced - - - - ${nvidia_x11.persistenced}/origBin/nvidia-persistenced";
|
||||
|
||||
boot = {
|
||||
|
|
|
|||
|
|
@ -1020,6 +1020,7 @@
|
|||
./services/networking/lxd-image-server.nix
|
||||
./services/networking/magic-wormhole-mailbox-server.nix
|
||||
./services/networking/matterbridge.nix
|
||||
./services/networking/microsocks.nix
|
||||
./services/networking/mihomo.nix
|
||||
./services/networking/minidlna.nix
|
||||
./services/networking/miniupnpd.nix
|
||||
|
|
|
|||
|
|
@ -0,0 +1,146 @@
|
|||
{ config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.services.microsocks;
|
||||
|
||||
cmd =
|
||||
if cfg.execWrapper != null
|
||||
then "${cfg.execWrapper} ${cfg.package}/bin/microsocks"
|
||||
else "${cfg.package}/bin/microsocks";
|
||||
args =
|
||||
[ "-i" cfg.ip "-p" (toString cfg.port) ]
|
||||
++ lib.optionals (cfg.authOnce) [ "-1" ]
|
||||
++ lib.optionals (cfg.disableLogging) [ "-q" ]
|
||||
++ lib.optionals (cfg.outgoingBindIp != null) [ "-b" cfg.outgoingBindIp ]
|
||||
++ lib.optionals (cfg.authUsername != null) [ "-u" cfg.authUsername ];
|
||||
in {
|
||||
options.services.microsocks = {
|
||||
enable = lib.mkEnableOption (lib.mdDoc "Tiny, portable SOCKS5 server with very moderate resource usage");
|
||||
user = lib.mkOption {
|
||||
default = "microsocks";
|
||||
description = lib.mdDoc "User microsocks runs as.";
|
||||
type = lib.types.str;
|
||||
};
|
||||
group = lib.mkOption {
|
||||
default = "microsocks";
|
||||
description = lib.mdDoc "Group microsocks runs as.";
|
||||
type = lib.types.str;
|
||||
};
|
||||
package = lib.mkPackageOption pkgs "microsocks" {};
|
||||
ip = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "127.0.0.1";
|
||||
description = lib.mdDoc ''
|
||||
IP on which microsocks should listen. Defaults to 127.0.0.1 for
|
||||
security reasons.
|
||||
'';
|
||||
};
|
||||
port = lib.mkOption {
|
||||
type = lib.types.port;
|
||||
default = 1080;
|
||||
description = lib.mdDoc "Port on which microsocks should listen.";
|
||||
};
|
||||
disableLogging = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc "If true, microsocks will not log any messages to stdout/stderr.";
|
||||
};
|
||||
authOnce = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc ''
|
||||
If true, once a specific ip address authed successfully with user/pass,
|
||||
it is added to a whitelist and may use the proxy without auth.
|
||||
'';
|
||||
};
|
||||
outgoingBindIp = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
default = null;
|
||||
description = lib.mdDoc "Specifies which ip outgoing connections are bound to";
|
||||
};
|
||||
authUsername = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
default = null;
|
||||
example = "alice";
|
||||
description = lib.mdDoc "Optional username to use for authentication.";
|
||||
};
|
||||
authPasswordFile = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
default = null;
|
||||
example = "/run/secrets/microsocks-password";
|
||||
description = lib.mdDoc "Path to a file containing the password for authentication.";
|
||||
};
|
||||
execWrapper = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
default = null;
|
||||
example = ''
|
||||
''${pkgs.mullvad-vpn}/bin/mullvad-exclude
|
||||
'';
|
||||
description = lib.mdDoc ''
|
||||
An optional command to prepend to the microsocks command (such as proxychains, or a VPN exclude command).
|
||||
'';
|
||||
};
|
||||
};
|
||||
config = lib.mkIf cfg.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion = (cfg.authUsername != null) == (cfg.authPasswordFile != null);
|
||||
message = "Need to set both authUsername and authPasswordFile for microsocks";
|
||||
}
|
||||
];
|
||||
users = {
|
||||
users = lib.mkIf (cfg.user == "microsocks") {
|
||||
microsocks = {
|
||||
group = cfg.group;
|
||||
isSystemUser = true;
|
||||
};
|
||||
};
|
||||
groups = lib.mkIf (cfg.group == "microsocks") {
|
||||
microsocks = {};
|
||||
};
|
||||
};
|
||||
systemd.services.microsocks = {
|
||||
enable = true;
|
||||
description = "a tiny socks server";
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
Restart = "on-failure";
|
||||
RestartSec = 10;
|
||||
LoadCredential = lib.optionalString (cfg.authPasswordFile != null) "MICROSOCKS_PASSWORD_FILE:${cfg.authPasswordFile}";
|
||||
MemoryDenyWriteExecute = true;
|
||||
SystemCallArchitectures = "native";
|
||||
PrivateTmp = true;
|
||||
NoNewPrivileges = true;
|
||||
ProtectSystem = "strict";
|
||||
ProtectHome = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
PrivateDevices = true;
|
||||
RestrictSUIDSGID = true;
|
||||
RestrictNamespaces = [
|
||||
"cgroup"
|
||||
"ipc"
|
||||
"pid"
|
||||
"user"
|
||||
"uts"
|
||||
];
|
||||
};
|
||||
script =
|
||||
if cfg.authPasswordFile != null
|
||||
then ''
|
||||
PASSWORD=$(cat "$CREDENTIALS_DIRECTORY/MICROSOCKS_PASSWORD_FILE")
|
||||
${cmd} ${lib.escapeShellArgs args} -P "$PASSWORD"
|
||||
''
|
||||
else ''
|
||||
${cmd} ${lib.escapeShellArgs args}
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -303,7 +303,7 @@ in
|
|||
type = types.listOf types.str;
|
||||
default = [ "modesetting" "fbdev" ];
|
||||
example = [
|
||||
"nvidia" "nvidiaLegacy390" "nvidiaLegacy340" "nvidiaLegacy304"
|
||||
"nvidia"
|
||||
"amdgpu-pro"
|
||||
];
|
||||
# TODO(@oxij): think how to easily add the rest, like those nvidia things
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
}:
|
||||
|
||||
let
|
||||
mkArgs = { pname, version, variant, rev, hash }: {
|
||||
inherit pname version variant;
|
||||
mkArgs = { pname, version, variant, patches ? _: [ ], rev, hash }: {
|
||||
inherit pname version variant patches;
|
||||
|
||||
src = {
|
||||
"mainline" = (fetchFromSavannah {
|
||||
|
|
@ -73,6 +73,27 @@ in
|
|||
variant = "mainline";
|
||||
rev = "28.2";
|
||||
hash = "sha256-4oSLcUDR0MOEt53QOiZSVU8kPJ67GwugmBxdX3F15Ag=";
|
||||
patches = fetchpatch: [
|
||||
# CVE-2022-45939
|
||||
(fetchpatch {
|
||||
url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=d48bb4874bc6cd3e69c7a15fc3c91cc141025c51";
|
||||
hash = "sha256-TiBQkexn/eb6+IqJNDqR/Rn7S7LVdHmL/21A5tGsyJs=";
|
||||
})
|
||||
|
||||
# https://lists.gnu.org/archive/html/emacs-devel/2024-03/msg00611.html
|
||||
(fetchpatch {
|
||||
url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/10_all_org-macro-eval.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6";
|
||||
hash = "sha256-OdGt4e9JGjWJPkfJhbYsmQQc6jart4BH5aIKPIbWKFs=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/11_all_untrusted-content.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6";
|
||||
hash = "sha256-wa2bsnCt5yFx0+RAFZGBPI+OoKkbrfkkMer/KBEc/wA=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/12_all_org-remote-unsafe.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6";
|
||||
hash = "sha256-b6WU1o3PfDV/6BTPfPNUFny6oERJCNsDrvflxX3Yvek=";
|
||||
})
|
||||
];
|
||||
});
|
||||
|
||||
emacs29 = import ./make-emacs.nix (mkArgs {
|
||||
|
|
|
|||
|
|
@ -1192,12 +1192,12 @@
|
|||
|
||||
sniprun =
|
||||
let
|
||||
version = "1.3.11";
|
||||
version = "1.3.12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "michaelb";
|
||||
repo = "sniprun";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-f/EifFvlHr41wP0FfkwSGVdXLyz739st/XtnsSbzNT4=";
|
||||
hash = "sha256-siM0MBugee2OVaD1alr2hKn9ngoaV3Iy9No/F3wryJs=";
|
||||
};
|
||||
sniprun-bin = rustPlatform.buildRustPackage {
|
||||
pname = "sniprun-bin";
|
||||
|
|
@ -1207,7 +1207,7 @@
|
|||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
cargoHash = "sha256-SmhfjOnw89n/ATGvmyvd5clQSucIh7ky3v9JsSjtyfI=";
|
||||
cargoHash = "sha256-Gnpv0vAU3kTtCKsV2XGlSbzYuHEqR7iDFeKj9Vhq1UQ=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "overmind";
|
||||
version = "2.4.0";
|
||||
version = "2.5.0";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
|
@ -14,10 +14,10 @@ buildGoModule rec {
|
|||
owner = "DarthSim";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cpsTytV1TbvdR7XUKkp4GPD1qyt1qnmY6qOsge01swE=";
|
||||
sha256 = "sha256-/reRiSeYf8tnSUJICMDp7K7XZCYvTDFInPJ1xFuAqRs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ndgnFBGtVFc++h+EnA37aY9+zNsO5GDrTECA4TEWPN4=";
|
||||
vendorHash = "sha256-6/S5Sf2vvCp2RpRqcJPVc9mvMuPVn4Kj9QpSIlu6YFU=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/DarthSim/overmind";
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
, fetchFromGitHub
|
||||
, meson
|
||||
, pkg-config
|
||||
, cmake
|
||||
, ninja
|
||||
, vala
|
||||
, wrapGAppsHook4
|
||||
|
|
@ -15,6 +14,7 @@
|
|||
, json-glib
|
||||
, qrencode
|
||||
, curl
|
||||
, aria2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -31,7 +31,6 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [
|
||||
meson
|
||||
pkg-config
|
||||
cmake
|
||||
ninja
|
||||
vala
|
||||
wrapGAppsHook4
|
||||
|
|
@ -53,6 +52,12 @@ stdenv.mkDerivation rec {
|
|||
--replace gtk-update-icon-cache gtk4-update-icon-cache
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix PATH : ${lib.makeBinPath [ aria2 ]}
|
||||
)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple and fast download manager";
|
||||
homepage = "https://github.com/gabutakut/gabutdm";
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildGoModule {
|
||||
pname = "gvisor";
|
||||
version = "20231113.0";
|
||||
version = "20240311.0-unstable-2024-03-25";
|
||||
|
||||
# gvisor provides a synthetic go branch (https://github.com/google/gvisor/tree/go)
|
||||
# that can be used to build gvisor without bazel.
|
||||
|
|
@ -19,11 +19,11 @@ buildGoModule {
|
|||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "gvisor";
|
||||
rev = "cdaf5c462c4040ed4cc88989e43f7d373acb9d24";
|
||||
hash = "sha256-9d2AJXoGFRCSM6900gOBxNBgL6nxXqz/pPan5EeEdsI=";
|
||||
rev = "b1e227737fd6e3bb3b11a403a1a5013bc89b3b60";
|
||||
hash = "sha256-EfXzXkoEgtEerNMacRhbITCRig+t23WlIRya0BlJZcE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QdsVELNcIVsZv2gA05YgQfMZ6hmnfN2GGqW6r+mHqbs=";
|
||||
vendorHash = "sha256-jbMXeNXzvjfJcIfHjvf8I3ePjm6KFTXJ94ia4T2hUs4=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,19 +1,39 @@
|
|||
{ stdenv, lib
|
||||
, makeWrapper, dpkg, fetchurl, autoPatchelfHook
|
||||
, curl, libkrb5, lttng-ust, libpulseaudio, gtk3, openssl_1_1, icu70, webkitgtk, librsvg, gdk-pixbuf, libsoup, glib-networking, graphicsmagick_q16, libva, libusb1, hiredis, xcbutil
|
||||
{ stdenv
|
||||
, lib
|
||||
, makeWrapper
|
||||
, dpkg
|
||||
, fetchurl
|
||||
, autoPatchelfHook
|
||||
, curl
|
||||
, libkrb5
|
||||
, lttng-ust
|
||||
, libpulseaudio
|
||||
, gtk3
|
||||
, openssl_1_1
|
||||
, icu70
|
||||
, webkitgtk
|
||||
, librsvg
|
||||
, gdk-pixbuf
|
||||
, libsoup
|
||||
, glib-networking
|
||||
, graphicsmagick_q16
|
||||
, libva
|
||||
, libusb1
|
||||
, hiredis
|
||||
, xcbutil
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "aws-workspaces";
|
||||
version = "4.6.0.4187";
|
||||
version = "4.7.0.4312";
|
||||
|
||||
src = fetchurl {
|
||||
# ref https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/focal/main/binary-amd64/Packages
|
||||
# Check new version at https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/focal/main/binary-amd64/Packages
|
||||
urls = [
|
||||
"https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/focal/main/binary-amd64/workspacesclient_${version}_amd64.deb"
|
||||
"https://archive.org/download/workspacesclient_${version}_amd64/workspacesclient_${version}_amd64.deb"
|
||||
"https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/focal/main/binary-amd64/workspacesclient_${finalAttrs.version}_amd64.deb"
|
||||
"https://archive.org/download/workspacesclient_${finalAttrs.version}_amd64/workspacesclient_${finalAttrs.version}_amd64.deb"
|
||||
];
|
||||
sha256 = "sha256-A+b79ewh4hBIf8jgK0INILFktTqRRpOgXRH0FGziV6c=";
|
||||
hash = "sha256-G0o5uFnEkiUWmkTMUHlVcidw+2x8e/KmMfVBE7oLXV8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -57,24 +77,29 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/lib
|
||||
mv $out/opt/workspacesclient/* $out/lib
|
||||
rm -rf $out/opt
|
||||
|
||||
wrapProgram $out/lib/workspacesclient \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" \
|
||||
--set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \
|
||||
--set GIO_EXTRA_MODULES "${glib-networking.out}/lib/gio/modules"
|
||||
|
||||
mv $out/lib/workspacesclient $out/bin
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Client for Amazon WorkSpaces, a managed, secure Desktop-as-a-Service (DaaS) solution";
|
||||
homepage = "https://clients.amazonworkspaces.com";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
platforms = [ "x86_64-linux" ]; # TODO Mac support
|
||||
mainProgram = "workspacesclient";
|
||||
maintainers = with maintainers; [ mausch dylanmtaylor ];
|
||||
platforms = [ "x86_64-linux" ]; # TODO Mac support
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
@ -0,0 +1,118 @@
|
|||
{
|
||||
"name": "codefresh",
|
||||
"version": "0.87.3",
|
||||
"description": "Codefresh command line utility",
|
||||
"main": "index.js",
|
||||
"preferGlobal": true,
|
||||
"scripts": {
|
||||
"generate-completion": "node ./lib/interface/cli/completion/generate",
|
||||
"test": "jest .spec.js --coverage",
|
||||
"e2e": "bash e2e/e2e.spec.sh",
|
||||
"eslint": "eslint --fix lib/logic/**",
|
||||
"pkg": "pkg . -t node16-alpine-x64,node16-macos-x64,node16-linux-x64,node16-win-x64,node16-linux-arm64 --out-path ./dist",
|
||||
"serve-docs": "yarn build-local-docs && cd temp && hugo server -D",
|
||||
"serve-docs-beta": "ALLOW_BETA_COMMANDS=true yarn build-local-docs && cd temp && hugo server -D",
|
||||
"build-local-docs": "node ./docs/index.js",
|
||||
"build-public-docs": "node ./docs/index.js && cd temp && hugo",
|
||||
"postinstall": "node run-check-version.js"
|
||||
},
|
||||
"bin": {
|
||||
"codefresh": "lib/interface/cli/codefresh"
|
||||
},
|
||||
"repository": "git+https://github.com/codefresh-io/cli.git",
|
||||
"keywords": [
|
||||
"command line"
|
||||
],
|
||||
"pkg": {
|
||||
"scripts": [
|
||||
"lib/**/*.js",
|
||||
"node_modules/codefresh-sdk/lib/**/*.js",
|
||||
"node_modules/kubernetes-client/**/*.js"
|
||||
],
|
||||
"assets": "lib/**/*.hbs"
|
||||
},
|
||||
"resolutions": {
|
||||
"websocket-extensions": "^0.1.4",
|
||||
"lodash": "^4.17.21",
|
||||
"json-schema": "^0.4.0",
|
||||
"ajv": "^6.12.6",
|
||||
"normalize-url": "^4.5.1",
|
||||
"ansi-regex": "^5.0.1",
|
||||
"y18n": "^4.0.1",
|
||||
"shelljs": "^0.8.5",
|
||||
"codefresh-sdk/swagger-client/qs": "6.9.7",
|
||||
"kubernetes-client/qs": "6.9.7",
|
||||
"**/request/qs": "6.5.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"@codefresh-io/docker-reference": "^0.0.5",
|
||||
"adm-zip": "^0.5.5",
|
||||
"ajv": "^6.12.6",
|
||||
"bluebird": "^3.5.1",
|
||||
"cf-errors": "^0.1.16",
|
||||
"chalk": "^4.1.0",
|
||||
"cli-progress": "3.10.0",
|
||||
"codefresh-sdk": "^1.12.0",
|
||||
"colors": "1.4.0",
|
||||
"columnify": "^1.6.0",
|
||||
"compare-versions": "^3.4.0",
|
||||
"copy-dir": "^0.3.0",
|
||||
"debug": "^3.1.0",
|
||||
"diff": "^3.5.0",
|
||||
"dockerode": "^2.5.7",
|
||||
"draftlog": "^1.0.12",
|
||||
"figlet": "^1.4.0",
|
||||
"filesize": "^3.5.11",
|
||||
"firebase": "git+https://github.com/codefresh-io/firebase.git#80b2ed883ff281cd67b53bd0f6a0bbd6f330fed5",
|
||||
"flat": "^4.1.1",
|
||||
"inquirer": "^7.1.0",
|
||||
"js-yaml": "^3.10.0",
|
||||
"kefir": "^3.8.1",
|
||||
"kubernetes-client": "^9.0.0",
|
||||
"lodash": "^4.17.21",
|
||||
"mkdirp": "^0.5.1",
|
||||
"moment": "^2.29.4",
|
||||
"mongodb": "^4.17.2",
|
||||
"node-forge": "^1.3.0",
|
||||
"ora": "^5.4.1",
|
||||
"prettyjson": "^1.2.5",
|
||||
"promise-retry": "^2.0.1",
|
||||
"recursive-readdir": "^2.2.3",
|
||||
"request": "^2.88.0",
|
||||
"request-promise": "^4.2.2",
|
||||
"requestretry": "^7.0.2",
|
||||
"rimraf": "^2.6.2",
|
||||
"semver": "^7.5.4",
|
||||
"tar-stream": "^2.2.0",
|
||||
"uuid": "^3.1.0",
|
||||
"yaml": "^1.10.0",
|
||||
"yargs": "^15.4.1",
|
||||
"yargs-parser": "^13.0.0",
|
||||
"zip": "^1.2.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/node-forge": "^1.0.1",
|
||||
"eslint": "^7.32.0",
|
||||
"eslint-config-airbnb-base": "^15.0.0",
|
||||
"eslint-plugin-import": "^2.25.4",
|
||||
"eslint-plugin-jest": "^27.6.3",
|
||||
"hugo-cli": "^0.5.4",
|
||||
"jest": "^29.7.0",
|
||||
"pkg": "5.5.2"
|
||||
},
|
||||
"bugs": {
|
||||
"url": "https://github.com/codefresh-io/cli/issues"
|
||||
},
|
||||
"homepage": "https://github.com/codefresh-io/cli#readme",
|
||||
"author": "Codefresh",
|
||||
"license": "ISC",
|
||||
"engines": {
|
||||
"node": ">=14.0.0"
|
||||
},
|
||||
"jest": {
|
||||
"testEnvironment": "node",
|
||||
"setupFiles": [
|
||||
"./test-setup.js"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
{ lib, mkYarnPackage, fetchFromGitHub, fetchYarnDeps, testers, codefresh }:
|
||||
|
||||
mkYarnPackage rec {
|
||||
pname = "codefresh";
|
||||
version = "0.87.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "codefresh-io";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SUwt0oWls823EeLxT4CW+LDdsjAtSxxxKkllhMJXCtM=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${src}/yarn.lock";
|
||||
hash = "sha256-tzsHbvoQ59MwE4TYdPweLaAv9r4V8oyTQyvdeyPCsHY=";
|
||||
};
|
||||
packageJSON = ./package.json;
|
||||
|
||||
doDist = false;
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = codefresh;
|
||||
# codefresh needs to read a config file, this is faked out with a subshell
|
||||
command = "codefresh --cfconfig <(echo 'contexts:') version";
|
||||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/codefresh-io/cli/releases/tag/v${version}";
|
||||
description = "Codefresh CLI tool to interact with Codefresh services.";
|
||||
homepage = "https://github.com/codefresh-io/cli";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "codefresh";
|
||||
maintainers = [ lib.maintainers.takac ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,21 +1,26 @@
|
|||
{
|
||||
"name": "@withgraphite/graphite-cli",
|
||||
"version": "1.2.3",
|
||||
"version": "1.2.8",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "@withgraphite/graphite-cli",
|
||||
"version": "1.2.3",
|
||||
"version": "1.2.8",
|
||||
"hasInstallScript": true,
|
||||
"license": "None",
|
||||
"dependencies": {
|
||||
"chalk": "^4.1.2",
|
||||
"semver": "^7.5.4",
|
||||
"ws": "^8.6.0",
|
||||
"yargs": "^17.5.1"
|
||||
},
|
||||
"bin": {
|
||||
"graphite": "graphite.js",
|
||||
"gt": "graphite.js"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=16"
|
||||
}
|
||||
},
|
||||
"node_modules/ansi-regex": {
|
||||
|
|
@ -121,6 +126,17 @@
|
|||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/lru-cache": {
|
||||
"version": "6.0.0",
|
||||
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
|
||||
"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
|
||||
"dependencies": {
|
||||
"yallist": "^4.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=10"
|
||||
}
|
||||
},
|
||||
"node_modules/require-directory": {
|
||||
"version": "2.1.1",
|
||||
"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
|
||||
|
|
@ -129,6 +145,20 @@
|
|||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/semver": {
|
||||
"version": "7.6.0",
|
||||
"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
|
||||
"integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
|
||||
"dependencies": {
|
||||
"lru-cache": "^6.0.0"
|
||||
},
|
||||
"bin": {
|
||||
"semver": "bin/semver.js"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=10"
|
||||
}
|
||||
},
|
||||
"node_modules/string-width": {
|
||||
"version": "4.2.3",
|
||||
"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
|
||||
|
|
@ -208,6 +238,11 @@
|
|||
"node": ">=10"
|
||||
}
|
||||
},
|
||||
"node_modules/yallist": {
|
||||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
|
||||
"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
|
||||
},
|
||||
"node_modules/yargs": {
|
||||
"version": "17.7.2",
|
||||
"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "graphite-cli";
|
||||
version = "1.2.3";
|
||||
version = "1.2.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-${version}.tgz";
|
||||
hash = "sha256-T18D4JkH9B0BcJt5rgfKJsiTRhgNBBu70l6MDtPMoHQ=";
|
||||
hash = "sha256-fDnCQVHsdP5xXfMrbndha3sl96W4F3Z4gEGq7g9p9w0=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-AouEmq4wCzDxk34cjRv2vL+Me+LgeSH8S/sAAvw0Fks=";
|
||||
npmDepsHash = "sha256-qzU+wG2ESkDxok55RE37LtbsnPZWEwJcTGnkOkRdRS0=";
|
||||
|
||||
postPatch = ''
|
||||
ln -s ${./package-lock.json} package-lock.json
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ sed -i 's#hash = "[^"]*"#hash = "'"$src_hash"'"#' package.nix
|
|||
rm -f package-lock.json package.json *.tgz
|
||||
wget "$url"
|
||||
tar xf "$tarball" --strip-components=1 package/package.json
|
||||
npm i --package-lock-only
|
||||
npm i --package-lock-only --ignore-scripts
|
||||
npm_hash=$(prefetch-npm-deps package-lock.json)
|
||||
sed -i 's#npmDepsHash = "[^"]*"#npmDepsHash = "'"$npm_hash"'"#' package.nix
|
||||
rm -f package.json *.tgz
|
||||
|
|
|
|||
|
|
@ -41,13 +41,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "icewm";
|
||||
version = "3.4.6";
|
||||
version = "3.4.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ice-wm";
|
||||
repo = "icewm";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-j4o4/Q+WWuVPZM/rij2miC7ApWrBNhzve2TAPEXIU20=";
|
||||
hash = "sha256-p7qbmR8NcE8mgmlTtkHxVRo4DDUHPMiAUhdF3zm9IEc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,43 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "matchbox-server";
|
||||
version = "v0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "poseidon";
|
||||
repo = "matchbox";
|
||||
rev = "${version}";
|
||||
hash = "sha256-u1VY+zEx2YToz+WxVFaUDzY7HM9OeokbR/FmzcR3UJ8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-sVC4xeQIcqAbKU4MOAtNicHcioYjdsleQwKWLstnjfk=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/matchbox"
|
||||
];
|
||||
|
||||
# Go linker flags (go tool link)
|
||||
# Omit symbol tables and debug info
|
||||
ldflags = [
|
||||
"-w -s -X github.com/poseidon/matchbox/matchbox/version.Version=${version}"
|
||||
];
|
||||
|
||||
# Disable cgo to produce a static binary
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
# Don't run Go tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Server to network boot and provision Fedora CoreOS and Flatcar Linux clusters";
|
||||
homepage = "https://matchbox.psdn.io/";
|
||||
changelog = "https://github.com/poseidon/matchbox/blob/main/CHANGES.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ dghubble ];
|
||||
mainProgram = "matchbox";
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
{ stdenv,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "microsocks";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rofl0r";
|
||||
repo = "microsocks";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cB2XMWjoZ1zLAmAfl/nqjdOyBDKZ+xtlEmqsZxjnFn0=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm 755 microsocks -t $out/bin/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/rofl0r/microsocks/releases/tag/v${version}";
|
||||
description = "Tiny, portable SOCKS5 server with very moderate resource usage";
|
||||
homepage = "https://github.com/rofl0r/microsocks";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "microsocks";
|
||||
maintainers = with lib.maintainers; [ ramblurr ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, flex
|
||||
, bison
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "myanon";
|
||||
version = "0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ppomes";
|
||||
repo = "myanon";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-tTGr8bTxZc75GYhpJ0uzpkPtMB3r/DXRMNqSlG+1eaA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook flex bison ];
|
||||
|
||||
meta = {
|
||||
description = "Myanon is a mysqldump anonymizer, reading a dump from stdin, and producing on the fly an anonymized version to stdout";
|
||||
homepage = "https://ppomes.github.io/myanon/";
|
||||
license = lib.licenses.bsd3;
|
||||
mainProgram = "myanon";
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
||||
|
|
@ -5,22 +5,25 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "oterm";
|
||||
version = "0.1.22";
|
||||
version = "0.2.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggozad";
|
||||
repo = "oterm";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-hRbPlRuwM3NspTNd3mPhVxPJl8zA9qyFwDGNKH3Slag=";
|
||||
hash = "sha256-p0ns+8qmcyX4gcg0CfYdDMn1Ie0atVBuQbVQoDRQ9+c=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"aiosqlite"
|
||||
"pillow"
|
||||
"httpx"
|
||||
"packaging"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
ollama
|
||||
textual
|
||||
typer
|
||||
python-dotenv
|
||||
|
|
@ -46,12 +49,12 @@ python3Packages.buildPythonApplication rec {
|
|||
# Tests require a HTTP connection to ollama
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
changelog = "https://github.com/ggozad/oterm/releases/tag/${version}";
|
||||
description = "A text-based terminal client for Ollama";
|
||||
homepage = "https://github.com/ggozad/oterm";
|
||||
changelog = "https://github.com/ggozad/oterm/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ suhr ];
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "oterm";
|
||||
maintainers = with lib.maintainers; [ suhr ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +1,10 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
python3,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
robotframework,
|
||||
click,
|
||||
colorama,
|
||||
pathspec,
|
||||
tomli,
|
||||
rich-click,
|
||||
jinja2,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "robotframework-tidy";
|
||||
version = "4.11.0";
|
||||
pyproject = true;
|
||||
|
|
@ -20,13 +12,13 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "MarketSquare";
|
||||
repo = "robotframework-tidy";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
hash = "sha256-pWW7Ex184WgnPfqHg5qQjfE+9UPvCmE5pwkY8jrp9bI=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
build-system = with python3.pkgs; [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
dependencies = with python3.pkgs; [
|
||||
robotframework
|
||||
click
|
||||
colorama
|
||||
|
|
@ -34,13 +26,17 @@ buildPythonPackage rec {
|
|||
tomli
|
||||
rich-click
|
||||
jinja2
|
||||
tomli-w
|
||||
];
|
||||
|
||||
nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/MarketSquare/robotframework-tidy/blob/main/docs/releasenotes/${version}.rst";
|
||||
description = "Code autoformatter for Robot Framework";
|
||||
homepage = "https://robotidy.readthedocs.io";
|
||||
changelog = "https://github.com/MarketSquare/robotframework-tidy/blob/main/docs/releasenotes/${version}.rst";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ otavio ];
|
||||
mainProgram = "robotidy";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,4 +1,13 @@
|
|||
{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||
{
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
lib,
|
||||
nix-update-script,
|
||||
stdenv,
|
||||
steampipe,
|
||||
testers,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "steampipe";
|
||||
|
|
@ -11,7 +20,7 @@ buildGoModule rec {
|
|||
hash = "sha256-Oz1T9koeXnmHc5oru1apUtmhhvKi/gAtg/Hb7HKkkP0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-jC77z/1EerJSMK75np9R5kX+cLzTh55cFFlliAXASEw=";
|
||||
vendorHash = "sha256-U0BeGCRLjL56ZmVKcKqrrPTCXpShJzJq5/wnXDKax6g=";
|
||||
proxyVendor = true;
|
||||
|
||||
patchPhase = ''
|
||||
|
|
@ -38,10 +47,20 @@ buildGoModule rec {
|
|||
--zsh <($out/bin/steampipe --install-dir $INSTALL_DIR completion zsh)
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion {
|
||||
command = "${lib.getExe steampipe} --version";
|
||||
package = steampipe;
|
||||
version = "v${version}";
|
||||
};
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://steampipe.io/";
|
||||
description = "select * from cloud;";
|
||||
license = licenses.agpl3Only;
|
||||
mainProgram = "steampipe";
|
||||
maintainers = with maintainers; [ hardselius ];
|
||||
changelog = "https://github.com/turbot/steampipe/blob/v${version}/CHANGELOG.md";
|
||||
};
|
||||
|
|
@ -25,13 +25,13 @@ in
|
|||
backendStdenv.mkDerivation (
|
||||
finalAttrs: {
|
||||
pname = "nccl";
|
||||
version = "2.20.3-1";
|
||||
version = "2.20.5-1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NVIDIA";
|
||||
repo = finalAttrs.pname;
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-7gI1q6uN3saz/twwLjWl7XmMucYjvClDPDdbVpVM0vU=";
|
||||
hash = "sha256-ModIjD6RaRD/57a/PA1oTgYhZsAQPrrvhl5sNVXnO6c=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -11,21 +11,26 @@
|
|||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-ai-generativelanguage";
|
||||
version = "0.5.4";
|
||||
format = "setuptools";
|
||||
version = "0.6.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-XBhXXrzbIiKoFPew/UdUD673AUPb96rm9LudyVcY3H8=";
|
||||
hash = "sha256-vA/JVTaj3+NuA91LJo+Utn1hxogihr/OaBV4ujOFm7o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
google-api-core
|
||||
grpcio
|
||||
grpcio-status
|
||||
|
|
|
|||
|
|
@ -1,30 +1,51 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchPypi
|
||||
, google-generativeai
|
||||
, llama-index-core
|
||||
, poetry-core
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-embeddings-google";
|
||||
|
||||
inherit (llama-index-core) version src meta;
|
||||
|
||||
version = "0.1.4";
|
||||
pyproject = true;
|
||||
|
||||
sourceRoot = "${src.name}/llama-index-integrations/embeddings/${pname}";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_embeddings_google";
|
||||
inherit version;
|
||||
hash = "sha256-jQYN/5XPCrMjvwXBARdRDLC+3JhqgZjlcVajmcRlVJw=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"google-generativeai"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
google-generativeai
|
||||
llama-index-core
|
||||
];
|
||||
|
||||
# Tests are only available in the mono repo
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"llama_index.embeddings.google"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "LlamaIndex Embeddings Integration for Google";
|
||||
homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/embeddings/llama-index-embeddings-google";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,26 +1,34 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchPypi
|
||||
, llama-index-core
|
||||
, llama-index-llms-openai
|
||||
, llama-index-program-openai
|
||||
, poetry-core
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-question-gen-openai";
|
||||
|
||||
inherit (llama-index-core) version src meta;
|
||||
|
||||
version = "0.1.3";
|
||||
pyproject = true;
|
||||
|
||||
sourceRoot = "${src.name}/llama-index-integrations/question_gen/${pname}";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
nativeBuildInputs = [
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_question_gen_openai";
|
||||
inherit version;
|
||||
hash = "sha256-RIYZgRekVFfS4DauYLk69YBSiTzH14+ptvR91HuB4uE=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
# Tests are only available in the mono repo
|
||||
doCheck = false;
|
||||
|
||||
dependencies = [
|
||||
llama-index-core
|
||||
llama-index-llms-openai
|
||||
llama-index-program-openai
|
||||
|
|
@ -29,4 +37,11 @@ buildPythonPackage rec {
|
|||
pythonImportsCheck = [
|
||||
"llama_index.question_gen.openai"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "LlamaIndex Question Gen Integration for Openai Generator";
|
||||
homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/question_gen/llama-index-question-gen-openai";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,22 +1,33 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchPypi
|
||||
, llama-index-core
|
||||
, llama-parse
|
||||
, poetry-core
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-readers-llama-parse";
|
||||
|
||||
inherit (llama-index-core) version src meta;
|
||||
|
||||
version = "0.1.4";
|
||||
pyproject = true;
|
||||
|
||||
sourceRoot = "${src.name}/llama-index-integrations/readers/${pname}";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_readers_llama_parse";
|
||||
inherit version;
|
||||
hash = "sha256-eGCLGTyBiJSu/u4KowPwK3+A8uTK8Thmwv07CxAj4sA=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"llama-parse"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -24,7 +35,17 @@ buildPythonPackage rec {
|
|||
llama-index-core
|
||||
];
|
||||
|
||||
# Tests are only available in the mono repo
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"llama_index.readers.llama_parse"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "LlamaIndex Readers Integration for files";
|
||||
homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/readers/llama-index-readers-llama-parse";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jenkins";
|
||||
version = "2.440.1";
|
||||
version = "2.440.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://get.jenkins.io/war-stable/${version}/jenkins.war";
|
||||
hash = "sha256-Ck3uMnaGcyl0W8nSU9rYVl+rALTC8G4aItSS1tRkSV0=";
|
||||
hash = "sha256-gSZijp4vjuL4B9SJ7ApuN/yfXWuoT6jzcY5/PionMS4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "rain";
|
||||
version = "1.8.1";
|
||||
version = "1.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws-cloudformation";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-II+SJkdlmtPuVEK+s9VLAwoe7+jYYXA+6uxAXD5NZHU=";
|
||||
sha256 = "sha256-QJAcIk+XPQF5iLlcK62t2htOVjne3K/74Am0pvLS1r8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Ea83gPSq7lReS2KXejY9JlDDEncqS1ouVyIEKbn+VAw=";
|
||||
vendorHash = "sha256-+UJyPwb4/KPeXyrsGQvX2SfYWfTeoR93WGyTTBf3Ya8=";
|
||||
|
||||
subPackages = [ "cmd/rain" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rust-analyzer-unwrapped";
|
||||
version = "2024-03-18";
|
||||
cargoSha256 = "sha256-CZC90HtAuK66zXDCHam9YJet9C62psxkHeJ/+1vIjTg=";
|
||||
version = "2024-03-25";
|
||||
cargoSha256 = "sha256-knvXvQ4e3Ab5zGcitfzlznad//0gAFSgWjOPiCjeFDM=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-lang";
|
||||
repo = "rust-analyzer";
|
||||
rev = version;
|
||||
sha256 = "sha256-Jd6pmXlwKk5uYcjyO/8BfbUVmx8g31Qfk7auI2IG66A=";
|
||||
sha256 = "sha256-4na1ZTc6Iknu6V1Wo6jnt6d3H0JdZfpKF4GX/WNa/Zc=";
|
||||
};
|
||||
|
||||
cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ];
|
||||
|
|
|
|||
|
|
@ -4,9 +4,13 @@
|
|||
, fetchzip
|
||||
, installShellFiles
|
||||
, testers
|
||||
, yabai
|
||||
, xxd
|
||||
, writeShellScript
|
||||
, common-updater-scripts
|
||||
, curl
|
||||
, jq
|
||||
, xcodebuild
|
||||
, xxd
|
||||
, yabai
|
||||
, Carbon
|
||||
, Cocoa
|
||||
, ScriptingBridge
|
||||
|
|
@ -15,24 +19,9 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "yabai";
|
||||
version = "7.0.2";
|
||||
version = "7.0.3";
|
||||
|
||||
src =
|
||||
# Unfortunately compiling yabai from source on aarch64-darwin is a bit complicated. We use the precompiled binary instead for now.
|
||||
# See the comments on https://github.com/NixOS/nixpkgs/pull/188322 for more information.
|
||||
if stdenv.isAarch64 then
|
||||
(fetchzip {
|
||||
url = "https://github.com/koekeishiya/yabai/releases/download/v${finalAttrs.version}/yabai-v${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-FeNiJJM5vdzFT9s7N9cTjLYxKEfzZnKE9br13lkQhJo=";
|
||||
})
|
||||
else if stdenv.isx86_64 then
|
||||
(fetchFromGitHub {
|
||||
owner = "koekeishiya";
|
||||
repo = "yabai";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-/MOAKsY7MlRWdvUQwHeITTeGJbCUdX7blZZAl2zXuic=";
|
||||
})
|
||||
else (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
env = {
|
||||
# silence service.h error
|
||||
|
|
@ -85,9 +74,41 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
--replace 'return screen.safeAreaInsets.top;' 'return 0;'
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = yabai;
|
||||
version = "yabai-v${finalAttrs.version}";
|
||||
passthru = {
|
||||
tests.version = testers.testVersion {
|
||||
package = yabai;
|
||||
version = "yabai-v${finalAttrs.version}";
|
||||
};
|
||||
|
||||
sources = {
|
||||
# Unfortunately compiling yabai from source on aarch64-darwin is a bit complicated. We use the precompiled binary instead for now.
|
||||
# See the comments on https://github.com/NixOS/nixpkgs/pull/188322 for more information.
|
||||
"aarch64-darwin" = fetchzip {
|
||||
url = "https://github.com/koekeishiya/yabai/releases/download/v${finalAttrs.version}/yabai-v${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-EvtKYYjEmLkJTnc9q6f37hMD1T3DBO+I1LfBvPjCgfc=";
|
||||
};
|
||||
"x86_64-darwin" = fetchFromGitHub
|
||||
{
|
||||
owner = "koekeishiya";
|
||||
repo = "yabai";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-oxQsCvTZqfKZoTuY1NC6h+Fzvyl0gJDhljFY2KrjRQ8=";
|
||||
};
|
||||
};
|
||||
|
||||
updateScript = writeShellScript "update-yabai" ''
|
||||
set -o errexit
|
||||
export PATH="${lib.makeBinPath [ curl jq common-updater-scripts ]}"
|
||||
NEW_VERSION=$(curl --silent https://api.github.com/repos/koekeishiya/yabai/releases/latest | jq '.tag_name | ltrimstr("v")' --raw-output)
|
||||
if [[ "${finalAttrs.version}" = "$NEW_VERSION" ]]; then
|
||||
echo "The new version same as the old version."
|
||||
exit 0
|
||||
fi
|
||||
for platform in ${lib.escapeShellArgs finalAttrs.meta.platforms}; do
|
||||
update-source-version "yabai" "0" "${lib.fakeHash}" --source-key="sources.$platform"
|
||||
update-source-version "yabai" "$NEW_VERSION" --source-key="sources.$platform"
|
||||
done
|
||||
'';
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
@ -101,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
homepage = "https://github.com/koekeishiya/yabai";
|
||||
changelog = "https://github.com/koekeishiya/yabai/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.darwin;
|
||||
platforms = builtins.attrNames finalAttrs.passthru.sources;
|
||||
mainProgram = "yabai";
|
||||
maintainers = with lib.maintainers; [
|
||||
cmacrae
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
}:
|
||||
|
||||
yarn2nix-moretea.mkYarnPackage {
|
||||
version = "1.1.21";
|
||||
version = "1.1.22";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.21.tgz";
|
||||
sha256 = "0iwapln36dxa17hbl38vb3hmx6ijckf0psmf16mri4iq3x3749r9";
|
||||
url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.22.tgz";
|
||||
sha256 = "14hxynja1xybzcv9wabhn2ps7ngnigb4hs2lc2zz162wd1phv6j1";
|
||||
};
|
||||
|
||||
patches = [ ./fix-js-include-paths.patch ];
|
||||
|
|
@ -21,7 +21,7 @@ yarn2nix-moretea.mkYarnPackage {
|
|||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = ./yarn.lock;
|
||||
hash = "sha256-uh1lU4AMU/uogwkmkGUkoIeIHGkm/qmIPL3xMKWyDmA=";
|
||||
hash = "sha256-smx37i/0MFmZYGqjE3NgySDiZfKP/4SHtFSYko/6mAU=";
|
||||
};
|
||||
|
||||
# Tarball has CRLF line endings. This makes patching difficult, so let's convert them.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "meshcentral",
|
||||
"version": "1.1.21",
|
||||
"version": "1.1.22",
|
||||
"keywords": [
|
||||
"Remote Device Management",
|
||||
"Remote Device Monitoring",
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
"sample-config-advanced.json"
|
||||
],
|
||||
"dependencies": {
|
||||
"archiver": "5.3.2",
|
||||
"archiver": "7.0.0",
|
||||
"body-parser": "1.20.2",
|
||||
"cbor": "5.2.0",
|
||||
"compression": "1.7.4",
|
||||
|
|
@ -67,14 +67,11 @@
|
|||
"passport-twitter": "*",
|
||||
"passport-google-oauth20": "*",
|
||||
"passport-github2": "*",
|
||||
"passport-reddit": "*",
|
||||
"passport-azure-oauth2": "*",
|
||||
"jwt-simple": "*",
|
||||
"@mstrhakr/passport-openidconnect": "*",
|
||||
"openid-client": "*",
|
||||
"connect-flash": "*",
|
||||
"passport-saml": "*",
|
||||
"archiver": "5.3.2",
|
||||
"archiver": "7.0.0",
|
||||
"body-parser": "1.20.2",
|
||||
"cbor": "5.2.0",
|
||||
"compression": "1.7.4",
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -43,13 +43,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fastfetch";
|
||||
version = "2.8.9";
|
||||
version = "2.8.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastfetch-cli";
|
||||
repo = "fastfetch";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-UvAIIkH9PNlvLzlh0jm1kG+4OfWsWtt2LSFbFPm7Yv4=";
|
||||
hash = "sha256-MIrjfd1KudtU+4X65M+qdPtWUPWQXBlE13Myp1u8hPM=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ddns-go";
|
||||
version = "6.2.2";
|
||||
version = "6.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jeessy2";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MwDwYoX1OT4TKMD2g+RBAlGfs8cz42dEFnV2b8Xzup8=";
|
||||
hash = "sha256-YQaD0eWIufqyWF3bUXBdcd9nw5smvXkyWqZlROwBxBk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-zUqsuph0fn1x4dwvBY0W0+S6SzS086SHya2ViNpDXGU=";
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gotestwaf";
|
||||
version = "0.4.16";
|
||||
version = "0.4.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wallarm";
|
||||
repo = "gotestwaf";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-fMSXnA8ZuyfOQINkWiYwX7NSffsHbdlfDcpfo/hahMY=";
|
||||
hash = "sha256-Ix2S+yJMAn7RCMuw5SkvnfVy7XH6yIuGwXP/EAnhyI0=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -3379,8 +3379,6 @@ with pkgs;
|
|||
|
||||
aws-vault = callPackage ../tools/admin/aws-vault { };
|
||||
|
||||
aws-workspaces = callPackage ../applications/networking/remote/aws-workspaces { };
|
||||
|
||||
iamy = callPackage ../tools/admin/iamy { };
|
||||
|
||||
iam-policy-json-to-terraform = callPackage ../tools/misc/iam-policy-json-to-terraform { };
|
||||
|
|
@ -6333,8 +6331,6 @@ with pkgs;
|
|||
|
||||
statserial = callPackage ../tools/misc/statserial { };
|
||||
|
||||
steampipe = callPackage ../tools/misc/steampipe { };
|
||||
|
||||
step-ca = callPackage ../tools/security/step-ca {
|
||||
inherit (darwin.apple_sdk.frameworks) PCSC;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -13099,8 +13099,6 @@ self: super: with self; {
|
|||
|
||||
robotframework-sshlibrary = callPackage ../development/python-modules/robotframework-sshlibrary { };
|
||||
|
||||
robotframework-tidy = callPackage ../development/python-modules/robotframework-tidy { };
|
||||
|
||||
robotframework-tools = callPackage ../development/python-modules/robotframework-tools { };
|
||||
|
||||
robotstatuschecker = callPackage ../development/python-modules/robotstatuschecker { };
|
||||
|
|
|
|||
Loading…
Reference in New Issue