mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-18 13:19:10 +03:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
c8021f68a8
@ -177,6 +177,12 @@
|
||||
githubId = 12578560;
|
||||
name = "Quinn Bohner";
|
||||
};
|
||||
_8-bit-fox = {
|
||||
email = "sebastian@markwaerter.de";
|
||||
github = "8-bit-fox";
|
||||
githubId = 43320117;
|
||||
name = "Sebastian Marquardt";
|
||||
};
|
||||
_9999years = {
|
||||
email = "rbt@fastmail.com";
|
||||
github = "9999years";
|
||||
|
||||
@ -536,5 +536,53 @@ let self = {
|
||||
"22.11".us-west-1.aarch64-linux.hvm-ebs = "ami-052d52b9e30a18562";
|
||||
"22.11".us-west-2.aarch64-linux.hvm-ebs = "ami-07418b6a4782c9521";
|
||||
|
||||
latest = self."22.11";
|
||||
# 23.05.426.afc48694f2a
|
||||
|
||||
"23.05".eu-west-1.x86_64-linux.hvm-ebs = "ami-0fc7825fe890f87d1";
|
||||
"23.05".af-south-1.x86_64-linux.hvm-ebs = "ami-0df2f7b42bfbd53e5";
|
||||
"23.05".ap-east-1.x86_64-linux.hvm-ebs = "ami-07ba84d7321f6f4bb";
|
||||
"23.05".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-0e37827874573dbbf";
|
||||
"23.05".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-0ff5b3b7738651895";
|
||||
"23.05".ap-northeast-3.x86_64-linux.hvm-ebs = "ami-0a7861571eb44c70c";
|
||||
"23.05".ap-south-1.x86_64-linux.hvm-ebs = "ami-05c4802ca81d7c95b";
|
||||
"23.05".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-0aee8193da16bd2db";
|
||||
"23.05".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-008be032289f60d16";
|
||||
"23.05".ap-southeast-3.x86_64-linux.hvm-ebs = "ami-033debde7c1659c96";
|
||||
"23.05".ca-central-1.x86_64-linux.hvm-ebs = "ami-031821b5f83896474";
|
||||
"23.05".eu-central-1.x86_64-linux.hvm-ebs = "ami-0d6ee9d5e1c985df6";
|
||||
"23.05".eu-north-1.x86_64-linux.hvm-ebs = "ami-0cecb1f67b2a837f6";
|
||||
"23.05".eu-south-1.x86_64-linux.hvm-ebs = "ami-0f9fee15eb5a64ac4";
|
||||
"23.05".eu-west-2.x86_64-linux.hvm-ebs = "ami-0e62fef78d2c4f031";
|
||||
"23.05".eu-west-3.x86_64-linux.hvm-ebs = "ami-01a6e4c1659b08390";
|
||||
"23.05".me-south-1.x86_64-linux.hvm-ebs = "ami-0a01a7eeffa8f0fd5";
|
||||
"23.05".sa-east-1.x86_64-linux.hvm-ebs = "ami-09a1760227f929ccf";
|
||||
"23.05".us-east-1.x86_64-linux.hvm-ebs = "ami-07df5833f04703a2a";
|
||||
"23.05".us-east-2.x86_64-linux.hvm-ebs = "ami-04dd2f100d9665df5";
|
||||
"23.05".us-west-1.x86_64-linux.hvm-ebs = "ami-0fe502361fea4216c";
|
||||
"23.05".us-west-2.x86_64-linux.hvm-ebs = "ami-0749963dd978a57c7";
|
||||
|
||||
"23.05".eu-west-1.aarch64-linux.hvm-ebs = "ami-0a0609421e5638005";
|
||||
"23.05".af-south-1.aarch64-linux.hvm-ebs = "ami-05d95a055aba9373e";
|
||||
"23.05".ap-east-1.aarch64-linux.hvm-ebs = "ami-08ae0190b1357465b";
|
||||
"23.05".ap-northeast-1.aarch64-linux.hvm-ebs = "ami-09418b2049c3c9533";
|
||||
"23.05".ap-northeast-2.aarch64-linux.hvm-ebs = "ami-040713ad23b404271";
|
||||
"23.05".ap-northeast-3.aarch64-linux.hvm-ebs = "ami-0c888d6c1d989db68";
|
||||
"23.05".ap-south-1.aarch64-linux.hvm-ebs = "ami-02da38deb21545675";
|
||||
"23.05".ap-southeast-1.aarch64-linux.hvm-ebs = "ami-06df0713468bea276";
|
||||
"23.05".ap-southeast-2.aarch64-linux.hvm-ebs = "ami-0171ee37ae5104c06";
|
||||
"23.05".ap-southeast-3.aarch64-linux.hvm-ebs = "ami-075da61f5fef1fe80";
|
||||
"23.05".ca-central-1.aarch64-linux.hvm-ebs = "ami-0ba8bd0a3d0a596f8";
|
||||
"23.05".eu-central-1.aarch64-linux.hvm-ebs = "ami-0891608ae66031439";
|
||||
"23.05".eu-north-1.aarch64-linux.hvm-ebs = "ami-0a3ad7ef18d595c68";
|
||||
"23.05".eu-south-1.aarch64-linux.hvm-ebs = "ami-0fa86b680aa9a0444";
|
||||
"23.05".eu-west-2.aarch64-linux.hvm-ebs = "ami-0a415791078f05970";
|
||||
"23.05".eu-west-3.aarch64-linux.hvm-ebs = "ami-05d9b146317962e3b";
|
||||
"23.05".me-south-1.aarch64-linux.hvm-ebs = "ami-0019b591acf30aa66";
|
||||
"23.05".sa-east-1.aarch64-linux.hvm-ebs = "ami-030d6c30d91f06cc7";
|
||||
"23.05".us-east-1.aarch64-linux.hvm-ebs = "ami-0a061ca437b63df33";
|
||||
"23.05".us-east-2.aarch64-linux.hvm-ebs = "ami-0bf0b2b8fdfda30e8";
|
||||
"23.05".us-west-1.aarch64-linux.hvm-ebs = "ami-0e75c8f3deb1f842b";
|
||||
"23.05".us-west-2.aarch64-linux.hvm-ebs = "ami-0d0979d889078d036";
|
||||
|
||||
latest = self."23.05";
|
||||
}; in self
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hugo";
|
||||
version = "0.112.6";
|
||||
version = "0.112.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gohugoio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-FrZwblAxXtGduCZc37269iygflft32G0ICrJLd9ssBU=";
|
||||
hash = "sha256-8vvIMCnxS/1MsooSmNPeHE9VxYYOVyKiExr8oSgcYF4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZPgGR1NPVn/LF/nvCXP4S08MYvWp3Dtq/I9kom9HP9c=";
|
||||
|
||||
45
pkgs/applications/misc/please-cli/default.nix
Normal file
45
pkgs/applications/misc/please-cli/default.nix
Normal file
@ -0,0 +1,45 @@
|
||||
{ lib
|
||||
, curl
|
||||
, fetchFromGitHub
|
||||
, jq
|
||||
, makeBinaryWrapper
|
||||
, please-cli
|
||||
, stdenv
|
||||
, testers
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "please-cli";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TNG";
|
||||
repo = "please-cli";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-rJIR4eMhXL4K9iO7JxnkgWNsICV3hPQb0aobWNuHAG0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm555 please.sh "$out/bin/please"
|
||||
wrapProgram $out/bin/please \
|
||||
--prefix PATH : ${lib.makeBinPath [ curl jq ]}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests = testers.testVersion {
|
||||
package = please-cli;
|
||||
version = "v${finalAttrs.version}";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "An AI helper script to create CLI commands based on GPT prompts";
|
||||
homepage = "https://github.com/TNG/please-cli";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ _8-bit-fox ];
|
||||
mainProgram = "please";
|
||||
platforms = platforms.all;
|
||||
};
|
||||
})
|
||||
5074
pkgs/applications/misc/pot/Cargo.lock
generated
Normal file
5074
pkgs/applications/misc/pot/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
139
pkgs/applications/misc/pot/default.nix
Normal file
139
pkgs/applications/misc/pot/default.nix
Normal file
@ -0,0 +1,139 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, stdenvNoCC
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, wrapGAppsHook
|
||||
, cargo
|
||||
, rustc
|
||||
, cargo-tauri
|
||||
, pkg-config
|
||||
, nodePackages
|
||||
, esbuild
|
||||
, buildGoModule
|
||||
, jq
|
||||
, moreutils
|
||||
, libayatana-appindicator
|
||||
, gtk3
|
||||
, webkitgtk
|
||||
, libsoup
|
||||
, openssl
|
||||
, xdotool
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pot";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pot-app";
|
||||
repo = "pot-desktop";
|
||||
rev = version;
|
||||
hash = "sha256-sAAdw7gYUQTHZYmxSAk2LByR+iMT836sQolk2NOgWD0=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/src-tauri";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
|
||||
--replace "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
|
||||
|
||||
chmod -R +w ..
|
||||
# Disable auto update check by default
|
||||
sed -i -e '/auto_check/s/true/false/' src/main.rs ../src/windows/Config/index.jsx
|
||||
'';
|
||||
|
||||
pnpm-deps = stdenvNoCC.mkDerivation {
|
||||
pname = "${pname}-pnpm-deps";
|
||||
inherit src version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
moreutils
|
||||
nodePackages.pnpm
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
export HOME=$(mktemp -d)
|
||||
pnpm config set store-dir $out
|
||||
# use --ignore-script and --no-optional to avoid downloading binaries
|
||||
# use --frozen-lockfile to avoid checking git deps
|
||||
pnpm install --frozen-lockfile --no-optional --ignore-script
|
||||
|
||||
# Remove timestamp and sort the json files
|
||||
rm -rf $out/v3/tmp
|
||||
for f in $(find $out -name "*.json"); do
|
||||
sed -i -E -e 's/"checkedAt":[0-9]+,//g' $f
|
||||
jq --sort-keys . $f | sponge $f
|
||||
done
|
||||
'';
|
||||
|
||||
dontFixup = true;
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "sha256-lqGskG1MWbZKEmqJf4b9dGltmFHw/qOo/Sh7JIFS4IQ=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"tauri-plugin-single-instance-0.0.0" = "sha256-M6uGcf4UWAU+494wAK/r2ta1c3IZ07iaURLwJJR9F3U=";
|
||||
"tauri-plugin-autostart-0.0.0" = "sha256-M6uGcf4UWAU+494wAK/r2ta1c3IZ07iaURLwJJR9F3U=";
|
||||
"enigo-0.1.2" = "sha256-99VJ0WYD8jV6CYUZ1bpYJBwIE2iwOZ9SjOvyA2On12Q=";
|
||||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
rustPlatform.cargoSetupHook
|
||||
cargo
|
||||
rustc
|
||||
cargo-tauri
|
||||
wrapGAppsHook
|
||||
nodePackages.pnpm
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
libsoup
|
||||
libayatana-appindicator
|
||||
openssl
|
||||
webkitgtk
|
||||
xdotool
|
||||
];
|
||||
|
||||
ESBUILD_BINARY_PATH = "${lib.getExe (esbuild.override {
|
||||
buildGoModule = args: buildGoModule (args // rec {
|
||||
version = "0.17.15";
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanw";
|
||||
repo = "esbuild";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AzkjVw3o+yP/l6jiMmgzaymb0el2/OcAl8WQYbuMprw=";
|
||||
};
|
||||
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
|
||||
});
|
||||
})}";
|
||||
|
||||
preBuild = ''
|
||||
export HOME=$(mktemp -d)
|
||||
pnpm config set store-dir ${pnpm-deps}
|
||||
pnpm install --offline --frozen-lockfile --no-optional --ignore-script
|
||||
chmod -R +w ../node_modules
|
||||
pnpm rebuild
|
||||
# Use cargo-tauri from nixpkgs instead of pnpm tauri from npm
|
||||
cargo tauri build -b deb
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
mv target/release/bundle/deb/*/data/usr/ $out
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A cross-platform translation software";
|
||||
homepage = "https://pot.pylogmon.com";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ linsui ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "k8sgpt";
|
||||
version = "0.3.5";
|
||||
version = "0.3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "k8sgpt-ai";
|
||||
repo = "k8sgpt";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AUUcC9S1+83ZlOH/LEG+QXstxpr8949JbqFMF9hIiVE=";
|
||||
hash = "sha256-GAEAl59bzCffsh0XYa61R/AwwoGyFfG0M1m1U2aQiis=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-tXLt18ryxO9Q7E/MJWDlZy1gmxnMauqfcbmRdF9uUt8=";
|
||||
vendorHash = "sha256-g0Lgu0aC25+/MYoRKMqTN8Iu8j/KA4G1DBjbhOfPpjg=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "kitty-themes";
|
||||
version = "unstable-2023-03-08";
|
||||
version = "unstable-2023-06-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kovidgoyal";
|
||||
repo = "kitty-themes";
|
||||
rev = "c01fcbd694353507c3cc7f657179bad1f32140a7";
|
||||
hash = "sha256-heJayOz/2Bey/zAwL2PR1OsfGyCPqMyxT1XzwHLhQ0w=";
|
||||
rev = "f765eb1715d79c6cb3ad3d571342d612f21b810e";
|
||||
hash = "sha256-Y3N8cyqEsY/kB2xMIlPYnbuYUs8grzepPx/11maG4bo=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "dvc";
|
||||
version = "2.58.1";
|
||||
version = "2.58.2";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-n6tX7sHzyeIWnpFM08QosQ7y27SB9OKMuQeSB25lJRU=";
|
||||
hash = "sha256-sq5jrGtUVe8R4ZdjwEBW9yEYBe8o1xyFVZGcZ+tMvCs=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ config, stdenv, fetchurl, lib, acpica-tools, dev86, pam, libxslt, libxml2, wrapQtAppsHook
|
||||
, libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL, libcap, libGL
|
||||
, libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL2, libcap, libGL, libGLU
|
||||
, libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras
|
||||
, qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43
|
||||
, alsa-lib, curl, libvpx, nettools, dbus, substituteAll, gsoap, zlib
|
||||
@ -24,14 +24,14 @@ let
|
||||
buildType = "release";
|
||||
# Use maintainers/scripts/update.nix to update the version and all related hashes or
|
||||
# change the hashes in extpack.nix and guest-additions/default.nix as well manually.
|
||||
version = "7.0.6";
|
||||
version = "7.0.8";
|
||||
in stdenv.mkDerivation {
|
||||
pname = "virtualbox";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
|
||||
sha256 = "f146d9a86a35af0abb010e628636fd800cb476cc2ce82f95b0c0ca876e1756ff";
|
||||
url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}a.tar.bz2";
|
||||
sha256 = "7de37359518d467b7f888235175cd388f66e9f16bd9359dd6265fbc95933c1e6";
|
||||
};
|
||||
|
||||
outputs = [ "out" "modsrc" ];
|
||||
@ -45,12 +45,12 @@ in stdenv.mkDerivation {
|
||||
buildInputs = [
|
||||
acpica-tools dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL
|
||||
libcap glib lvm2 alsa-lib curl libvpx pam makeself perl
|
||||
libXmu libpng libopus python3 ]
|
||||
libXmu libXrandr libpng libopus python3 ]
|
||||
++ optional javaBindings jdk
|
||||
++ optional pythonBindings python3 # Python is needed even when not building bindings
|
||||
++ optional pulseSupport libpulseaudio
|
||||
++ optionals headless [ libXrandr libGL ]
|
||||
++ optionals (!headless) [ qtbase qtx11extras libXinerama SDL ]
|
||||
++ optionals headless [ libGL ]
|
||||
++ optionals (!headless) [ qtbase qtx11extras libXinerama SDL2 libGLU ]
|
||||
++ optionals enableWebService [ gsoap zlib ];
|
||||
|
||||
hardeningDisable = [ "format" "fortify" "pic" "stackprotector" ];
|
||||
@ -82,6 +82,8 @@ in stdenv.mkDerivation {
|
||||
|
||||
patches =
|
||||
optional enableHardening ./hardened.patch
|
||||
# Since VirtualBox 7.0.8, VBoxSDL requires SDL2, but the build framework uses SDL1
|
||||
++ optional (!headless) ./fix-sdl.patch
|
||||
++ [ ./extra_symbols.patch ]
|
||||
# When hardening is enabled, we cannot use wrapQtApp to ensure that VirtualBoxVM sees
|
||||
# the correct environment variables needed for Qt to work, specifically QT_PLUGIN_PATH.
|
||||
|
||||
@ -12,7 +12,7 @@ fetchurl rec {
|
||||
# Manually sha256sum the extensionPack file, must be hex!
|
||||
# Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.
|
||||
# Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS
|
||||
let value = "292961aa8723b54f96f89f6d8abf7d8e29259d94b7de831dbffb9ae15d346434";
|
||||
let value = "452320f3b1da42b30c32ea5ab5887983b575638ceb4e3beacfefbbb3b0510a48";
|
||||
in assert (builtins.stringLength value) == 64; value;
|
||||
|
||||
meta = {
|
||||
|
||||
72
pkgs/applications/virtualization/virtualbox/fix-sdl.patch
Normal file
72
pkgs/applications/virtualization/virtualbox/fix-sdl.patch
Normal file
@ -0,0 +1,72 @@
|
||||
diff --git a/configure b/configure
|
||||
index 5edefba..a17e8c5 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -1184,10 +1184,10 @@ check_sdl()
|
||||
fail
|
||||
fi
|
||||
else
|
||||
- if which_wrapper sdl-config > /dev/null; then
|
||||
- FLGSDL=`sdl-config --cflags`
|
||||
+ if which_wrapper sdl2-config > /dev/null; then
|
||||
+ FLGSDL=`sdl2-config --cflags`
|
||||
INCSDL=`strip_I "$FLGSDL"`
|
||||
- LIBSDL=`sdl-config --libs`
|
||||
+ LIBSDL=`sdl2-config --libs`
|
||||
LIBSDLMAIN="-lSDLmain"
|
||||
FLDSDL=
|
||||
foundsdl=1
|
||||
diff --git a/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp b/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp
|
||||
index 16dc282..4889865 100644
|
||||
--- a/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp
|
||||
+++ b/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp
|
||||
@@ -56,7 +56,7 @@ using namespace com;
|
||||
# pragma warning(push)
|
||||
# pragma warning(disable: 4121) /* warning C4121: 'SDL_SysWMmsg' : alignment of a member was sensitive to packing*/
|
||||
# endif
|
||||
-# include <SDL_syswm.h> /* for SDL_GetWMInfo() */
|
||||
+# include <SDL2/SDL_syswm.h> /* for SDL_GetWMInfo() */
|
||||
# ifdef _MSC_VER
|
||||
# pragma warning(pop)
|
||||
# endif
|
||||
diff --git a/src/VBox/Frontends/VBoxSDL/Makefile.kmk b/src/VBox/Frontends/VBoxSDL/Makefile.kmk
|
||||
index da43153..2aa8cd7 100644
|
||||
--- a/src/VBox/Frontends/VBoxSDL/Makefile.kmk
|
||||
+++ b/src/VBox/Frontends/VBoxSDL/Makefile.kmk
|
||||
@@ -79,10 +79,6 @@ if !defined(VBOX_WITH_HARDENING) || "$(KBUILD_TARGET)" != "darwin" # No hardened
|
||||
VBoxSDL_INCS += \
|
||||
$(VBOX_XCURSOR_INCS)
|
||||
endif
|
||||
- ifn1of ($(KBUILD_TARGET), solaris) # Probably wrong with SDL2
|
||||
- VBoxSDL_LIBS = \
|
||||
- $(LIB_SDK_LIBSDL2_SDLMAIN)
|
||||
- endif
|
||||
if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # X11
|
||||
VBoxSDL_LIBS += \
|
||||
$(PATH_STAGE_DLL)/VBoxKeyboard$(VBOX_SUFF_DLL) \
|
||||
diff --git a/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp b/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp
|
||||
index 065c391..22788e1 100644
|
||||
--- a/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp
|
||||
+++ b/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp
|
||||
@@ -64,7 +64,7 @@ using namespace com;
|
||||
# pragma warning(disable: 4121) /* warning C4121: 'SDL_SysWMmsg' : alignment of a member was sensitive to packing*/
|
||||
#endif
|
||||
#ifndef RT_OS_DARWIN
|
||||
-# include <SDL_syswm.h> /* for SDL_GetWMInfo() */
|
||||
+# include <SDL2/SDL_syswm.h> /* for SDL_GetWMInfo() */
|
||||
#endif
|
||||
#ifdef _MSC_VER
|
||||
# pragma warning(pop)
|
||||
diff --git a/src/VBox/Frontends/VBoxSDL/VBoxSDL.h b/src/VBox/Frontends/VBoxSDL/VBoxSDL.h
|
||||
index dde548f..8fc9fb3 100644
|
||||
--- a/src/VBox/Frontends/VBoxSDL/VBoxSDL.h
|
||||
+++ b/src/VBox/Frontends/VBoxSDL/VBoxSDL.h
|
||||
@@ -45,7 +45,7 @@
|
||||
# pragma warning(disable: 4121) /* warning C4121: 'SDL_SysWMmsg' : alignment of a member was sensitive to packing*/
|
||||
# pragma warning(disable: 4668) /* warning C4668: '__GNUC__' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif' */
|
||||
#endif
|
||||
-#include <SDL.h>
|
||||
+#include <SDL2/SDL.h>
|
||||
#ifdef _MSC_VER
|
||||
# pragma warning(pop)
|
||||
#endif
|
||||
@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
|
||||
sha256 = "21e0f407d2a4f5c286084a70718aa20235ea75969eca0cab6cfab43a3499a010";
|
||||
sha256 = "8d73e2361afbf696e6128ffa5e96d9f6a78ff32cb2cb54c727a5be7992be0b31";
|
||||
};
|
||||
|
||||
KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
diff --git a/include/iprt/mangling.h b/include/iprt/mangling.h
|
||||
index 25b918d1..1420ff1d 100644
|
||||
index 991dd9e..defc781 100644
|
||||
--- a/include/iprt/mangling.h
|
||||
+++ b/include/iprt/mangling.h
|
||||
@@ -1695,6 +1695,7 @@
|
||||
@@ -1802,6 +1802,7 @@
|
||||
# define RTPathStripSuffix RT_MANGLER(RTPathStripSuffix)
|
||||
# define RTPathStripFilename RT_MANGLER(RTPathStripFilename)
|
||||
# define RTPathStripTrailingSlash RT_MANGLER(RTPathStripTrailingSlash)
|
||||
@ -10,7 +10,7 @@ index 25b918d1..1420ff1d 100644
|
||||
# define RTPathTemp RT_MANGLER(RTPathTemp)
|
||||
# define RTPathTraverseList RT_MANGLER(RTPathTraverseList)
|
||||
# define RTPathUnlink RT_MANGLER(RTPathUnlink)
|
||||
@@ -1734,6 +1735,7 @@
|
||||
@@ -1842,6 +1843,7 @@
|
||||
# define RTProcGetAffinityMask RT_MANGLER(RTProcGetAffinityMask)
|
||||
# define RTProcGetExecutablePath RT_MANGLER(RTProcGetExecutablePath)
|
||||
# define RTProcGetPriority RT_MANGLER(RTProcGetPriority)
|
||||
@ -19,10 +19,10 @@ index 25b918d1..1420ff1d 100644
|
||||
# define RTProcQueryParent RT_MANGLER(RTProcQueryParent)
|
||||
# define RTProcQueryUsername RT_MANGLER(RTProcQueryUsername)
|
||||
diff --git a/include/iprt/path.h b/include/iprt/path.h
|
||||
index 99060e35..ccfbeb76 100644
|
||||
index 89bf8f6..5caa578 100644
|
||||
--- a/include/iprt/path.h
|
||||
+++ b/include/iprt/path.h
|
||||
@@ -1221,6 +1221,15 @@ RTDECL(int) RTPathCalcRelative(char *pszPathDst, size_t cbPathDst, const char *p
|
||||
@@ -1235,6 +1235,15 @@ RTDECL(int) RTPathCalcRelative(char *pszPathDst, size_t cbPathDst, const char *p
|
||||
*/
|
||||
RTDECL(int) RTPathExecDir(char *pszPath, size_t cchPath);
|
||||
|
||||
@ -39,10 +39,10 @@ index 99060e35..ccfbeb76 100644
|
||||
* Gets the user home directory.
|
||||
*
|
||||
diff --git a/include/iprt/process.h b/include/iprt/process.h
|
||||
index f4f67dd4..ab882a19 100644
|
||||
index 4ca981e..058ae7a 100644
|
||||
--- a/include/iprt/process.h
|
||||
+++ b/include/iprt/process.h
|
||||
@@ -352,6 +352,16 @@ RTR3DECL(const char *) RTProcExecutablePath(void);
|
||||
@@ -384,6 +384,16 @@ RTR3DECL(const char *) RTProcExecutablePath(void);
|
||||
*/
|
||||
RTR3DECL(char *) RTProcGetExecutablePath(char *pszExecPath, size_t cbExecPath);
|
||||
|
||||
@ -60,10 +60,10 @@ index f4f67dd4..ab882a19 100644
|
||||
* Daemonize the current process, making it a background process.
|
||||
*
|
||||
diff --git a/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp b/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp
|
||||
index 75ff8572..18a077b7 100644
|
||||
index e78a397..ff5b541 100644
|
||||
--- a/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp
|
||||
+++ b/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp
|
||||
@@ -1531,9 +1531,9 @@ static int supR3HardenedVerifyFsObject(PCSUPR3HARDENEDFSOBJSTATE pFsObjState, bo
|
||||
@@ -1541,9 +1541,9 @@ static int supR3HardenedVerifyFsObject(PCSUPR3HARDENEDFSOBJSTATE pFsObjState, bo
|
||||
bool fBad = !fRelaxed || pFsObjState->Stat.st_gid != 2 /*bin*/ || suplibHardenedStrCmp(pszPath, "/usr/lib/iconv");
|
||||
# else
|
||||
NOREF(fRelaxed);
|
||||
@ -76,10 +76,10 @@ index 75ff8572..18a077b7 100644
|
||||
"An unknown (and thus untrusted) group has write access to '", pszPath,
|
||||
"' and we therefore cannot trust the directory content or that of any subdirectory");
|
||||
diff --git a/src/VBox/Main/src-all/MachineLaunchVMCommonWorker.cpp b/src/VBox/Main/src-all/MachineLaunchVMCommonWorker.cpp
|
||||
index 2991d3a7..d042a08b 100644
|
||||
index 01d7a9f..e52a291 100644
|
||||
--- a/src/VBox/Main/src-all/MachineLaunchVMCommonWorker.cpp
|
||||
+++ b/src/VBox/Main/src-all/MachineLaunchVMCommonWorker.cpp
|
||||
@@ -90,7 +90,7 @@ int MachineLaunchVMCommonWorker(const Utf8Str &aNameOrId,
|
||||
@@ -100,7 +100,7 @@ int MachineLaunchVMCommonWorker(const Utf8Str &aNameOrId,
|
||||
|
||||
/* Get the path to the executable directory w/ trailing slash: */
|
||||
char szPath[RTPATH_MAX];
|
||||
@ -89,10 +89,10 @@ index 2991d3a7..d042a08b 100644
|
||||
size_t cbBufLeft = RTPathEnsureTrailingSeparator(szPath, sizeof(szPath));
|
||||
AssertReturn(cbBufLeft > 0, VERR_FILENAME_TOO_LONG);
|
||||
diff --git a/src/VBox/Main/src-server/NetworkServiceRunner.cpp b/src/VBox/Main/src-server/NetworkServiceRunner.cpp
|
||||
index 2e57690a..3272c840 100644
|
||||
index 773d27f..874ec2d 100644
|
||||
--- a/src/VBox/Main/src-server/NetworkServiceRunner.cpp
|
||||
+++ b/src/VBox/Main/src-server/NetworkServiceRunner.cpp
|
||||
@@ -188,7 +188,7 @@ int NetworkServiceRunner::start(bool aKillProcessOnStop)
|
||||
@@ -198,7 +198,7 @@ int NetworkServiceRunner::start(bool aKillProcessOnStop)
|
||||
* ASSUME it is relative to the directory that holds VBoxSVC.
|
||||
*/
|
||||
char szExePath[RTPATH_MAX];
|
||||
@ -102,28 +102,28 @@ index 2e57690a..3272c840 100644
|
||||
int vrc = RTPathAppend(szExePath, sizeof(szExePath), m->pszProcName);
|
||||
AssertLogRelRCReturn(vrc, vrc);
|
||||
diff --git a/src/VBox/Main/src-server/generic/NetIf-generic.cpp b/src/VBox/Main/src-server/generic/NetIf-generic.cpp
|
||||
index af155966..3b8e793d 100644
|
||||
index 1e2eb61..893344c 100644
|
||||
--- a/src/VBox/Main/src-server/generic/NetIf-generic.cpp
|
||||
+++ b/src/VBox/Main/src-server/generic/NetIf-generic.cpp
|
||||
@@ -48,7 +48,7 @@ static int NetIfAdpCtl(const char * pcszIfName, const char *pszAddr, const char
|
||||
@@ -62,7 +62,7 @@ static int NetIfAdpCtl(const char * pcszIfName, const char *pszAddr, const char
|
||||
const char *args[] = { NULL, pcszIfName, pszAddr, pszOption, pszMask, NULL };
|
||||
|
||||
char szAdpCtl[RTPATH_MAX];
|
||||
- int rc = RTPathExecDir(szAdpCtl, sizeof(szAdpCtl) - sizeof("/" VBOXNETADPCTL_NAME));
|
||||
+ int rc = RTPathSuidDir(szAdpCtl, sizeof(szAdpCtl) - sizeof("/" VBOXNETADPCTL_NAME));
|
||||
if (RT_FAILURE(rc))
|
||||
- int vrc = RTPathExecDir(szAdpCtl, sizeof(szAdpCtl) - sizeof("/" VBOXNETADPCTL_NAME));
|
||||
+ int vrc = RTPathSuidDir(szAdpCtl, sizeof(szAdpCtl) - sizeof("/" VBOXNETADPCTL_NAME));
|
||||
if (RT_FAILURE(vrc))
|
||||
{
|
||||
LogRel(("NetIfAdpCtl: failed to get program path, rc=%Rrc.\n", rc));
|
||||
@@ -95,7 +95,7 @@ static int NetIfAdpCtl(HostNetworkInterface * pIf, const char *pszAddr, const ch
|
||||
LogRel(("NetIfAdpCtl: failed to get program path, vrc=%Rrc.\n", vrc));
|
||||
@@ -109,7 +109,7 @@ static int NetIfAdpCtl(HostNetworkInterface * pIf, const char *pszAddr, const ch
|
||||
int NetIfAdpCtlOut(const char * pcszName, const char * pcszCmd, char *pszBuffer, size_t cBufSize)
|
||||
{
|
||||
char szAdpCtl[RTPATH_MAX];
|
||||
- int rc = RTPathExecDir(szAdpCtl, sizeof(szAdpCtl) - sizeof("/" VBOXNETADPCTL_NAME " ") - strlen(pcszCmd));
|
||||
+ int rc = RTPathSuidDir(szAdpCtl, sizeof(szAdpCtl) - sizeof("/" VBOXNETADPCTL_NAME " ") - strlen(pcszCmd));
|
||||
if (RT_FAILURE(rc))
|
||||
- int vrc = RTPathExecDir(szAdpCtl, sizeof(szAdpCtl) - sizeof("/" VBOXNETADPCTL_NAME " ") - strlen(pcszCmd));
|
||||
+ int vrc = RTPathSuidDir(szAdpCtl, sizeof(szAdpCtl) - sizeof("/" VBOXNETADPCTL_NAME " ") - strlen(pcszCmd));
|
||||
if (RT_FAILURE(vrc))
|
||||
{
|
||||
LogRel(("NetIfAdpCtlOut: Failed to get program path, rc=%Rrc\n", rc));
|
||||
@@ -210,7 +210,7 @@ int NetIfCreateHostOnlyNetworkInterface(VirtualBox *pVirtualBox,
|
||||
LogRel(("NetIfAdpCtlOut: Failed to get program path, vrc=%Rrc\n", vrc));
|
||||
@@ -224,7 +224,7 @@ int NetIfCreateHostOnlyNetworkInterface(VirtualBox *pVirtualBox,
|
||||
progress.queryInterfaceTo(aProgress);
|
||||
|
||||
char szAdpCtl[RTPATH_MAX];
|
||||
@ -133,10 +133,10 @@ index af155966..3b8e793d 100644
|
||||
{
|
||||
progress->i_notifyComplete(E_FAIL,
|
||||
diff --git a/src/VBox/Runtime/r3/path.cpp b/src/VBox/Runtime/r3/path.cpp
|
||||
index 4b1a0ada..7f6dd707 100644
|
||||
index bcd8deb..46ecd1e 100644
|
||||
--- a/src/VBox/Runtime/r3/path.cpp
|
||||
+++ b/src/VBox/Runtime/r3/path.cpp
|
||||
@@ -81,6 +81,12 @@ RTDECL(int) RTPathExecDir(char *pszPath, size_t cchPath)
|
||||
@@ -91,6 +91,12 @@ RTDECL(int) RTPathExecDir(char *pszPath, size_t cchPath)
|
||||
}
|
||||
|
||||
|
||||
@ -150,10 +150,10 @@ index 4b1a0ada..7f6dd707 100644
|
||||
{
|
||||
#if !defined(RT_OS_WINDOWS) && defined(RTPATH_APP_PRIVATE)
|
||||
diff --git a/src/VBox/Runtime/r3/process.cpp b/src/VBox/Runtime/r3/process.cpp
|
||||
index 5f7c7a87..59461cfa 100644
|
||||
index f9d1ecf..042e599 100644
|
||||
--- a/src/VBox/Runtime/r3/process.cpp
|
||||
+++ b/src/VBox/Runtime/r3/process.cpp
|
||||
@@ -117,6 +117,25 @@ RTR3DECL(const char *) RTProcExecutablePath(void)
|
||||
@@ -127,6 +127,25 @@ RTR3DECL(const char *) RTProcExecutablePath(void)
|
||||
return g_szrtProcExePath;
|
||||
}
|
||||
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
From 9a4523d47efeafd674d419169fe161e5a3b31cb3 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Beich <jbeich@FreeBSD.org>
|
||||
Date: Thu, 3 Jun 2021 17:53:11 +0000
|
||||
Subject: [PATCH 1/3] view: chase swaywm/wlroots@9e58301df7f0
|
||||
|
||||
view.c:238:52: error: no member named 'subsurfaces' in 'struct wlr_surface'
|
||||
wl_list_for_each (subsurface, &view->wlr_surface->subsurfaces, parent_link) {
|
||||
~~~~~~~~~~~~~~~~~ ^
|
||||
/usr/include/wayland-util.h:443:30: note: expanded from macro 'wl_list_for_each'
|
||||
for (pos = wl_container_of((head)->next, pos, member); \
|
||||
^~~~
|
||||
/usr/include/wayland-util.h:409:32: note: expanded from macro 'wl_container_of'
|
||||
(__typeof__(sample))((char *)(ptr) - \
|
||||
^~~
|
||||
|
||||
Based on https://github.com/swaywm/sway/commit/3162766eef14
|
||||
---
|
||||
view.c | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/view.c b/view.c
|
||||
index b9ba9c2..3f3b0ed 100644
|
||||
--- a/view.c
|
||||
+++ b/view.c
|
||||
@@ -235,7 +235,10 @@ view_map(struct cg_view *view, struct wlr_surface *surface)
|
||||
view->wlr_surface = surface;
|
||||
|
||||
struct wlr_subsurface *subsurface;
|
||||
- wl_list_for_each (subsurface, &view->wlr_surface->subsurfaces, parent_link) {
|
||||
+ wl_list_for_each (subsurface, &view->wlr_surface->subsurfaces_below, parent_link) {
|
||||
+ subsurface_create(view, subsurface);
|
||||
+ }
|
||||
+ wl_list_for_each (subsurface, &view->wlr_surface->subsurfaces_above, parent_link) {
|
||||
subsurface_create(view, subsurface);
|
||||
}
|
||||
|
||||
@ -3,14 +3,14 @@
|
||||
let
|
||||
generator = pkgsBuildBuild.buildGoModule rec {
|
||||
pname = "v2ray-domain-list-community";
|
||||
version = "20230517022917";
|
||||
version = "20230601044045";
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "domain-list-community";
|
||||
rev = version;
|
||||
hash = "sha256-oRmVJyDfdJhAdF9nJrJs2SjoUs1pr39/xcCps5d3WyM=";
|
||||
hash = "sha256-AVJinqMaVIxq6Tne1b5N6yuszLQ0sgmAtH+sd+sbInA=";
|
||||
};
|
||||
vendorHash = "sha256-zkf2neI1HiPkCrcw+cYoZ2L/OGkM8HPIv5gUqc05Wak=";
|
||||
vendorHash = "sha256-lPOn296ngMCYdXoGNDG9okkLC5ryjKIL+UP98lyaKcg=";
|
||||
meta = with lib; {
|
||||
description = "community managed domain list";
|
||||
homepage = "https://github.com/v2fly/domain-list-community";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "v2ray-geoip";
|
||||
version = "202305250042";
|
||||
version = "202306010100";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "geoip";
|
||||
rev = "e63c89ce477577a720eda422c6c04ba241a36021";
|
||||
sha256 = "sha256-Jv/QZyoMe/kSz/hdlwhfgQzCJGOH6Oypn6HU1SRPTis=";
|
||||
rev = "d8faa6ba0754c083a89898610942d1d1d978ef7f";
|
||||
sha256 = "sha256-Aumk+YPsxZl3F/DQv6w0rE5f5hduLNYApCKQIvRUSIw=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -97,8 +97,6 @@ stdenv.mkDerivation {
|
||||
substituteInPlace cmake/builtin-config-ix.cmake \
|
||||
--replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)'
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace cmake/builtin-config-ix.cmake \
|
||||
--replace 'set(ARM64 arm64 arm64e)' 'set(ARM64)'
|
||||
substituteInPlace cmake/config-ix.cmake \
|
||||
--replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
|
||||
'' + lib.optionalString (useLLVM) ''
|
||||
|
||||
@ -1,199 +1,243 @@
|
||||
{ lib
|
||||
{ rocfft
|
||||
, lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, rocmUpdateScript
|
||||
, runCommand
|
||||
, cmake
|
||||
, rocm-cmake
|
||||
, rocrand
|
||||
, hip
|
||||
, openmp
|
||||
, sqlite
|
||||
, python3
|
||||
, gtest
|
||||
, rocm-cmake
|
||||
, sqlite
|
||||
, boost
|
||||
, fftw
|
||||
, fftwFloat
|
||||
, buildTests ? false
|
||||
, buildBenchmarks ? false
|
||||
, gtest
|
||||
, openmp
|
||||
, rocrand
|
||||
# NOTE: Update the default GPU targets on every update
|
||||
, gpuTargets ? [
|
||||
"gfx803"
|
||||
"gfx900"
|
||||
"gfx906"
|
||||
"gfx908"
|
||||
"gfx90a"
|
||||
"gfx1030"
|
||||
"gfx1100"
|
||||
"gfx1102"
|
||||
]
|
||||
}:
|
||||
|
||||
let
|
||||
name-zero = "librocfft-device-0.so.0.1";
|
||||
name-one = "librocfft-device-1.so.0.1";
|
||||
name-two = "librocfft-device-2.so.0.1";
|
||||
name-three = "librocfft-device-3.so.0.1";
|
||||
# To avoid output limit exceeded errors in hydra, we build kernel
|
||||
# device libs and the kernel RTC cache database in separate derivations
|
||||
kernelDeviceLibs = map
|
||||
(target:
|
||||
(rocfft.overrideAttrs (prevAttrs: {
|
||||
pname = "rocfft-device-${target}";
|
||||
|
||||
# This is over 3GB, to allow hydra caching we separate it
|
||||
rf = stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rocfft";
|
||||
version = "5.4.3";
|
||||
patches = prevAttrs.patches ++ [
|
||||
# Add back install rule for device library
|
||||
# This workaround is needed because rocm_install_targets
|
||||
# doesn't support an EXCLUDE_FROM_ALL option
|
||||
./device-install.patch
|
||||
];
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"libzero"
|
||||
"libone"
|
||||
"libtwo"
|
||||
"libthree"
|
||||
] ++ lib.optionals buildTests [
|
||||
"test"
|
||||
] ++ lib.optionals buildBenchmarks [
|
||||
"benchmark"
|
||||
];
|
||||
buildFlags = [ "rocfft-device-${target}" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ROCmSoftwarePlatform";
|
||||
repo = "rocFFT";
|
||||
rev = "rocm-${finalAttrs.version}";
|
||||
hash = "sha256-FsefE0B2hF5ZcHDB6TscwFeZ1NKFkWX7VDpEvvbDbOk=";
|
||||
};
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
cmake --install . --component device
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
rocm-cmake
|
||||
hip
|
||||
];
|
||||
requiredSystemFeatures = [ "big-parallel" ];
|
||||
})).override {
|
||||
gpuTargets = [ target ];
|
||||
}
|
||||
)
|
||||
gpuTargets;
|
||||
|
||||
buildInputs = [
|
||||
sqlite
|
||||
python3
|
||||
] ++ lib.optionals buildTests [
|
||||
gtest
|
||||
] ++ lib.optionals (buildTests || buildBenchmarks) [
|
||||
rocrand
|
||||
boost
|
||||
fftw
|
||||
fftwFloat
|
||||
openmp
|
||||
];
|
||||
# TODO: Figure out how to also split this by GPU target
|
||||
#
|
||||
# It'll be bit more complicated than what we're doing for the kernel
|
||||
# device libs, because the kernel cache needs to be compiled into
|
||||
# one sqlite database (whereas the device libs can be linked into
|
||||
# rocfft as separate libraries for each GPU target).
|
||||
#
|
||||
# It's not clear why this needs to even be a db in the first place.
|
||||
# It would simplify things A LOT if we could just store these
|
||||
# pre-compiled kernels as files (but that'd need a lot of patching).
|
||||
kernelRtcCache = rocfft.overrideAttrs (_: {
|
||||
pname = "rocfft-kernel-cache";
|
||||
|
||||
propagatedBuildInputs = lib.optionals buildTests [
|
||||
fftw
|
||||
fftwFloat
|
||||
];
|
||||
buildFlags = [ "rocfft_kernel_cache_target" ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_C_COMPILER=hipcc"
|
||||
"-DCMAKE_CXX_COMPILER=hipcc"
|
||||
"-DUSE_HIP_CLANG=ON"
|
||||
"-DSQLITE_USE_SYSTEM_PACKAGE=ON"
|
||||
# Manually define CMAKE_INSTALL_<DIR>
|
||||
# See: https://github.com/NixOS/nixpkgs/pull/197838
|
||||
"-DCMAKE_INSTALL_BINDIR=bin"
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||
"-DCMAKE_INSTALL_INCLUDEDIR=include"
|
||||
] ++ lib.optionals buildTests [
|
||||
"-DBUILD_CLIENTS_TESTS=ON"
|
||||
] ++ lib.optionals buildBenchmarks [
|
||||
"-DBUILD_CLIENTS_RIDER=ON"
|
||||
"-DBUILD_CLIENTS_SAMPLES=ON"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/lib/${name-zero} $libzero
|
||||
mv $out/lib/${name-one} $libone
|
||||
mv $out/lib/${name-two} $libtwo
|
||||
mv $out/lib/${name-three} $libthree
|
||||
ln -s $libzero $out/lib/${name-zero}
|
||||
ln -s $libone $out/lib/${name-one}
|
||||
ln -s $libtwo $out/lib/${name-two}
|
||||
ln -s $libthree $out/lib/${name-three}
|
||||
'' + lib.optionalString buildTests ''
|
||||
mkdir -p $test/{bin,lib/fftw}
|
||||
cp -a $out/bin/* $test/bin
|
||||
ln -s ${fftw}/lib/libfftw*.so $test/lib/fftw
|
||||
ln -s ${fftwFloat}/lib/libfftw*.so $test/lib/fftw
|
||||
rm -r $out/lib/fftw
|
||||
rm $test/bin/{rocfft_rtc_helper,*-rider} || true
|
||||
'' + lib.optionalString buildBenchmarks ''
|
||||
mkdir -p $benchmark/bin
|
||||
cp -a $out/bin/* $benchmark/bin
|
||||
rm $benchmark/bin/{rocfft_rtc_helper,*-test} || true
|
||||
'' + lib.optionalString (buildTests || buildBenchmarks ) ''
|
||||
mv $out/bin/rocfft_rtc_helper $out
|
||||
rm -r $out/bin/*
|
||||
mv $out/rocfft_rtc_helper $out/bin
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
cmake --install . --component kernel_cache
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = rocmUpdateScript {
|
||||
requiredSystemFeatures = [ "big-parallel" ];
|
||||
});
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rocfft";
|
||||
version = "5.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ROCmSoftwarePlatform";
|
||||
repo = "rocFFT";
|
||||
rev = "rocm-${finalAttrs.version}";
|
||||
hash = "sha256-FsefE0B2hF5ZcHDB6TscwFeZ1NKFkWX7VDpEvvbDbOk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Exclude kernel compilation & installation from "all" target,
|
||||
# and split device libraries by GPU target
|
||||
./split-kernel-compilation.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
hip
|
||||
python3
|
||||
rocm-cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
sqlite
|
||||
] ++ lib.optionals (finalAttrs.pname == "rocfft") kernelDeviceLibs;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_C_COMPILER=hipcc"
|
||||
"-DCMAKE_CXX_COMPILER=hipcc"
|
||||
"-DUSE_HIP_CLANG=ON"
|
||||
"-DSQLITE_USE_SYSTEM_PACKAGE=ON"
|
||||
# Manually define CMAKE_INSTALL_<DIR>
|
||||
# See: https://github.com/NixOS/nixpkgs/pull/197838
|
||||
"-DCMAKE_INSTALL_BINDIR=bin"
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||
"-DCMAKE_INSTALL_INCLUDEDIR=include"
|
||||
"-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString (finalAttrs.pname == "rocfft") ''
|
||||
ln -s ${kernelRtcCache}/lib/rocfft_kernel_cache.db "$out/lib"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
test = stdenv.mkDerivation {
|
||||
pname = "${finalAttrs.pname}-test";
|
||||
inherit (finalAttrs) version src;
|
||||
|
||||
sourceRoot = "source/clients/tests";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
hip
|
||||
rocm-cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
fftw
|
||||
fftwFloat
|
||||
finalAttrs.finalPackage
|
||||
gtest
|
||||
openmp
|
||||
rocrand
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_C_COMPILER=hipcc"
|
||||
"-DCMAKE_CXX_COMPILER=hipcc"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
rm -r "$out/lib/fftw"
|
||||
rmdir "$out/lib"
|
||||
'';
|
||||
};
|
||||
|
||||
benchmark = stdenv.mkDerivation {
|
||||
pname = "${finalAttrs.pname}-benchmark";
|
||||
inherit (finalAttrs) version src;
|
||||
|
||||
sourceRoot = "source/clients/rider";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
hip
|
||||
rocm-cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
finalAttrs.finalPackage
|
||||
openmp
|
||||
(python3.withPackages (ps: with ps; [
|
||||
pandas
|
||||
scipy
|
||||
]))
|
||||
rocrand
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_C_COMPILER=hipcc"
|
||||
"-DCMAKE_CXX_COMPILER=hipcc"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
cp -a ../../../scripts/perf "$out/bin"
|
||||
'';
|
||||
};
|
||||
|
||||
samples = stdenv.mkDerivation {
|
||||
pname = "${finalAttrs.pname}-samples";
|
||||
inherit (finalAttrs) version src;
|
||||
|
||||
sourceRoot = "source/clients/samples";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
hip
|
||||
rocm-cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
finalAttrs.finalPackage
|
||||
openmp
|
||||
rocrand
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_C_COMPILER=hipcc"
|
||||
"-DCMAKE_CXX_COMPILER=hipcc"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir "$out"
|
||||
cp -a bin "$out"
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
|
||||
updateScript = rocmUpdateScript {
|
||||
name = finalAttrs.pname;
|
||||
owner = finalAttrs.src.owner;
|
||||
repo = finalAttrs.src.repo;
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "FFT implementation for ROCm ";
|
||||
homepage = "https://github.com/ROCmSoftwarePlatform/rocFFT";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = teams.rocm.members;
|
||||
platforms = platforms.linux;
|
||||
broken = versions.minor finalAttrs.version != versions.minor hip.version;
|
||||
};
|
||||
});
|
||||
|
||||
rf-zero = runCommand name-zero { preferLocalBuild = true; } ''
|
||||
cp -a ${rf.libzero} $out
|
||||
'';
|
||||
|
||||
rf-one = runCommand name-one { preferLocalBuild = true; } ''
|
||||
cp -a ${rf.libone} $out
|
||||
'';
|
||||
|
||||
rf-two = runCommand name-two { preferLocalBuild = true; } ''
|
||||
cp -a ${rf.libtwo} $out
|
||||
'';
|
||||
|
||||
rf-three = runCommand name-three { preferLocalBuild = true; } ''
|
||||
cp -a ${rf.libthree} $out
|
||||
'';
|
||||
in stdenv.mkDerivation {
|
||||
inherit (rf) pname version src passthru meta;
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
] ++ lib.optionals buildTests [
|
||||
"test"
|
||||
] ++ lib.optionals buildBenchmarks [
|
||||
"benchmark"
|
||||
];
|
||||
|
||||
dontUnpack = true;
|
||||
dontPatch = true;
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/lib
|
||||
ln -sf ${rf-zero} $out/lib/${name-zero}
|
||||
ln -sf ${rf-one} $out/lib/${name-one}
|
||||
ln -sf ${rf-two} $out/lib/${name-two}
|
||||
ln -sf ${rf-three} $out/lib/${name-three}
|
||||
cp -an ${rf}/* $out
|
||||
'' + lib.optionalString buildTests ''
|
||||
cp -a ${rf.test} $test
|
||||
'' + lib.optionalString buildBenchmarks ''
|
||||
cp -a ${rf.benchmark} $benchmark
|
||||
'' + ''
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# Fix paths
|
||||
preFixup = ''
|
||||
substituteInPlace $out/include/*.h $out/rocfft/include/*.h \
|
||||
--replace "${rf}" "$out"
|
||||
|
||||
patchelf --set-rpath \
|
||||
$(patchelf --print-rpath $out/lib/librocfft.so | sed 's,${rf}/lib,'"$out/lib"',') \
|
||||
$out/lib/librocfft.so
|
||||
'' + lib.optionalString buildTests ''
|
||||
patchelf --set-rpath \
|
||||
$(patchelf --print-rpath $test/bin/rocfft-test | sed 's,${rf}/lib,'"$out/lib"',') \
|
||||
$test/bin/rocfft-test
|
||||
'' + lib.optionalString buildBenchmarks ''
|
||||
patchelf --set-rpath \
|
||||
$(patchelf --print-rpath $benchmark/bin/rocfft-rider | sed 's,${rf}/lib,'"$out/lib"',') \
|
||||
$benchmark/bin/rocfft-rider
|
||||
'';
|
||||
}
|
||||
meta = with lib; {
|
||||
description = "FFT implementation for ROCm";
|
||||
homepage = "https://github.com/ROCmSoftwarePlatform/rocFFT";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ kira-bruneau ] ++ teams.rocm.members;
|
||||
platforms = platforms.linux;
|
||||
broken = versions.minor finalAttrs.version != versions.minor hip.version;
|
||||
};
|
||||
})
|
||||
|
||||
15
pkgs/development/libraries/rocfft/device-install.patch
Normal file
15
pkgs/development/libraries/rocfft/device-install.patch
Normal file
@ -0,0 +1,15 @@
|
||||
diff --git a/library/src/device/CMakeLists.txt b/library/src/device/CMakeLists.txt
|
||||
index 73a8ec9..9bfd4b8 100644
|
||||
--- a/library/src/device/CMakeLists.txt
|
||||
+++ b/library/src/device/CMakeLists.txt
|
||||
@@ -255,4 +255,10 @@ foreach( sub ${AMDGPU_TARGETS} )
|
||||
if( NOT BUILD_SHARED_LIBS )
|
||||
set_target_properties( rocfft-device-${sub} PROPERTIES PREFIX "lib" )
|
||||
endif( )
|
||||
+
|
||||
+ rocm_install_targets(
|
||||
+ TARGETS
|
||||
+ rocfft-device-${sub}
|
||||
+ COMPONENT device
|
||||
+ )
|
||||
endforeach()
|
||||
124
pkgs/development/libraries/rocfft/split-kernel-compilation.patch
Normal file
124
pkgs/development/libraries/rocfft/split-kernel-compilation.patch
Normal file
@ -0,0 +1,124 @@
|
||||
diff --git a/library/src/CMakeLists.txt b/library/src/CMakeLists.txt
|
||||
index 3a16304..606b711 100644
|
||||
--- a/library/src/CMakeLists.txt
|
||||
+++ b/library/src/CMakeLists.txt
|
||||
@@ -250,12 +250,12 @@ foreach( target
|
||||
|
||||
endforeach()
|
||||
|
||||
-add_executable( rocfft_aot_helper
|
||||
+add_executable( rocfft_aot_helper EXCLUDE_FROM_ALL
|
||||
rocfft_aot_helper.cpp
|
||||
rocfft_stub.cpp
|
||||
)
|
||||
|
||||
-add_executable( rocfft_config_search
|
||||
+add_executable( rocfft_config_search EXCLUDE_FROM_ALL
|
||||
rocfft_config_search.cpp
|
||||
rocfft_stub.cpp
|
||||
)
|
||||
@@ -279,10 +279,10 @@ endif()
|
||||
|
||||
target_link_libraries( rocfft PRIVATE ${ROCFFT_DEVICE_LINK_LIBS} )
|
||||
|
||||
-target_link_libraries( rocfft PRIVATE rocfft-device-0 )
|
||||
-target_link_libraries( rocfft PRIVATE rocfft-device-1 )
|
||||
-target_link_libraries( rocfft PRIVATE rocfft-device-2 )
|
||||
-target_link_libraries( rocfft PRIVATE rocfft-device-3 )
|
||||
+foreach( sub ${AMDGPU_TARGETS} )
|
||||
+ target_link_libraries( rocfft PRIVATE -lrocfft-device-${sub} )
|
||||
+endforeach()
|
||||
+
|
||||
foreach( target rocfft rocfft_aot_helper rocfft_config_search )
|
||||
# RTC uses dladdr to find the RTC helper program
|
||||
if( NOT WIN32 )
|
||||
@@ -347,7 +347,7 @@ add_custom_command(
|
||||
DEPENDS rocfft_aot_helper rocfft_rtc_helper
|
||||
COMMENT "Compile kernels into shipped cache file"
|
||||
)
|
||||
-add_custom_target( rocfft_kernel_cache_target ALL
|
||||
+add_custom_target( rocfft_kernel_cache_target
|
||||
DEPENDS rocfft_kernel_cache.db
|
||||
VERBATIM
|
||||
)
|
||||
@@ -392,7 +392,8 @@ else()
|
||||
endif()
|
||||
rocm_install(FILES ${ROCFFT_KERNEL_CACHE_PATH}
|
||||
DESTINATION "${ROCFFT_KERNEL_CACHE_INSTALL_DIR}"
|
||||
- COMPONENT runtime
|
||||
+ COMPONENT kernel_cache
|
||||
+ EXCLUDE_FROM_ALL
|
||||
)
|
||||
|
||||
# PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
|
||||
diff --git a/library/src/device/CMakeLists.txt b/library/src/device/CMakeLists.txt
|
||||
index 9f7b85f..73a8ec9 100644
|
||||
--- a/library/src/device/CMakeLists.txt
|
||||
+++ b/library/src/device/CMakeLists.txt
|
||||
@@ -170,11 +170,11 @@ list( SORT rocfft_device_source )
|
||||
# functions callable by rocFFT and depends on amdhip64, and another
|
||||
# one usable by AOT RTC that contains no device code
|
||||
list( FILTER rocfft_device_source EXCLUDE REGEX function_pool.cpp )
|
||||
-add_library( rocfft-function-pool OBJECT
|
||||
+add_library( rocfft-function-pool OBJECT EXCLUDE_FROM_ALL
|
||||
function_pool.cpp
|
||||
)
|
||||
target_compile_definitions( rocfft-function-pool PRIVATE FUNCTION_POOL_STANDALONE_BODY= )
|
||||
-add_library( rocfft-function-pool-standalone OBJECT
|
||||
+add_library( rocfft-function-pool-standalone OBJECT EXCLUDE_FROM_ALL
|
||||
function_pool.cpp
|
||||
)
|
||||
target_compile_definitions( rocfft-function-pool-standalone PRIVATE FUNCTION_POOL_STANDALONE_BODY={} )
|
||||
@@ -193,26 +193,15 @@ foreach( pool rocfft-function-pool rocfft-function-pool-standalone )
|
||||
add_dependencies(${pool} gen_headers_target)
|
||||
endforeach()
|
||||
|
||||
-list( LENGTH rocfft_device_source rocfft_device_source_len )
|
||||
-math(EXPR split_len "${rocfft_device_source_len} / 4")
|
||||
-math(EXPR split_idx_2 "${rocfft_device_source_len} / 4 * 2")
|
||||
-math(EXPR split_idx_3 "${rocfft_device_source_len} / 4 * 3")
|
||||
-
|
||||
-list( SUBLIST rocfft_device_source 0 ${split_len} rocfft_device_source_0 )
|
||||
-list( SUBLIST rocfft_device_source ${split_len} ${split_len} rocfft_device_source_1 )
|
||||
-list( SUBLIST rocfft_device_source ${split_idx_2} ${split_len} rocfft_device_source_2 )
|
||||
-list( SUBLIST rocfft_device_source ${split_idx_3} -1 rocfft_device_source_3 )
|
||||
-
|
||||
-foreach( sub RANGE 3 )
|
||||
- set( rocfft_device_source_var rocfft_device_source_${sub} )
|
||||
+foreach( sub ${AMDGPU_TARGETS} )
|
||||
if(NOT SINGLELIB)
|
||||
- add_library( rocfft-device-${sub}
|
||||
- ${${rocfft_device_source_var}} )
|
||||
+ add_library( rocfft-device-${sub} EXCLUDE_FROM_ALL
|
||||
+ ${rocfft_device_source} )
|
||||
else()
|
||||
# Compile the device lib as a static library, which is then linked
|
||||
# into librocfft.so Useful for testing purposes.
|
||||
- add_library( rocfft-device-${sub} STATIC
|
||||
- ${${rocfft_device_source_var}} )
|
||||
+ add_library( rocfft-device-${sub} STATIC EXCLUDE_FROM_ALL
|
||||
+ ${rocfft_device_source} )
|
||||
|
||||
# if we're building singlelib, we don't want to export any of the
|
||||
# device library symbols to the main library
|
||||
@@ -241,9 +230,7 @@ foreach( sub RANGE 3 )
|
||||
# Set AMD GPU architecture options
|
||||
|
||||
# Enable compilation of desired architectures
|
||||
- foreach( target ${AMDGPU_TARGETS} )
|
||||
- target_compile_options( rocfft-device-${sub} PRIVATE --offload-arch=${target} )
|
||||
- endforeach( )
|
||||
+ target_compile_options( rocfft-device-${sub} PRIVATE --offload-arch=${sub} )
|
||||
|
||||
target_include_directories( rocfft-device-${sub}
|
||||
PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
|
||||
@@ -268,9 +255,4 @@ foreach( sub RANGE 3 )
|
||||
if( NOT BUILD_SHARED_LIBS )
|
||||
set_target_properties( rocfft-device-${sub} PROPERTIES PREFIX "lib" )
|
||||
endif( )
|
||||
-
|
||||
- rocm_install_targets(
|
||||
- TARGETS
|
||||
- rocfft-device-${sub}
|
||||
- )
|
||||
endforeach()
|
||||
31
pkgs/development/libraries/tcl-fcgi/default.nix
Normal file
31
pkgs/development/libraries/tcl-fcgi/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ lib, fetchFromGitHub, tcl, tclx }:
|
||||
|
||||
tcl.mkTclDerivation rec {
|
||||
pname = "tcl-fcgi";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mpcjanssen";
|
||||
repo = "tcl-fcgi";
|
||||
rev = "62452dbf3177ba9458fbb42457834ca77bdf5a82";
|
||||
sha256 = "sha256-RLuV4ARmGWCJTmhs7DbMWENQGj3d5ZXWb821WrgG0qA=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
tclx
|
||||
];
|
||||
|
||||
unpackPhase = ''
|
||||
mkdir -p $out/lib/tcl-fcgi
|
||||
cp -r $src/tcl-src/* $out/lib/tcl-fcgi/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/mpcjanssen/tcl-fcgi";
|
||||
description = "Tcl interface for the FastCGI protocol";
|
||||
license = licenses.bsd2;
|
||||
platforms = tclx.meta.platforms;
|
||||
maintainers = with maintainers; [ nat-418 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
}
|
||||
else {
|
||||
- if ( $Config{archname} =~ /^x86_64|^ppc64|^s390x|^aarch64|^riscv64/ ) {
|
||||
+ if ( $Config{archname} =~ /^x86_64|^ppc64|^s390x|^riscv64/ ) {
|
||||
+ if ( 0 ) {
|
||||
$libdir =~ s/\bbin\b/lib64/;
|
||||
if ( !-d $libdir ) {
|
||||
my $test = $libdir;
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cwl-upgrader";
|
||||
version = "1.2.7";
|
||||
version = "1.2.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "common-workflow-language";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-/vCvpRpQkdMkqlK5/0jJTY56ROoB4ezvX9ma1AVWYd4=";
|
||||
hash = "sha256-DwXwzhsv92t6PU4emmG7xlIU7uj3rcHh4+o9NqBMA+A=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-vite";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
owner = "MrBin99";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-yRZA5CDkJbQt7aSVL7V90Z+0jAqh7JC/d8pLSI/yexk=";
|
||||
hash = "sha256-MKAzNtmFue7MrYtg5sOXog1u1daJwh3t98aIUSyyfBQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ffmpeg-progress-yield";
|
||||
version = "0.7.4";
|
||||
version = "0.7.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-gBWkoR0cJdcWShX9aIDt6DpK1dkT9bfvgnrgXGgZPSQ=";
|
||||
hash = "sha256-muauX4Mq58ew9lGPE0H+bu4bqPydNADLocujjy6qRh4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ colorama tqdm ];
|
||||
|
||||
@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-redis";
|
||||
version = "2.12.1";
|
||||
version = "2.13.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-gQ3xG2QcnrSvl1hsvlcY9g77JW8fFk/Pci01tNqpAUs=";
|
||||
hash = "sha256-BKDbtyn1wnzTXM6B7lgUCe17NLB9yaj1XhMbP4zE3Qo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "2023.5.2";
|
||||
version = "2023.6.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-4P4ACoXapx1FzUWGCFu8U4iBTG0fUjLTlJXF2HzKyQg=";
|
||||
hash = "sha256-xpkQSQGwf4RZHKwLdrOLW4yzECKY1vwxHYo+o3eOrhE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -22,14 +22,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-heatclient";
|
||||
version = "3.2.0";
|
||||
version = "3.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-LYjRjDeZp7LQeQFXLogyGy4LEgawTQED+5qRu799tWM=";
|
||||
hash = "sha256-opBb9Zf60kgMtBNis2c+22VGS7psFEDPYvlz7WyKIHs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
45
pkgs/development/python-modules/sdkmanager/default.nix
Normal file
45
pkgs/development/python-modules/sdkmanager/default.nix
Normal file
@ -0,0 +1,45 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitLab
|
||||
, pythonOlder
|
||||
, argcomplete
|
||||
, requests
|
||||
, gnupg
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sdkmanager";
|
||||
version = "0.6.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "fdroid";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-EQ24OjQZr42C1PFtIXr4yFzYb/M4Tatqu8Zo+9dgtEE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
argcomplete
|
||||
requests
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/sdkmanager \
|
||||
--suffix PATH : ${lib.makeBinPath [ gnupg ]}
|
||||
'';
|
||||
|
||||
# has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "sdkmanager" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://gitlab.com/fdroid/sdkmanager";
|
||||
description = "A drop-in replacement for sdkmanager from the Android SDK written in Python";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ linsui ];
|
||||
};
|
||||
}
|
||||
@ -22,14 +22,14 @@ with py.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.3.267";
|
||||
version = "2.3.273";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-tqVNjabONdC/xL/tHMyPIXKjKk/3cWuchKAr9lE7S1g=";
|
||||
hash = "sha256-yGw0UjXFa/zxSddJzObUlO1s8v0ChBQK/+yZHNDfQb0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cirrus-cli";
|
||||
version = "0.99.0";
|
||||
version = "0.100.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cirruslabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ekNdifSAwB2w5xys1B4eexgqlXwpkkvxJ6FQNTkIQEw=";
|
||||
sha256 = "sha256-dUp0jmw4b+uzlhiFZ4IQLqgrPn03BSWh9mBP/cJ6idA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-BtcuqdVOOBG/yPdKaj+8nCvg050F/s/davblLUval+o=";
|
||||
vendorHash = "sha256-IWZnenOY4//iSFFBnRDJBSj8Vm2uh3XDAh3gaI1OXjA=";
|
||||
|
||||
ldflags = [
|
||||
"-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}"
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "datree";
|
||||
version = "1.9.2";
|
||||
version = "1.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "datreeio";
|
||||
repo = "datree";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-yE2HrFhmiYriIgmYumcIQ6/ptr6m44Lm7wrfaeu8CeU=";
|
||||
hash = "sha256-tf/1BJ23EpFjdHYNQJMben6CEAsZ9cvLoyI6BVn6roo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ECVKofvmLuFAFvncq63hYUaYW8/2+F4gZr8wIGQyrdU=";
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "doctl";
|
||||
version = "1.96.0";
|
||||
version = "1.96.1";
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -31,7 +31,7 @@ buildGoModule rec {
|
||||
owner = "digitalocean";
|
||||
repo = "doctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-UptiVsT7pLOcJ4kXDnXiwpuloGKTY4AZMIxSYllfuUo=";
|
||||
sha256 = "sha256-COkD0YFij07mHpkeJSnZXLaB9olZGBN/HpFb06ag4Rs=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ lib, stdenv, runtimeShell, writeText, fetchFromGitHub, gradle_7, openjdk17, git, perl, cmake }:
|
||||
let
|
||||
pname = "fastddsgen";
|
||||
version = "2.3.0";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eProsima";
|
||||
repo = "Fast-DDS-Gen";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-lxMv1hXjHFslJts63/FJPjj0mAKTluY/pNTvf15Oo9o=";
|
||||
hash = "sha256-CSlimEShTxjr6II9YSuNFc/pdbMmqVMCQA0ZJ9rl5j8=";
|
||||
};
|
||||
|
||||
gradle = gradle_7;
|
||||
@ -35,7 +35,7 @@ let
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "sha256-wnnoyaO1QndAYrqmYu1fO6OJrP1NQs8IX4uh37dVntY=";
|
||||
outputHash = "sha256-ZGWTK665wIX/Biz4JDrbaU4EZNqT7Q8o6DSpziUd/SM=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
||||
@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "pylyzer";
|
||||
version = "0.0.29";
|
||||
version = "0.0.30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mtshiba";
|
||||
repo = "pylyzer";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9oZAkbA/KCP0fIzsC91xTrEnqiID1knxvY7Y2syfK+o=";
|
||||
hash = "sha256-o90NmUTRdmfjOO0swc4d3SsbywiMeT1zKrkiFO3VeGk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-MRoCPoxv8mhoxty04f5aLVgb0U4WEmkRWZmCOy9zTf0=";
|
||||
cargoHash = "sha256-IUNT30hKpBlmXoHiJQihQF4oD7odSJh2NK3d2On1WQA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
git
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
version = "0.6.5";
|
||||
version = "0.6.6";
|
||||
pname = "bun";
|
||||
|
||||
src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
|
||||
@ -33,19 +33,19 @@ stdenvNoCC.mkDerivation rec {
|
||||
sources = {
|
||||
"aarch64-darwin" = fetchurl {
|
||||
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip";
|
||||
sha256 = "NZU2C1zve8nBTKhk3DpeuEL4aY9Qk+3UnGzH6F7i0hY=";
|
||||
sha256 = "7nOxN+DMGytkmT/VhC//r/endE4tT7qktwr1hoBAWXg=";
|
||||
};
|
||||
"aarch64-linux" = fetchurl {
|
||||
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip";
|
||||
sha256 = "qC4WbrxD7s9PexQruUpHp8AgDmDLl7cguR4rTurFB9c=";
|
||||
sha256 = "kqAe6ZgUcHMzxYOYdO5sLbuJzRqHGjFizkTxkfGr1ho=";
|
||||
};
|
||||
"x86_64-darwin" = fetchurl {
|
||||
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip";
|
||||
sha256 = "G7vCZOoeE0YtW4Ha4yW8DboIQUxIjdEh43Om5iH+B1M=";
|
||||
sha256 = "UDJyOhS4Q0U7u8JW1kbrZ29zGlPyE2UH17ZBis2SOFQ=";
|
||||
};
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip";
|
||||
sha256 = "Coz+NyX6YBS6NEzzcXoVa9ArBJxD7LhxpT+2Q1rNmYs=";
|
||||
sha256 = "oYSYmmYOKF4XYbdpXZnOgVBjyU3L7LRTjSG+RfU+I5w=";
|
||||
};
|
||||
};
|
||||
updateScript = writeShellScript "update-bun" ''
|
||||
|
||||
@ -1,28 +1,61 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, nixosTests
|
||||
, boost, yaml-cpp, libsodium, sqlite, protobuf, openssl, systemd
|
||||
, mariadb-connector-c, postgresql, lua, openldap, geoip, curl, unixODBC, lmdb, tinycdb
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, nixosTests
|
||||
, boost
|
||||
, yaml-cpp
|
||||
, libsodium
|
||||
, sqlite
|
||||
, protobuf
|
||||
, openssl
|
||||
, systemd
|
||||
, mariadb-connector-c
|
||||
, postgresql
|
||||
, lua
|
||||
, openldap
|
||||
, geoip
|
||||
, curl
|
||||
, unixODBC
|
||||
, lmdb
|
||||
, tinycdb
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pdns";
|
||||
version = "4.7.4";
|
||||
version = "4.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.powerdns.com/releases/pdns-${version}.tar.bz2";
|
||||
hash = "sha256-dGndgft98RGX9JY4+knO/5+XMiX8j5xxYLC/wAoudHE=";
|
||||
url = "https://downloads.powerdns.com/releases/pdns-${finalAttrs.version}.tar.bz2";
|
||||
hash = "sha256-YalruviwykmpIloiVLlEPE/44FDTN0N9ha9N6InhASc=";
|
||||
};
|
||||
# redact configure flags from version output to reduce closure size
|
||||
patches = [ ./version.patch ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
boost mariadb-connector-c postgresql lua openldap sqlite protobuf geoip
|
||||
yaml-cpp libsodium curl unixODBC openssl systemd lmdb tinycdb
|
||||
boost
|
||||
mariadb-connector-c
|
||||
postgresql
|
||||
lua
|
||||
openldap
|
||||
sqlite
|
||||
protobuf
|
||||
geoip
|
||||
yaml-cpp
|
||||
libsodium
|
||||
curl
|
||||
unixODBC
|
||||
openssl
|
||||
systemd
|
||||
lmdb
|
||||
tinycdb
|
||||
];
|
||||
|
||||
# Configure phase requires 64-bit time_t even on 32-bit platforms.
|
||||
env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.is32bit [
|
||||
"-D_TIME_BITS=64" "-D_FILE_OFFSET_BITS=64"
|
||||
"-D_TIME_BITS=64"
|
||||
"-D_FILE_OFFSET_BITS=64"
|
||||
]);
|
||||
|
||||
configureFlags = [
|
||||
@ -61,4 +94,4 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ mic92 disassembler nickcao ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
63
pkgs/tools/misc/rtx/default.nix
Normal file
63
pkgs/tools/misc/rtx/default.nix
Normal file
@ -0,0 +1,63 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, stdenv
|
||||
, coreutils
|
||||
, bash
|
||||
, direnv
|
||||
, Security
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rtx";
|
||||
version = "1.30.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jdxcode";
|
||||
repo = "rtx";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xJecTvhRMHyGOT1JJPSp+k5bI0FvIP2uySBt1R0YZ30=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-29aGVKINVemppy+3nGDf5okvmJm72pVYUVbefuey0H8=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs --build ./test/data/plugins/**/bin/* ./src/fake_asdf.rs ./src/cli/reshim.rs
|
||||
|
||||
substituteInPlace ./src/env_diff.rs \
|
||||
--replace '"bash"' '"${bash}/bin/bash"'
|
||||
|
||||
substituteInPlace ./src/cli/direnv/exec.rs \
|
||||
--replace '"env"' '"${coreutils}/bin/env"' \
|
||||
--replace 'cmd!("direnv"' 'cmd!("${direnv}/bin/direnv"'
|
||||
'';
|
||||
|
||||
checkFlags = [
|
||||
# Requires .git directory to be present
|
||||
"--skip=cli::plugins::ls::tests::test_plugin_list_urls"
|
||||
];
|
||||
cargoTestFlags = [ "--all-features" ];
|
||||
# some tests access the same folders, don't test in parallel to avoid race conditions
|
||||
dontUseCargoParallelTests = true;
|
||||
|
||||
postInstall = ''
|
||||
installManPage ./man/man1/rtx.1
|
||||
|
||||
installShellCompletion \
|
||||
--bash ./completions/rtx.bash \
|
||||
--fish ./completions/rtx.fish \
|
||||
--zsh ./completions/_rtx
|
||||
'';
|
||||
|
||||
meta = rec {
|
||||
homepage = "https://github.com/jdxcode/rtx";
|
||||
description = "Polyglot runtime manager (asdf rust clone)";
|
||||
changelog = "https://github.com/jdxcode/rtx/releases/tag/v${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ konradmalik ];
|
||||
};
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, fetchurl, jdk, buildFHSEnv, unzip, makeDesktopItem }:
|
||||
let
|
||||
version = "2023.4.4";
|
||||
version = "2023.5.2";
|
||||
|
||||
src = fetchurl {
|
||||
name = "burpsuite.jar";
|
||||
@ -8,7 +8,7 @@ let
|
||||
"https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar"
|
||||
"https://web.archive.org/web/https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar"
|
||||
];
|
||||
sha256 = "fac29bfd58be87b3c77091befede82b417aca3145e66c5d9ff02ca4939f420a3";
|
||||
sha256 = "0afcea8603a57e531792764a37e16e7c90634cca06eb51e6e8b031f0283d84ce";
|
||||
};
|
||||
|
||||
name = "burpsuite-${version}";
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "subfinder";
|
||||
version = "2.5.8";
|
||||
version = "2.5.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/q6ES1fW9/vxe03w73VyAHfOZNK6g5hxwi3qhxCiN6M=";
|
||||
sha256 = "sha256-d2xVK7KdmSUeOVBtTysKX5cB7E59tXt9d/uORA31Wd4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-sUkSxpWDqBe15BFVGNHTF1lV2mXZ0kjevMvdHtuNjXs=";
|
||||
vendorHash = "sha256-WZrwvKEznv2LFuOVW4kRzS9bmKuGbanMiV7TpvnxTIo=";
|
||||
|
||||
modRoot = "./v2";
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "arti";
|
||||
version = "1.1.4";
|
||||
version = "1.1.5";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.torproject.org";
|
||||
@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec {
|
||||
owner = "core";
|
||||
repo = "arti";
|
||||
rev = "arti-v${version}";
|
||||
sha256 = "sha256-+gd/3CKdZkH/zDqGGTna7S7LkadfpzfHlX2XfemZpoE=";
|
||||
sha256 = "sha256-FrawcoE+cUhRq9NPpSspUuk0ZPjnJcmDHD25syV/18E=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-YD7KAiZM3iG9FXXHo5c1WanF7tsJBAnGvb36gxEcV5k=";
|
||||
cargoHash = "sha256-34qNdizJ89fo/6AQXuB8FqvYSv/Zy5N+gXX9Yl5sywM=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
|
||||
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2023-05-27";
|
||||
version = "2023-06-01";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "exploit-database";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-7C4lihyGt8jiCtHXzE1iik0vsVRlsoKgvFgiV9iqtoQ=";
|
||||
hash = "sha256-38FbwwlzJSvbZhTP/SS0oxb07V45GfaS3mnpY1DSG6s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubernetes-polaris";
|
||||
version = "7.4.2";
|
||||
version = "8.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FairwindsOps";
|
||||
repo = "polaris";
|
||||
rev = version;
|
||||
sha256 = "sha256-bapZ3snFq0YWZOT5IBwQaC0kwTs3sOVvbYFlL95LeNM=";
|
||||
sha256 = "sha256-JNbRXDpEO0luttI1WDApMWwPhtKLUABX+R8W/g+NAJk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-SwHJRw75pP1zwi9ZMfUfcXt788pURM1KSbTNQF6XVqk=";
|
||||
|
||||
@ -1706,6 +1706,8 @@ with pkgs;
|
||||
|
||||
sdlookup = callPackage ../tools/security/sdlookup { };
|
||||
|
||||
sdkmanager = with python3Packages; toPythonApplication sdkmanager;
|
||||
|
||||
sgrep = callPackage ../tools/text/sgrep { };
|
||||
|
||||
shell-genie = callPackage ../applications/misc/shell-genie { };
|
||||
@ -3665,9 +3667,7 @@ with pkgs;
|
||||
|
||||
gospider = callPackage ../tools/security/gospider { };
|
||||
|
||||
browserpass = callPackage ../tools/security/browserpass {
|
||||
buildGoModule = buildGo119Module; # go 1.20 build failure
|
||||
};
|
||||
browserpass = callPackage ../tools/security/browserpass { };
|
||||
|
||||
passff-host = callPackage ../tools/security/passff-host { };
|
||||
|
||||
@ -4279,9 +4279,7 @@ with pkgs;
|
||||
|
||||
cloudbrute = callPackage ../tools/security/cloudbrute { };
|
||||
|
||||
cloudflared = callPackage ../applications/networking/cloudflared {
|
||||
buildGoModule = buildGo119Module; # go 1.20 build failure
|
||||
};
|
||||
cloudflared = callPackage ../applications/networking/cloudflared { };
|
||||
|
||||
cloudflare-dyndns = callPackage ../applications/networking/cloudflare-dyndns { };
|
||||
|
||||
@ -5686,9 +5684,7 @@ with pkgs;
|
||||
|
||||
pcb2gcode = callPackage ../tools/misc/pcb2gcode { };
|
||||
|
||||
pcp = callPackage ../tools/misc/pcp {
|
||||
buildGoModule = buildGo119Module; # go 1.20 build failure
|
||||
};
|
||||
pcp = callPackage ../tools/misc/pcp { };
|
||||
|
||||
persepolis = python3Packages.callPackage ../tools/networking/persepolis {
|
||||
wrapQtAppsHook = qt5.wrapQtAppsHook;
|
||||
@ -6858,9 +6854,7 @@ with pkgs;
|
||||
|
||||
dnspeep = callPackage ../tools/security/dnspeep { };
|
||||
|
||||
dnsproxy = callPackage ../tools/networking/dnsproxy {
|
||||
buildGoModule = buildGo119Module; # go 1.20 build failure
|
||||
};
|
||||
dnsproxy = callPackage ../tools/networking/dnsproxy { };
|
||||
|
||||
dnsperf = callPackage ../tools/networking/dnsperf { };
|
||||
|
||||
@ -7363,9 +7357,7 @@ with pkgs;
|
||||
|
||||
endlessh-go = callPackage ../servers/endlessh-go { };
|
||||
|
||||
eris-go = callPackage ../servers/eris-go {
|
||||
buildGoModule = buildGo119Module; # go 1.20 build failure
|
||||
};
|
||||
eris-go = callPackage ../servers/eris-go { };
|
||||
|
||||
ericw-tools = callPackage ../applications/misc/ericw-tools { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
@ -8824,9 +8816,7 @@ with pkgs;
|
||||
|
||||
ipfetch = callPackage ../tools/networking/ipfetch { };
|
||||
|
||||
ipfs-cluster = callPackage ../applications/networking/ipfs-cluster {
|
||||
buildGoModule = buildGo119Module; # go 1.20 build failure
|
||||
};
|
||||
ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { };
|
||||
|
||||
ipfs-upload-client = callPackage ../applications/networking/ipfs-upload-client { };
|
||||
|
||||
@ -9199,9 +9189,7 @@ with pkgs;
|
||||
|
||||
kubergrunt = callPackage ../applications/networking/cluster/kubergrunt { };
|
||||
|
||||
kubo = callPackage ../applications/networking/kubo {
|
||||
buildGoModule = buildGo119Module; # go 1.20 build failure
|
||||
};
|
||||
kubo = callPackage ../applications/networking/kubo { };
|
||||
|
||||
kubo-migrator-all-fs-repo-migrations = callPackage ../applications/networking/kubo-migrator/all-migrations.nix { };
|
||||
kubo-migrator-unwrapped = callPackage ../applications/networking/kubo-migrator/unwrapped.nix { };
|
||||
@ -12287,9 +12275,7 @@ with pkgs;
|
||||
|
||||
sftpman = callPackage ../tools/filesystems/sftpman { };
|
||||
|
||||
sftpgo = callPackage ../servers/sftpgo {
|
||||
buildGoModule = buildGo119Module;
|
||||
};
|
||||
sftpgo = callPackage ../servers/sftpgo { };
|
||||
|
||||
screenfetch = callPackage ../tools/misc/screenfetch { };
|
||||
|
||||
@ -17603,6 +17589,10 @@ with pkgs;
|
||||
|
||||
asdf-vm = callPackage ../tools/misc/asdf-vm { };
|
||||
|
||||
rtx = callPackage ../tools/misc/rtx {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
### DEVELOPMENT / TOOLS
|
||||
|
||||
abi-compliance-checker = callPackage ../development/tools/misc/abi-compliance-checker { };
|
||||
@ -24337,6 +24327,8 @@ with pkgs;
|
||||
|
||||
tclx = callPackage ../development/libraries/tclx { };
|
||||
|
||||
tcl-fcgi = callPackage ../development/libraries/tcl-fcgi { };
|
||||
|
||||
tdb = callPackage ../development/libraries/tdb { };
|
||||
|
||||
tdlib = callPackage ../development/libraries/tdlib { };
|
||||
@ -25462,9 +25454,7 @@ with pkgs;
|
||||
grafana = callPackage ../servers/monitoring/grafana { };
|
||||
grafanaPlugins = callPackages ../servers/monitoring/grafana/plugins { };
|
||||
|
||||
grafana-agent = callPackage ../servers/monitoring/grafana-agent {
|
||||
buildGoModule = buildGo119Module; # nixosTests.grafana-agent go 1.20 failure
|
||||
};
|
||||
grafana-agent = callPackage ../servers/monitoring/grafana-agent { };
|
||||
|
||||
grafana-loki = callPackage ../servers/monitoring/loki { };
|
||||
promtail = callPackage ../servers/monitoring/loki/promtail.nix { };
|
||||
@ -26172,9 +26162,7 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit;
|
||||
};
|
||||
prometheus-nut-exporter = callPackage ../servers/monitoring/prometheus/nut-exporter.nix { };
|
||||
prometheus-openldap-exporter = callPackage ../servers/monitoring/prometheus/openldap-exporter.nix {
|
||||
buildGoModule = buildGo118Module; # nixosTests.prometheus-exporter.ldap fails with 1.19
|
||||
};
|
||||
prometheus-openldap-exporter = callPackage ../servers/monitoring/prometheus/openldap-exporter.nix { } ;
|
||||
prometheus-openvpn-exporter = callPackage ../servers/monitoring/prometheus/openvpn-exporter.nix { };
|
||||
prometheus-pihole-exporter = callPackage ../servers/monitoring/prometheus/pihole-exporter.nix { };
|
||||
prometheus-postfix-exporter = callPackage ../servers/monitoring/prometheus/postfix-exporter.nix { };
|
||||
@ -26377,10 +26365,7 @@ with pkgs;
|
||||
|
||||
systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { };
|
||||
|
||||
tailscale = callPackage ../servers/tailscale {
|
||||
# Version 1.38.1 requires Go >= 1.20
|
||||
buildGoModule = buildGo120Module;
|
||||
};
|
||||
tailscale = callPackage ../servers/tailscale { };
|
||||
|
||||
tailscale-systray = callPackage ../applications/misc/tailscale-systray { };
|
||||
|
||||
@ -26452,9 +26437,7 @@ with pkgs;
|
||||
|
||||
vouch-proxy = callPackage ../servers/vouch-proxy { };
|
||||
|
||||
victoriametrics = callPackage ../servers/nosql/victoriametrics {
|
||||
buildGoModule = buildGo119Module; # go 1.20 build failure
|
||||
};
|
||||
victoriametrics = callPackage ../servers/nosql/victoriametrics { };
|
||||
|
||||
virtiofsd = callPackage ../servers/misc/virtiofsd { };
|
||||
|
||||
@ -31435,6 +31418,8 @@ with pkgs;
|
||||
|
||||
pixinsight = libsForQt5.callPackage ../applications/graphics/pixinsight { };
|
||||
|
||||
please-cli = callPackage ../applications/misc/please-cli { };
|
||||
|
||||
protonup-qt = python3Packages.callPackage ../applications/misc/protonup-qt { };
|
||||
|
||||
pmbootstrap = python3Packages.callPackage ../tools/misc/pmbootstrap { };
|
||||
@ -32927,9 +32912,7 @@ with pkgs;
|
||||
|
||||
opcua-client-gui = callPackage ../misc/opcua-client-gui { };
|
||||
|
||||
open-policy-agent = callPackage ../development/tools/open-policy-agent {
|
||||
buildGoModule = buildGo119Module; # go 1.20 build failure
|
||||
};
|
||||
open-policy-agent = callPackage ../development/tools/open-policy-agent { };
|
||||
|
||||
openmm = callPackage ../development/libraries/science/chemistry/openmm {
|
||||
stdenv = gcc11Stdenv;
|
||||
@ -33664,6 +33647,8 @@ with pkgs;
|
||||
|
||||
popcorntime = callPackage ../applications/video/popcorntime { };
|
||||
|
||||
pot = callPackage ../applications/misc/pot { };
|
||||
|
||||
pothos = libsForQt5.callPackage ../applications/radio/pothos { };
|
||||
|
||||
potrace = callPackage ../applications/graphics/potrace { };
|
||||
@ -33695,9 +33680,7 @@ with pkgs;
|
||||
|
||||
proteus = callPackage ../applications/audio/proteus { };
|
||||
|
||||
protonmail-bridge = callPackage ../applications/networking/protonmail-bridge {
|
||||
buildGoModule = buildGo119Module; # go 1.20 build failure
|
||||
};
|
||||
protonmail-bridge = callPackage ../applications/networking/protonmail-bridge { };
|
||||
|
||||
protonvpn-cli = python3Packages.callPackage ../applications/networking/protonvpn-cli { };
|
||||
protonvpn-cli_2 = python3Packages.callPackage ../applications/networking/protonvpn-cli/2.nix { };
|
||||
@ -34763,9 +34746,7 @@ with pkgs;
|
||||
|
||||
toxic = callPackage ../applications/networking/instant-messengers/toxic { };
|
||||
|
||||
toxiproxy = callPackage ../development/tools/toxiproxy {
|
||||
buildGoModule = buildGo119Module; # go 1.20 build failure
|
||||
};
|
||||
toxiproxy = callPackage ../development/tools/toxiproxy { };
|
||||
|
||||
tqsl = callPackage ../applications/radio/tqsl {
|
||||
openssl = openssl_1_1;
|
||||
@ -35911,9 +35892,7 @@ with pkgs;
|
||||
|
||||
ergo = callPackage ../applications/blockchains/ergo { };
|
||||
|
||||
erigon = callPackage ../applications/blockchains/erigon {
|
||||
buildGoModule = buildGo119Module; # go 1.20 build failure
|
||||
};
|
||||
erigon = callPackage ../applications/blockchains/erigon { };
|
||||
|
||||
exodus = callPackage ../applications/blockchains/exodus { };
|
||||
|
||||
|
||||
@ -25171,8 +25171,8 @@ with self; {
|
||||
url = "mirror://cpan/authors/id/A/AM/AMBS/Text-BibTeX-0.88.tar.gz";
|
||||
hash = "sha256-sBRYbmi9vK+wos+gQB6woE6l3oxNW8Nt0Pf66ras9Cw=";
|
||||
};
|
||||
# libbtparse.so: cannot open shared object file (aarch64 only)
|
||||
patches = [ ../development/perl-modules/TextBibTeX-use-lib-on-aarch64.patch ];
|
||||
# libbtparse.so: cannot open shared object file
|
||||
patches = [ ../development/perl-modules/TextBibTeX-use-lib.patch ];
|
||||
perlPreHook = "export LD=$CC";
|
||||
perlPostHook = lib.optionalString stdenv.isDarwin ''
|
||||
oldPath="$(pwd)/btparse/src/libbtparse.dylib"
|
||||
|
||||
@ -10917,6 +10917,8 @@ self: super: with self; {
|
||||
|
||||
sdds = callPackage ../development/python-modules/sdds { };
|
||||
|
||||
sdkmanager = callPackage ../development/python-modules/sdkmanager { };
|
||||
|
||||
sdnotify = callPackage ../development/python-modules/sdnotify { };
|
||||
|
||||
seaborn = callPackage ../development/python-modules/seaborn { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user