Merge master into staging-next

This commit is contained in:
github-actions[bot]
2024-12-06 06:05:08 +00:00
committed by GitHub
62 changed files with 3018 additions and 7828 deletions
+1
View File
@@ -1322,6 +1322,7 @@
};
amozeo = {
email = "wroclaw223@outlook.com";
github = "amozeo";
githubId = 37040543;
name = "Wroclaw";
};
@@ -52,7 +52,7 @@ with lib;
} // cfg.extraEnvironment;
path = (with pkgs; [
bash
bashInteractive
coreutils
git
gnutar
+1
View File
@@ -442,6 +442,7 @@ in
MemoryDenyWriteExecute = true;
NoNewPrivileges = true;
PrivateDevices = true;
PrivateMounts = true;
PrivateTmp = true;
ProcSubset = "pid";
ProtectClock = true;
@@ -10,7 +10,6 @@
, zlib
, protobuf
, openssl
, libclang
, libcxx
, rocksdb_8_3
, rustfmt
@@ -75,7 +74,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config protobuf rustfmt perl rustPlatform.bindgenHook ];
buildInputs =
[ openssl zlib libclang hidapi ] ++ (lib.optionals stdenv.hostPlatform.isLinux [ udev ])
[ openssl zlib hidapi ] ++ (lib.optionals stdenv.hostPlatform.isLinux [ udev ])
++ lib.optionals stdenv.hostPlatform.isDarwin [ Security System Libsystem libcxx ];
strictDeps = true;
@@ -31,7 +31,7 @@ buildKodiBinaryAddon rec {
extraRuntimeDependencies = [ glib nspr nss (lib.getLib stdenv.cc.cc) ];
extraInstallPhase = let n = namespace; in ''
ln -s $out/lib/addons/${n}/libssd_wv.so $out/${addonDir}/${n}/libssd_wv.so
${lib.optionalString stdenv.hostPlatform.isAarch64 "ln -s $out/lib/addons/${n}/libcdm_aarch64_loader.so $out/${addonDir}/${n}/libcdm_aarch64_loader.so"}
'';
meta = with lib; {
@@ -8,13 +8,13 @@
mkHyprlandPlugin hyprland {
pluginName = "hypr-dynamic-cursors";
version = "0-unstable-2024-11-10";
version = "0-unstable-2024-11-19";
src = fetchFromGitHub {
owner = "VirtCode";
repo = "hypr-dynamic-cursors";
rev = "a3427f2a7f1dc70236dbaa870eadead03d9807a6";
hash = "sha256-7nznQzeq0rzvTos2axd4LvzLJ64n0erP3WxMIpCE5Ew=";
rev = "81f4b964f997a3174596ef22c7a1dee8a5f616c7";
hash = "sha256-3SDwq2i2QW9nu7HBCPuDtLmrwLt2kajzImBsawKRZ+s=";
};
dontUseCmakeConfigure = true;
+10 -5
View File
@@ -3,11 +3,12 @@
fetchFromGitHub,
buildGoModule,
testers,
nix-update-script,
act,
}:
let
version = "0.2.68";
version = "0.2.70";
in
buildGoModule {
pname = "act";
@@ -17,10 +18,10 @@ buildGoModule {
owner = "nektos";
repo = "act";
rev = "refs/tags/v${version}";
hash = "sha256-BON29uUruBoeBLoBdOgnonrVIyLZlvBW5UyWfxFgjPs=";
hash = "sha256-7e2ehUM3d5hcFtaahW/hrhVkpy74ufMdYwdnbsUA+WM=";
};
vendorHash = "sha256-yxuOORShJL9nFIS5srZFI31Nyz7xFxnJCmcN8UFhyr0=";
vendorHash = "sha256-2fHNiquFg6I0JefqXfXRrnXxKPkNQOtQB7fznldO3GE=";
doCheck = false;
@@ -30,8 +31,12 @@ buildGoModule {
"-X main.version=${version}"
];
passthru.tests.version = testers.testVersion {
package = act;
passthru = {
tests.version = testers.testVersion {
package = act;
};
updateScript = nix-update-script { };
};
meta = {
+9 -8
View File
@@ -1,18 +1,18 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, stdenv }:
buildGoModule rec {
pname = "argocd";
version = "2.12.6";
version = "2.13.1";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo-cd";
rev = "v${version}";
hash = "sha256-Lu0RUCSOrNNQ17CZGv/+ic3jPz4+3433JjwnjVzYzF4=";
hash = "sha256-0qL9CnEwEp7sJK7u6EKHVFY/hH8lTb182HZ3r+9nIyQ=";
};
proxyVendor = true; # darwin/linux hash mismatch
vendorHash = "sha256-8BX0QErfe2mxTbIToNgZ3U9OtpIy887936U68Qr+3W0=";
vendorHash = "sha256-p+9Q9VOdN7v7iK5oaO5f+B1iyOwVdk672zQsYsrb398=";
# Set target as ./cmd per cli-local
# https://github.com/argoproj/argo-cd/blob/master/Makefile#L227
@@ -27,10 +27,10 @@ buildGoModule rec {
"-X ${package_url}.gitCommit=${src.rev}"
"-X ${package_url}.gitTag=${src.rev}"
"-X ${package_url}.gitTreeState=clean"
"-X ${package_url}.kubectlVersion=v0.24.2"
"-X ${package_url}.kubectlVersion=v0.31.2"
# NOTE: Update kubectlVersion when upgrading this package with
# https://github.com/argoproj/argo-cd/blob/v${version}/go.mod#L95
# Per https://github.com/argoproj/argo-cd/blob/master/Makefile#L18
# https://github.com/search?q=repo%3Aargoproj%2Fargo-cd+%22k8s.io%2Fkubectl%22+path%3Ago.mod&type=code
# Per https://github.com/search?q=repo%3Aargoproj%2Fargo-cd+%22KUBECTL_VERSION%3D%22+path%3AMakefile&type=code
# Will need a way to automate it :P
];
@@ -48,9 +48,10 @@ buildGoModule rec {
$out/bin/argocd version --client | grep ${src.rev} > /dev/null
'';
postInstall = ''
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd argocd \
--bash <($out/bin/argocd completion bash) \
--fish <($out/bin/argocd completion fish) \
--zsh <($out/bin/argocd completion zsh)
'';
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "basex";
version = "11.4";
version = "11.6";
src = fetchurl {
url = "http://files.basex.org/releases/${version}/BaseX${builtins.replaceStrings ["."] [""] version}.zip";
hash = "sha256-gArcTVD4OoXWB6r9I8q2EXuwCRmbLFE1sO2yfo3AWCQ=";
hash = "sha256-JGf+eBBlzbg0UYQqpx/IjGhjOKWCvl5rfnYpYE+JWM4=";
};
nativeBuildInputs = [ unzip copyDesktopItems ];
@@ -61,6 +61,9 @@ stdenv.mkDerivation rec {
prePatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
sed -i -e 's/readlink -f/readlink/g' bash_completion completions/*
'' + lib.optionalString stdenv.hostPlatform.isFreeBSD ''
# please remove this next release!
touch completions/{pkg_delete,freebsd-update,kldload,kldunload,portinstall,portsnap,portupgrade}
'';
meta = with lib; {
+37
View File
@@ -0,0 +1,37 @@
{
lib,
stdenvNoCC,
fetchzip,
}:
stdenvNoCC.mkDerivation rec {
pname = "beedii";
# 1.2.0 does not include font files.
# https://github.com/webkul/beedii/issues/1
version = "1.0.0";
src = fetchzip {
url = "https://github.com/webkul/beedii/releases/download/v${version}/beedii.zip";
hash = "sha256-MefkmWl7LdhQiePpixKcatoIeOTlrRaO3QA9xWAxJ4Q=";
stripRoot = false;
};
installPhase = ''
runHook preInstall
install -Dm444 Fonts/*.ttf -t $out/share/fonts/truetype/${pname}
runHook postInstall
'';
meta = {
description = "Free Hand Drawn Emoji Font";
homepage = "https://github.com/webkul/beedii";
license = lib.licenses.cc0;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [
kachick
];
};
}
+6 -3
View File
@@ -3,17 +3,20 @@
stdenv.mkDerivation (finalAttrs: {
pname = "butt";
version = "1.42.0";
version = "1.44.0";
src = fetchurl {
url = "https://danielnoethen.de/butt/release/${finalAttrs.version}/butt-${finalAttrs.version}.tar.gz";
hash = "sha256-/Y96Pq/3D37n/2JZdvcEQ1BBEtHlJ030QLesfNyBg2g=";
hash = "sha256-2RC0ChDbyhzjd+4jnBRuR0botIVQugpA1rUZm1yH4Kc=";
};
postPatch = ''
# remove advertising
substituteInPlace src/FLTK/flgui.cpp \
--replace 'idata_radio_co_badge, 124, 61, 4,' 'nullptr, 0, 0, 0,'
--replace-fail 'idata_radio_co_badge, 124, 61, 4,' 'nullptr, 0, 0, 0,'
substituteInPlace src/FLTK/fl_timer_funcs.cpp \
--replace-fail 'radio_co_logo, 124, 61, 4,' 'nullptr, 0, 0, 0,' \
--replace-fail 'live365_logo, 124, 61, 4,' 'nullptr, 0, 0, 0,'
'';
nativeBuildInputs = [ pkg-config ];
+14 -12
View File
@@ -7,18 +7,18 @@
}:
rustPlatform.buildRustPackage rec {
pname = "clash-rs";
version = "0.7.1";
version = "0.7.3";
src = fetchFromGitHub {
owner = "Watfaq";
repo = "clash-rs";
rev = "refs/tags/v${version}";
hash = "sha256-H76ErJQ+qKC3mt3IzNCPldAwlj7NnYUcLzUuOYykxnE=";
hash = "sha256-SJ3NhLiDA0iRgq9pKB/CeltPE2ewbY+z1NBQriebNi0=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-yU5ioAuCJRuYKNOdd381W07Ua+c2me+wHFOMukTVVqM=";
cargoHash = "sha256-XZd3dah6c0jg5en/7fHAXz8iSb7AMJPvPZViXHTdEbw=";
env = {
PROTOC = "${protobuf}/bin/protoc";
@@ -26,26 +26,28 @@ rustPlatform.buildRustPackage rec {
RUSTC_BOOTSTRAP = 1;
};
doInstallCheck = true;
dontCargoCheck = true; # test failed
versionCheckProgramArg = "--version";
nativeInstallCheckInputs = [ versionCheckHook ];
buildFeatures = [
"shadowsocks"
"tuic"
"onion"
];
doCheck = false; # test failed
doInstallCheck = true;
versionCheckProgramArg = "--version";
nativeInstallCheckInputs = [
versionCheckHook
];
meta = {
description = "Custom protocol, rule based network proxy software";
homepage = "https://github.com/Watfaq/clash-rs";
mainProgram = "clash-rs";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ aucub ];
platforms = lib.platforms.linux;
platforms = lib.platforms.linux ++ lib.platforms.darwin;
};
}
+68
View File
@@ -0,0 +1,68 @@
{
lib,
stdenv,
buildGoModule,
fetchFromGitHub,
nix-update-script,
installShellFiles,
versionCheckHook,
}:
buildGoModule rec {
pname = "copacetic";
version = "0.9.0";
src = fetchFromGitHub {
owner = "project-copacetic";
repo = "copacetic";
rev = "refs/tags/v${version}";
hash = "sha256-hvSbjkqrd//thUex2It31Z4Vrj1u07WEAQFAnWiPo6M=";
};
vendorHash = "sha256-eefYbB88wXQME8ehm/ieVBtOmmtxHkZSsjE05yeQ7Gw=";
nativeBuildInputs = [ installShellFiles ];
CGO_ENABLED = "0";
ldflags = [
"-s"
"-w"
"-X github.com/project-copacetic/copacetic/pkg/version.GitVersion=${version}"
"-X main.version=${version}"
];
checkFlags =
let
# Skip tests that require network access
skippedTests = [
"TestNewClient/custom_buildkit_addr"
"TestPatch"
"TestPlugins/docker.io"
];
in
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
postInstall =
''
mv $out/bin/copacetic $out/bin/copa
''
+ lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd copa \
--bash <($out/bin/copa completion bash) \
--fish <($out/bin/copa completion fish) \
--zsh <($out/bin/copa completion zsh)
'';
passthru.updateScript = nix-update-script { };
meta = {
homepage = "https://project-copacetic.github.io/copacetic/";
description = "Tool for directly patching vulnerabilities in container images";
license = lib.licenses.asl20;
mainProgram = "copa";
maintainers = with lib.maintainers; [ bmanuel ];
};
}
+65
View File
@@ -0,0 +1,65 @@
{
lib,
stdenv,
fetchCrate,
rustPlatform,
installShellFiles,
testers,
nix-update-script,
dprint,
}:
rustPlatform.buildRustPackage rec {
pname = "dprint";
version = "0.47.6";
src = fetchCrate {
inherit pname version;
hash = "sha256-7tGzSFp7Dnu27L65mqFd7hzeFFDfe1xJ6cMul3hGyJs=";
};
cargoHash = "sha256-y3tV3X7YMOUGBn2hCmxsUUc9QQleKEioTIw7SGoBvSQ=";
# Tests fail because they expect a test WASM plugin. Tests already run for
# every commit upstream on GitHub Actions
doCheck = false;
nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
installShellFiles
];
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
export DPRINT_CACHE_DIR="$(mktemp -d)"
installShellCompletion --cmd dprint \
--bash <($out/bin/dprint completions bash) \
--zsh <($out/bin/dprint completions zsh) \
--fish <($out/bin/dprint completions fish)
'';
passthru = {
tests.version = testers.testVersion {
inherit version;
package = dprint;
command = ''
DPRINT_CACHE_DIR="$(mktemp --directory)" dprint --version
'';
};
updateScript = nix-update-script { };
};
meta = with lib; {
description = "Code formatting platform written in Rust";
longDescription = ''
dprint is a pluggable and configurable code formatting platform written in Rust.
It offers multiple WASM plugins to support various languages. It's written in
Rust, so its small, fast, and portable.
'';
changelog = "https://github.com/dprint/dprint/releases/tag/${version}";
homepage = "https://dprint.dev";
license = licenses.mit;
maintainers = with maintainers; [ khushraj ];
mainProgram = "dprint";
};
}
+3 -3
View File
@@ -14,16 +14,16 @@
rustPlatform.buildRustPackage rec {
pname = "eza";
version = "0.20.10";
version = "0.20.11";
src = fetchFromGitHub {
owner = "eza-community";
repo = "eza";
rev = "v${version}";
hash = "sha256-zAyklIIm6jAhFmaBu3BEysLfGEwB34rpYztZaJEQtYg=";
hash = "sha256-JK2JXZCtrq5iVgzJ5mIrHSEhlWGgtxhKGVgbN3IuMxg=";
};
cargoHash = "sha256-fXrw753Hn4fbeX6+GRoH9MKrH0udjxnBK7AVCHnqIcs=";
cargoHash = "sha256-5KVLxIYmWIcFcGNZUvNOrHrKTy0UD9LQvPn3IGpV6B0=";
nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ];
buildInputs = [ zlib ];
+3 -3
View File
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "flake-checker";
version = "0.2.0";
version = "0.2.1";
src = fetchFromGitHub {
owner = "DeterminateSystems";
repo = "flake-checker";
rev = "v${version}";
hash = "sha256-cvjSQNvRnreherInbieJnaanU/TzDAgM544MBi7UWvQ=";
hash = "sha256-Uc3Fycn4SBYo2XWoAn4egAtjKt0XxBcyS0uN5a3bRKk=";
};
cargoHash = "sha256-0iH5owyNfIpRz6nYwrJUoqd9lVGZ3T3K8rmsOk2UoGI=";
cargoHash = "sha256-Muajqf7jcr10DLythl/hlFM2qG83i81Q3eGk3mg/4GU=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
Security
+2 -2
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "free42";
version = "3.1.8";
version = "3.1.10";
src = fetchFromGitHub {
owner = "thomasokken";
repo = "free42";
rev = "v${finalAttrs.version}";
hash = "sha256-z1HlI2e3mCRJ/sWMdsLF7IpcvTh+Zlrk77M8gaJXMzQ=";
hash = "sha256-X1fNr+0xc15KmR+qbDOkQraYPUj50b1eWmSheIKl4e8=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "git-open";
version = "3.0.0";
version = "3.1.0";
src = fetchFromGitHub {
owner = "paulirish";
repo = "git-open";
rev = "v${version}";
sha256 = "sha256-Bag2rI2uR7ilkg2ozjR8tPXqKz5XjiY7WAUJKTVTXd8=";
sha256 = "sha256-bZOknoRMkPqm1pFFFbvrHrSi90ANLEE5fLcABYHov6Q=";
};
nativeBuildInputs = [ installShellFiles makeWrapper pandoc ];
@@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-online-accounts-gtk";
version = "3.50.4";
version = "3.50.5";
src = fetchFromGitHub {
owner = "xapp-project";
repo = "gnome-online-accounts-gtk";
rev = finalAttrs.version;
hash = "sha256-kgDeAH6Dj4+23dW649JR0XwvDqTiz5Tknsc4IfpQFWM=";
hash = "sha256-E4gZsPLOCK15xG5MiwN5sNQs/3KEkzC57I5moqcGy20=";
};
nativeBuildInputs = [
+4 -1
View File
@@ -23,7 +23,10 @@ buildGoModule rec {
vendorHash = "sha256-qhiCZMSLRnLbyHplcaPn/BGJ3Lv8O8eEvCuIHwA4sMs=";
doCheck = false;
checkFlags = [
# Workaround for "failed to load modules"
"-skip=TestCommands/mod"
];
proxyVendor = true;
+26 -7
View File
@@ -1,14 +1,22 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
{
lib,
buildGoModule,
fetchFromGitHub,
installShellFiles,
testers,
nix-update-script,
kind,
}:
buildGoModule rec {
pname = "kind";
version = "0.24.0";
version = "0.25.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "kubernetes-sigs";
repo = "kind";
hash = "sha256-vndN3ssiaaJdpPZQ0vBdqr4xPuY2bAHAd+SJamNrX6Q=";
hash = "sha256-6WlkZ2dLMSSSlJAEshMpD5Ai0WVo1NzXAvpjEQd3JPA=";
};
patches = [
@@ -24,9 +32,10 @@ buildGoModule rec {
CGO_ENABLED = 0;
ldflags = [ "-s" "-w" ];
doCheck = false;
ldflags = [
"-s"
"-w"
];
postInstall = ''
installShellCompletion --cmd kind \
@@ -35,10 +44,20 @@ buildGoModule rec {
--zsh <($out/bin/kind completion zsh)
'';
passthru = {
tests.version = testers.testVersion {
package = kind;
};
updateScript = nix-update-script { };
};
meta = with lib; {
description = "Kubernetes IN Docker - local clusters for testing Kubernetes";
homepage = "https://github.com/kubernetes-sigs/kind";
maintainers = with maintainers; [ offline rawkode ];
maintainers = with maintainers; [
offline
rawkode
];
license = licenses.asl20;
mainProgram = "kind";
};
+9 -1
View File
@@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub, gitUpdater, testers, kopia }:
{ lib, buildGoModule, fetchFromGitHub, gitUpdater, installShellFiles, stdenv, testers, kopia }:
buildGoModule rec {
pname = "kopia";
@@ -20,6 +20,14 @@ buildGoModule rec {
"-X github.com/kopia/kopia/repo.BuildInfo=${src.rev}"
];
nativeBuildInputs = [ installShellFiles ];
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd kopia \
--bash <($out/bin/kopia --completion-script-bash) \
--zsh <($out/bin/kopia --completion-script-zsh)
'';
passthru = {
updateScript = gitUpdater { rev-prefix = "v"; };
tests = {
+1 -1
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, gzip, popt, autoreconfHook
, aclSupport ? true, acl
, aclSupport ? stdenv.isLinux, acl
, nixosTests
}:
+1 -1
View File
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "https://github.com/Foundry376/Mailspring/releases/download/${finalAttrs.version}/Mailspring-AppleSilicon.zip";
hash = "sha256-LYv3643oj58WR+4IE4XmJmCgD9S2AXNbPwW5W0QCuGI=";
hash = "sha256-5f0jtQPwwnkFNCtw0Kf2AaLbIHoOtTAc9+z000gTuBo=";
};
dontUnpack = true;
+1 -1
View File
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "https://github.com/Foundry376/Mailspring/releases/download/${finalAttrs.version}/mailspring-${finalAttrs.version}-amd64.deb";
hash = "sha256-2F5k8zRRI6x1EQ0k8wvIq1Q3Lnrn2ROp/Mq+H7Vqzlc=";
hash = "sha256-ZpmL6d0QkHKKxn+KF1OEDeAb1bFp9uohBobCvblE+L8=";
};
nativeBuildInputs = [
+5 -5
View File
@@ -4,21 +4,21 @@
}:
let
pname = "mailspring";
version = "1.13.3";
version = "1.14.0";
meta = with lib; {
meta = {
description = "Beautiful, fast and maintained fork of Nylas Mail by one of the original authors";
downloadPage = "https://github.com/Foundry376/Mailspring";
homepage = "https://getmailspring.com";
license = licenses.gpl3Plus;
license = lib.licenses.gpl3Plus;
longDescription = ''
Mailspring is an open-source mail client forked from Nylas Mail and built with Electron.
Mailspring's sync engine runs locally, but its source is not open.
'';
mainProgram = "mailspring";
maintainers = with maintainers; [ toschmidt ];
maintainers = with lib.maintainers; [ toschmidt ];
platforms = [ "x86_64-linux" "aarch64-darwin" ];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
};
linux = callPackage ./linux.nix { inherit pname version meta; };
+90
View File
@@ -0,0 +1,90 @@
--- old/rust_builder/cargokit/cmake/cargokit.cmake 2024-11-08 13:36:13.345889693 +0000
+++ new/rust_builder/cargokit/cmake/cargokit.cmake 2024-11-08 13:45:26.019632176 +0000
@@ -17,83 +17,22 @@
function(apply_cargokit target manifest_dir lib_name any_symbol_name)
set(CARGOKIT_LIB_NAME "${lib_name}")
- set(CARGOKIT_LIB_FULL_NAME "${CMAKE_SHARED_MODULE_PREFIX}${CARGOKIT_LIB_NAME}${CMAKE_SHARED_MODULE_SUFFIX}")
- if (CMAKE_CONFIGURATION_TYPES)
- set(CARGOKIT_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>")
- set(OUTPUT_LIB "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/${CARGOKIT_LIB_FULL_NAME}")
- else()
- set(CARGOKIT_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}")
- set(OUTPUT_LIB "${CMAKE_CURRENT_BINARY_DIR}/${CARGOKIT_LIB_FULL_NAME}")
- endif()
- set(CARGOKIT_TEMP_DIR "${CMAKE_CURRENT_BINARY_DIR}/cargokit_build")
-
- if (FLUTTER_TARGET_PLATFORM)
- set(CARGOKIT_TARGET_PLATFORM "${FLUTTER_TARGET_PLATFORM}")
- else()
- set(CARGOKIT_TARGET_PLATFORM "windows-x64")
- endif()
-
- set(CARGOKIT_ENV
- "CARGOKIT_CMAKE=${CMAKE_COMMAND}"
- "CARGOKIT_CONFIGURATION=$<CONFIG>"
- "CARGOKIT_MANIFEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}/${manifest_dir}"
- "CARGOKIT_TARGET_TEMP_DIR=${CARGOKIT_TEMP_DIR}"
- "CARGOKIT_OUTPUT_DIR=${CARGOKIT_OUTPUT_DIR}"
- "CARGOKIT_TARGET_PLATFORM=${CARGOKIT_TARGET_PLATFORM}"
- "CARGOKIT_TOOL_TEMP_DIR=${CARGOKIT_TEMP_DIR}/tool"
- "CARGOKIT_ROOT_PROJECT_DIR=${CMAKE_SOURCE_DIR}"
- )
-
- if (WIN32)
- set(SCRIPT_EXTENSION ".cmd")
- set(IMPORT_LIB_EXTENSION ".lib")
- else()
- set(SCRIPT_EXTENSION ".sh")
- set(IMPORT_LIB_EXTENSION "")
- execute_process(COMMAND chmod +x "${cargokit_cmake_root}/run_build_tool${SCRIPT_EXTENSION}")
- endif()
-
- # Using generators in custom command is only supported in CMake 3.20+
- if (CMAKE_CONFIGURATION_TYPES AND ${CMAKE_VERSION} VERSION_LESS "3.20.0")
- foreach(CONFIG IN LISTS CMAKE_CONFIGURATION_TYPES)
- add_custom_command(
- OUTPUT
- "${CMAKE_CURRENT_BINARY_DIR}/${CONFIG}/${CARGOKIT_LIB_FULL_NAME}"
- "${CMAKE_CURRENT_BINARY_DIR}/_phony_"
- COMMAND ${CMAKE_COMMAND} -E env ${CARGOKIT_ENV}
- "${cargokit_cmake_root}/run_build_tool${SCRIPT_EXTENSION}" build-cmake
- VERBATIM
- )
- endforeach()
- else()
- add_custom_command(
- OUTPUT
- ${OUTPUT_LIB}
- "${CMAKE_CURRENT_BINARY_DIR}/_phony_"
- COMMAND ${CMAKE_COMMAND} -E env ${CARGOKIT_ENV}
- "${cargokit_cmake_root}/run_build_tool${SCRIPT_EXTENSION}" build-cmake
- VERBATIM
- )
- endif()
-
-
- set_source_files_properties("${CMAKE_CURRENT_BINARY_DIR}/_phony_" PROPERTIES SYMBOLIC TRUE)
if (TARGET ${target})
# If we have actual cmake target provided create target and make existing
# target depend on it
- add_custom_target("${target}_cargokit" DEPENDS ${OUTPUT_LIB})
+ add_custom_target("${target}_cargokit" DEPENDS @output_lib@)
add_dependencies("${target}" "${target}_cargokit")
- target_link_libraries("${target}" PRIVATE "${OUTPUT_LIB}${IMPORT_LIB_EXTENSION}")
+ target_link_libraries("${target}" PRIVATE @output_lib@)
if(WIN32)
target_link_options(${target} PRIVATE "/INCLUDE:${any_symbol_name}")
endif()
else()
# Otherwise (FFI) just use ALL to force building always
- add_custom_target("${target}_cargokit" ALL DEPENDS ${OUTPUT_LIB})
+ add_custom_target("${target}_cargokit" ALL DEPENDS @output_lib@)
endif()
# Allow adding the output library to plugin bundled libraries
- set("${target}_cargokit_lib" ${OUTPUT_LIB} PARENT_SCOPE)
+ set("${target}_cargokit_lib" @output_lib@ PARENT_SCOPE)
endfunction()
+179
View File
@@ -0,0 +1,179 @@
{
lib,
fetchFromGitHub,
flutter324,
pkg-config,
webkitgtk_4_1,
mpv,
libass,
ffmpeg,
libplacebo,
libunwind,
shaderc,
vulkan-loader,
lcms,
libdovi,
libdvdnav,
libdvdread,
mujs,
libbluray,
lua,
rubberband,
libuchardet,
zimg,
alsa-lib,
openal,
pipewire,
libpulseaudio,
libcaca,
libdrm,
mesa,
libXScrnSaver,
nv-codec-headers-11,
libXpresent,
libva,
libvdpau,
rustPlatform,
stdenv,
xdg-user-dirs,
zenity,
copyDesktopItems,
makeDesktopItem,
replaceVars,
}:
let
pname = "mangayomi";
version = "0.3.75";
src = fetchFromGitHub {
owner = "kodjodevf";
repo = "mangayomi";
tag = "v${version}";
hash = "sha256-kVAtUXEysaCJSLobXlgAgK59pgLq8Ze/XDqQNNdKdzg=";
};
rustDep = rustPlatform.buildRustPackage {
inherit pname version src;
sourceRoot = "${src.name}/rust";
cargoHash = "sha256-b4PRFe8FgP/PXHwSw2qmderPRFCBC1ISQuf8uZcsxpY=";
passthru.libraryPath = "lib/librust_lib_mangayomi.so";
};
in
flutter324.buildFlutterApplication {
inherit pname version src;
pubspecLock = lib.importJSON ./pubspec.lock.json;
customSourceBuilders = {
rust_lib_mangayomi =
{ version, src, ... }:
stdenv.mkDerivation rec {
pname = "rust_lib_mangayomi";
inherit version src;
inherit (src) passthru;
patches = [
(replaceVars ./cargokit.patch {
output_lib = "${rustDep}/${rustDep.passthru.libraryPath}";
})
];
installPhase = ''
runHook preInstall
cp -r . $out
runHook postInstall
'';
};
};
gitHashes = {
desktop_webview_window = "sha256-Z9ehzDKe1W3wGa2AcZoP73hlSwydggO6DaXd9mop+cM=";
flutter_qjs = "sha256-m+Z0bCswylfd1E2Y6X6bdPivkSlXUxO4J0Icbco+/0A=";
media_kit_libs_windows_video = "sha256-SYVVOR6vViAsDH5MclInJk8bTt/Um4ccYgYDFrb5LBk=";
media_kit_native_event_loop = "sha256-SYVVOR6vViAsDH5MclInJk8bTt/Um4ccYgYDFrb5LBk=";
media_kit_video = "sha256-SYVVOR6vViAsDH5MclInJk8bTt/Um4ccYgYDFrb5LBk=";
};
nativeBuildInputs = [
pkg-config
copyDesktopItems
];
buildInputs = [
webkitgtk_4_1
mpv
libass
ffmpeg
libplacebo
libunwind
shaderc
vulkan-loader
lcms
libdovi
libdvdnav
libdvdread
mujs
libbluray
lua
rubberband
libuchardet
zimg
alsa-lib
openal
pipewire
libpulseaudio
libcaca
libdrm
mesa
libXScrnSaver
libXpresent
nv-codec-headers-11
libva
libvdpau
];
desktopItems = [
(makeDesktopItem {
name = "mangayomi";
exec = "mangayomi";
icon = "mangayomi";
genericName = "Mangayomi";
desktopName = "Mangayomi";
categories = [
"Utility"
];
keywords = [
"Manga"
"Anime"
"BitTorrent"
];
})
];
postInstall = ''
install -Dm644 assets/app_icons/icon-red.png $out/share/pixmaps/mangayomi.png
'';
extraWrapProgramArgs = ''
--prefix LD_LIBRARY_PATH : "$out/app/${pname}/lib" \
--prefix PATH : "${
lib.makeBinPath [
xdg-user-dirs
zenity
]
}"
'';
meta = {
changelog = "https://github.com/kodjodevf/mangayomi/releases/tag/v${version}";
description = "Read manga and stream anime from a variety of sources including BitTorrent";
homepage = "https://github.com/kodjodevf/mangayomi";
mainProgram = "mangayomi";
license = with lib.licenses; [ asl20 ];
maintainers = with lib.maintainers; [ aucub ];
platforms = lib.platforms.linux;
};
}
File diff suppressed because it is too large Load Diff
-2
View File
@@ -7,7 +7,6 @@
sqlite,
zlib,
stdenv,
clang,
darwin,
}:
@@ -31,7 +30,6 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [
pkg-config
clang
rustPlatform.bindgenHook
];
@@ -0,0 +1,40 @@
{
lib,
stdenvNoCC,
fetchFromGitHub,
nix-update-script,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "minimal-grub-theme";
version = "0.3.0";
src = fetchFromGitHub {
owner = "tomdewildt";
repo = "minimal-grub-theme";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-CegLznlW+UJZbVe+WG/S8tREFdw0aq3flGvJeDrLWK0=";
};
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/
cp -r minimal/icons minimal/theme.txt minimal/*.png $out/
runHook postInstall
'';
passthru.updateScript = nix-update-script { };
meta = {
description = "Minimalistic GRUB theme insipired by primitivistical and vimix";
homepage = "https://github.com/tomdewildt/minimal-grub-theme";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ azuwis ];
platforms = lib.platforms.linux;
};
})
+2 -2
View File
@@ -5,11 +5,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "pv";
version = "1.8.14";
version = "1.9.7";
src = fetchurl {
url = "https://www.ivarch.com/programs/sources/pv-${finalAttrs.version}.tar.gz";
hash = "sha256-DMGIEaSAmlh9SxHUdpG7wK2DpdldLCYGr3Tqe0pnR1Y=";
hash = "sha256-aXanie4bvP3EdzIBW2BYnB0ECIkiUt18u0T0M2Oi8zo=";
};
meta = {
+3 -3
View File
@@ -20,19 +20,19 @@
stdenv.mkDerivation (finalAttrs: {
pname = "resources";
version = "1.6.0";
version = "1.7.0";
src = fetchFromGitHub {
owner = "nokyan";
repo = "resources";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-RYpPg9dEasHkXF2eHpeCze5j0FC1+9/J0e2lRw8AdKc=";
hash = "sha256-mnOpWVJTNGNdGd6fMIZl3AOF4NbtMm1XS8QFqfAF/18=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit (finalAttrs) src;
name = "resources-${finalAttrs.version}";
hash = "sha256-zliLpmunlxRsWv9N8AswVoRqcNy5PuI5NzNjaXyTiGk=";
hash = "sha256-vIqtKJxKQ/mHFcB6IxfX27Lk2ID/W+M4hQnPB/aExa4=";
};
nativeBuildInputs = [
+1 -2
View File
@@ -1,6 +1,6 @@
{ lib, rustPlatform, fetchgit
, pkg-config, pixman, libcap_ng, cyrus_sasl
, libpulseaudio, libclang, gtk3, libusbgx, alsa-lib
, libpulseaudio, gtk3, libusbgx, alsa-lib
, linuxHeaders, libseccomp
}:
@@ -29,7 +29,6 @@ rustPlatform.buildRustPackage rec {
gtk3
libusbgx
alsa-lib
libclang
linuxHeaders
libseccomp
];
+4 -4
View File
@@ -2,21 +2,21 @@
, rustPlatform
, fetchFromGitHub
# lua54 implies lua52/lua53
, features ? [ "lua54" "luau" ]
, features ? [ "lua54" "luajit" "luau" ]
}:
rustPlatform.buildRustPackage rec {
pname = "stylua";
version = "0.20.0";
version = "2.0.1";
src = fetchFromGitHub {
owner = "johnnymorganz";
repo = pname;
rev = "v${version}";
sha256 = "sha256-bqUmLtJLjImWqe06CeIWIU4FP+/Vxszp2yKMosVeyZM=";
sha256 = "sha256-/gCg1mJ4BDmgZ+jdWvns9CkhymWP3jdTqS7Z4n4zsO8=";
};
cargoHash = "sha256-EMHt9oskPJCeAu/5VG6PaMt/4NTmNOaFTM5TMOy0BV8=";
cargoHash = "sha256-A1J1n/KsnZyB9pZFGcMojNU9FFGxk8p6TxlRNW6EwCs=";
# remove cargo config so it can find the linker on aarch64-unknown-linux-gnu
postPatch = ''
+2 -2
View File
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "subread";
version = "2.0.7";
version = "2.0.8";
src = fetchurl {
url = "mirror://sourceforge/subread/subread-${version}/subread-${version}-source.tar.gz";
sha256 = "sha256-/tjt3hn52NiqEo721K5atnvOLb8iWJ9AlJlaE6cVq3U=";
sha256 = "sha256-y12t9xyFDxKKg0ciP+DOGeHBfjlZ6fPrqQ6AkGcfhXA=";
};
buildInputs = [
+2 -2
View File
@@ -15,7 +15,7 @@
}:
let
version = "1.78.0";
version = "1.78.1";
in
buildGo123Module {
pname = "tailscale";
@@ -27,7 +27,7 @@ buildGo123Module {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";
hash = "sha256-AujYfsPrLT0D6POge/pcA6dtWpQ4I6vI5op7zqzJ/+g=";
hash = "sha256-HHLGvxB3MMmmOUNLr2ivouLDO/Lo2FJYRYzoCE2fUDk=";
};
patches = [
-2
View File
@@ -7,7 +7,6 @@
ffmpeg,
openssl,
alsa-lib,
libclang,
opencv,
makeWrapper,
}:
@@ -42,7 +41,6 @@ rustPlatform.buildRustPackage rec {
buildInputs = [
openssl.dev
alsa-lib.dev
(lib.getLib libclang)
ffmpeg.dev
opencv
];
File diff suppressed because it is too large Load Diff
+4 -8
View File
@@ -18,21 +18,17 @@
rustPlatform.buildRustPackage rec {
pname = "turbo-unwrapped";
version = "2.3.0";
version = "2.3.3";
src = fetchFromGitHub {
owner = "vercel";
repo = "turbo";
rev = "refs/tags/v${version}";
hash = "sha256-R3fr52v5DAfl+Isk2AspDabQIx00IoIoFKbkTSSgvXA=";
hash = "sha256-L51RgXUlA9hnVt232qdLo6t0kqXl7b01jotUk1r8wO0=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"update-informer-1.1.0" = "sha256-pvt4f7tfefWin+DMql/zarN/q9gijpERF7l0CxcvX2s=";
};
};
useFetchCargoVendor = true;
cargoHash = "sha256-qv5bK65vA94M/YSjSRaYilg44NqkzF2ybmUVapu8cpI=";
nativeBuildInputs =
[
@@ -1,14 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 31e8048..1eec936 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,8 +7,7 @@ include(FetchContent)
FetchContent_Declare(
spdlog
- GIT_REPOSITORY https://github.com/gabime/spdlog.git
- GIT_TAG v1.10.0
+ SOURCE_DIR @spdlog_src@
)
FetchContent_MakeAvailable(spdlog)
@@ -1,14 +1,43 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 31e8048..a125b3f 100644
index 31e8048..b21f6f4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,3 +20,9 @@ include_directories(${GTKMM_INCLUDE_DIRS} ${X11_INCLUDE_DIR})
@@ -5,12 +5,7 @@ set(CMAKE_CXX_STANDARD 17)
find_package(PkgConfig)
include(FetchContent)
-FetchContent_Declare(
- spdlog
- GIT_REPOSITORY https://github.com/gabime/spdlog.git
- GIT_TAG v1.10.0
-)
-FetchContent_MakeAvailable(spdlog)
+find_package(spdlog REQUIRED)
pkg_check_modules(GTKMM REQUIRED gtkmm-3.0)
find_package(X11 REQUIRED)
@@ -19,4 +14,10 @@ link_directories(${GTKMM_LIBRARY_DIRS})
include_directories(${GTKMM_INCLUDE_DIRS} ${X11_INCLUDE_DIR})
add_executable(WSysMon src/main.cpp src/ui/MainWindow.cpp src/ui/widgets/GraphWidget.cpp src/ui/widgets/PerformanceButton.cpp src/ui/views/ProcessesView.cpp src/ui/views/PerformanceView.cpp src/ui/views/performance/PerformanceCPUView.cpp src/ui/views/performance/PerformanceGPUView.cpp src/ui/views/performance/PerformanceNetworkView.cpp src/ui/views/performance/PerformanceRAMView.cpp src/utils/DispatcherThread.cpp src/utils/UnitConverter.cpp src/utils/X11Utils.cpp src/api/process/ProcessManager.cpp src/api/process/ProcessNode.cpp src/api/linux/ProcessesApi.cpp src/api/linux/GPUApi.cpp src/api/linux/NetworkApi.cpp src/api/linux/SystemInfoApi.cpp src/api/DiskApi.h src/api/linux/DiskApi.cpp src/ui/views/performance/PerformanceDiskView.cpp src/ui/views/performance/PerformanceDiskView.h src/api/linux/gpu/nvml.h src/api/linux/gpu/nvml_hook_funcs.inl src/api/linux/gpu/NvGpuApi.cpp src/api/linux/gpu/NvGpuApi.h src/api/HwMonApi.h src/api/linux/HwMonApi.cpp)
target_link_libraries(WSysMon PRIVATE spdlog::spdlog pthread procps ${CMAKE_DL_LIBS} ${GTKMM_LIBRARIES} ${X11_LIBRARIES})
-target_link_libraries(WSysMon PRIVATE spdlog::spdlog pthread procps ${CMAKE_DL_LIBS} ${GTKMM_LIBRARIES} ${X11_LIBRARIES})
+target_link_libraries(WSysMon PRIVATE spdlog::spdlog pthread ${CMAKE_DL_LIBS} ${GTKMM_LIBRARIES} ${X11_LIBRARIES})
+
+install(
+ TARGETS
+ WSysMon
+ RUNTIME DESTINATION bin
+)
diff --git a/src/api/process/ProcessManager.h b/src/api/process/ProcessManager.h
index 44989f4..2e98963 100644
--- a/src/api/process/ProcessManager.h
+++ b/src/api/process/ProcessManager.h
@@ -5,8 +5,6 @@
#include <map>
#include <vector>
-#include <proc/readproc.h>
-
#include "ProcessNode.h"
#include "../ProcessesApi.h"
+15 -19
View File
@@ -1,13 +1,12 @@
{ lib
, stdenv
, fetchFromGitHub
, substituteAll
, cmake
, pkg-config
, gtkmm3
, gtk3
, procps
, spdlog
{
lib,
stdenv,
fetchFromGitHub,
cmake,
pkg-config,
gtkmm3,
gtk3,
spdlog,
}:
stdenv.mkDerivation rec {
@@ -18,17 +17,15 @@ stdenv.mkDerivation rec {
owner = "slyfabi";
repo = "wsysmon";
rev = version;
sha256 = "sha256-5kfZT+hm064qXoAzi0RdmUqXi8VaXamlbm+FJOrGh3A=";
hash = "sha256-5kfZT+hm064qXoAzi0RdmUqXi8VaXamlbm+FJOrGh3A=";
};
patches = [
# Prevent CMake from trying to fetch libraries from GitHub
(substituteAll {
src = ./dependencies.patch;
spdlog_src = spdlog.src;
})
# Add an installPhase
./install.patch
# - Dynamically link spdlog
# - Remove dependency on procps (had a newer version than this package expected)
# - See https://github.com/SlyFabi/WSysMon/issues/4 for the issue about procps and why it could be removed
# - Add an installPhase
./fix-deps-and-add-install.patch
];
nativeBuildInputs = [
@@ -39,7 +36,6 @@ stdenv.mkDerivation rec {
buildInputs = [
gtkmm3
gtk3
procps
spdlog
];
-2
View File
@@ -2,7 +2,6 @@
lib,
rustPlatform,
fetchFromGitHub,
clang,
cmake,
copyDesktopItems,
curl,
@@ -122,7 +121,6 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs =
[
clang
cmake
copyDesktopItems
curl
+3 -3
View File
@@ -46,11 +46,11 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "go";
version = "1.22.9";
version = "1.22.10";
src = fetchurl {
url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
hash = "sha256-6Bo2L1Gu4hJXIrAY5GcU5qBVoZVCg0FMD5N+c3AT2yI=";
hash = "sha256-HpT9SL51DR+vtNmztt0xpunSc10zm/JGK8l7ZMpMEDc=";
};
strictDeps = true;
@@ -179,7 +179,7 @@ stdenv.mkDerivation (finalAttrs: {
};
meta = with lib; {
changelog = "https://go.dev/doc/devel/release#go${lib.versions.majorMinor finalAttrs.version}";
changelog = "https://go.dev/doc/devel/release#go${finalAttrs.version}";
description = "Go Programming language";
homepage = "https://go.dev/";
license = licenses.bsd3;
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "binance-connector";
version = "3.9.0";
version = "3.10.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "binance";
repo = "${pname}-python";
rev = "refs/tags/v${version}";
hash = "sha256-i0dJ7UO7HZ9bWhWtWBZ5OwloRBUiZgUKRXab4sm2w/o=";
hash = "sha256-WZUDGUAFy4t5uLtv/p5UkBMX+posilbgEHazIDYFc+Q=";
};
propagatedBuildInputs = [
@@ -36,7 +36,9 @@ buildPythonPackage rec {
pythonRelaxDeps = [ "qrcode" ];
checkPhase = ''
${python.interpreter} -m django test --settings tests.settings
# Disable failing test test_origin_https
# https://github.com/xi/django-mfa3/issues/24
${python.interpreter} -m django test --settings tests.settings -k "not test_origin_https"
'';
meta = {
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "hg-git";
version = "1.1.3";
version = "1.1.4";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "hg_git";
inherit version;
hash = "sha256-lqnCi4MjdPVCIXdYAIDGdRY5zcU5QPrSHzy+NKysMtc=";
hash = "sha256-XF9vAtvUK5yRP4OxZv83/AA2jde5t7za3jqgyuXc5eU=";
};
build-system = [
@@ -22,7 +22,7 @@
let
llm = buildPythonPackage rec {
pname = "llm";
version = "0.17.1";
version = "0.19";
pyproject = true;
build-system = [ setuptools ];
@@ -33,7 +33,7 @@ let
owner = "simonw";
repo = "llm";
rev = "refs/tags/${version}";
hash = "sha256-6OO0SIIxChM5HRJoUM4CYGbsINmc3i+iyL/oahLHhrY=";
hash = "sha256-FlE4VtvCvlNMJCf7qPrvQzJn9HcN/7UwH/UNL0XP618=";
};
patches = [ ./001-disable-install-uninstall-commands.patch ];
-33
View File
@@ -1,33 +0,0 @@
{ lib, stdenv, fetchCrate, rustPlatform, CoreFoundation, Security }:
rustPlatform.buildRustPackage rec {
pname = "dprint";
version = "0.47.2";
src = fetchCrate {
inherit pname version;
hash = "sha256-zafRwiXfRACT6G408pXLCk7t6akabOs1VFLRF9SeNWI=";
};
cargoHash = "sha256-86ecnwDDVvgXgBBodP2rSZOn+R52Jap8RCKILttGOn8=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security ];
# Tests fail because they expect a test WASM plugin. Tests already run for
# every commit upstream on GitHub Actions
doCheck = false;
meta = with lib; {
description = "Code formatting platform written in Rust";
longDescription = ''
dprint is a pluggable and configurable code formatting platform written in Rust.
It offers multiple WASM plugins to support various languages. It's written in
Rust, so its small, fast, and portable.
'';
changelog = "https://github.com/dprint/dprint/releases/tag/${version}";
homepage = "https://dprint.dev";
license = licenses.mit;
maintainers = with maintainers; [ khushraj ];
mainProgram = "dprint";
};
}
@@ -1,43 +1,45 @@
{ stdenv
, lib
, fetchurl
, makeWrapper
, makeDesktopItem
, copyDesktopItems
, _7zz
, jdk
{
stdenv,
lib,
fetchurl,
makeWrapper,
makeDesktopItem,
copyDesktopItems,
_7zz,
jdk,
}:
let
inherit (stdenv.hostPlatform) system;
pname = "jprofiler";
version = "13.0.6";
version = "14.0.5";
nameApp = "JProfiler";
meta = with lib; {
meta = {
description = "JProfiler's intuitive UI helps you resolve performance bottlenecks";
longDescription = ''
JProfiler's intuitive UI helps you resolve performance bottlenecks,
pin down memory leaks and understand threading issues.
'';
homepage = "https://www.ej-technologies.com/products/jprofiler/overview.html";
license = licenses.unfree;
maintainers = with maintainers; [ catap ];
license = lib.licenses.unfree;
maintainers = [ ];
};
src = if stdenv.hostPlatform.isLinux then fetchurl {
url = "https://download-gcdn.ej-technologies.com/jprofiler/jprofiler_linux_${lib.replaceStrings ["."] ["_"] version}.tar.gz";
hash = "sha256-orjBSaC7NvKcak+RSEa9V05oL3EZIBnp7TyaX/8XFyg=";
} else fetchurl {
url = "https://download-gcdn.ej-technologies.com/jprofiler/jprofiler_macos_${lib.replaceStrings ["."] ["_"] version}.dmg";
hash = "sha256-OI6NSPqYws5Rv25U5jIPzkyJtB8LF04qHB3NPR9XBWg=";
};
srcIcon = fetchurl {
url = "https://www.ej-technologies.com/assets/content/header-product-jprofiler@2x-24bc4d84bd2a4eb641a5c8531758ff7c.png";
hash = "sha256-4T0j2ctHmgWOSCmFG2PZCLJS57nIa5MxmJBpMYzy9FI=";
};
src =
if stdenv.hostPlatform.isLinux then
fetchurl {
url = "https://download.ej-technologies.com/jprofiler/jprofiler_linux_${
lib.replaceStrings [ "." ] [ "_" ] version
}.tar.gz";
hash = "sha256-S7e2WurDJ0ePzpMg0YK94Mn0eHfb8/jNmf0kYts2Y0M=";
}
else
fetchurl {
url = "https://download-gcdn.ej-technologies.com/jprofiler/jprofiler_macos_${
lib.replaceStrings [ "." ] [ "_" ] version
}.dmg";
hash = "sha256-HPGh+dRfLuQprpgnu8oFboHUB1xvFqPblJcowqgZ5KA=";
};
desktopItems = [
(makeDesktopItem {
@@ -52,12 +54,21 @@ let
];
linux = stdenv.mkDerivation {
inherit pname version src desktopItems;
inherit
pname
version
src
desktopItems
;
nativeBuildInputs = [ makeWrapper copyDesktopItems ];
nativeBuildInputs = [
makeWrapper
copyDesktopItems
];
installPhase = ''
runHook preInstall
cp -r . $out
rm -f $out/bin/updater
@@ -69,22 +80,30 @@ let
wrapProgram $f --set JAVA_HOME "${jdk.home}"
done
install -Dm644 "${srcIcon}" \
install -Dm644 "./.install4j/i4j_extf_7_1u09tly_16qtnph.png" \
"$out/share/icons/hicolor/scalable/apps/jprofiler.png"
runHook postInstall
'';
meta = meta // { platforms = lib.platforms.linux; };
meta = meta // {
platforms = lib.platforms.linux;
};
};
darwin = stdenv.mkDerivation {
inherit pname version src;
nativeBuildInputs = [ makeWrapper _7zz ];
nativeBuildInputs = [
makeWrapper
_7zz
];
unpackPhase = ''
runHook preUnpack
7zz x $src -x!JProfiler/\[\]
runHook postUnpack
'';
@@ -92,13 +111,17 @@ let
installPhase = ''
runHook preInstall
mkdir -p $out/{Applications,bin}
cp -R ${nameApp}.app $out/Applications/
makeWrapper $out/Applications/${nameApp}.app/Contents/MacOS/JavaApplicationStub $out/bin/${pname}
runHook postInstall
'';
meta = meta // { platforms = lib.platforms.darwin; };
meta = meta // {
platforms = lib.platforms.darwin;
};
};
in
if stdenv.hostPlatform.isDarwin then darwin else linux
@@ -1,16 +1,20 @@
{ lib, fetchurl, buildDunePackage
{ lib, fetchurl, ocaml, buildDunePackage
, cmdliner, yojson, ppxlib, findlib
, menhir, menhirLib, sedlex
, version ? if lib.versionAtLeast ocaml.version "4.11" then "5.9.1" else "5.8.2"
}:
buildDunePackage rec {
buildDunePackage {
pname = "js_of_ocaml-compiler";
version = "5.8.2";
inherit version;
minimalOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz";
hash = "sha256-ciAZS9L5sU2VgVOlogZ1A1nXtJ3hL+iNdFDThc7L8Eo=";
hash = {
"5.9.1" = "sha256-aMlcYIcdjpyaVMgvNeLtUEE7y0QPIg0LNRayoe4ccwc=";
"5.8.2" = "sha256-ciAZS9L5sU2VgVOlogZ1A1nXtJ3hL+iNdFDThc7L8Eo=";
}."${version}";
};
nativeBuildInputs = [ menhir ];
@@ -1,5 +1,5 @@
{ buildDunePackage, js_of_ocaml-compiler
, ppxlib, uchar
, ppxlib
}:
buildDunePackage {
@@ -9,7 +9,7 @@ buildDunePackage {
buildInputs = [ ppxlib ];
propagatedBuildInputs = [ js_of_ocaml-compiler uchar ];
propagatedBuildInputs = [ js_of_ocaml-compiler ];
meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ];
}
@@ -1,5 +1,5 @@
{ buildDunePackage, js_of_ocaml-compiler, js_of_ocaml-ppx
, js_of_ocaml, ocaml_lwt, lwt_log
, js_of_ocaml, lwt, lwt_log
}:
buildDunePackage {
@@ -9,7 +9,7 @@ buildDunePackage {
buildInputs = [ js_of_ocaml-ppx ];
propagatedBuildInputs = [ js_of_ocaml ocaml_lwt lwt_log ];
propagatedBuildInputs = [ js_of_ocaml lwt lwt_log ];
meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ];
}
+2 -2
View File
@@ -30,11 +30,11 @@
stdenv.mkDerivation rec {
pname = "qtcreator";
version = "14.0.2";
version = "15.0.0";
src = fetchurl {
url = "mirror://qt/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz";
hash = "sha256-stL4eLtpKKjm4w2HYAvdk89ATCYZoVHGS9zcjNB4OJI=";
hash = "sha256-I7HGtHjKdgmX7N3Uxyjw2igLBpYAipvd2aEGjxbUj3I=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -1,10 +1,10 @@
{ lib, stdenv, buildPackages, kernel, pciutils, gettext }:
{ lib, stdenv, buildPackages, kernel, pciutils, gettext, which }:
stdenv.mkDerivation {
pname = "cpupower";
inherit (kernel) version src patches;
nativeBuildInputs = [ gettext ];
nativeBuildInputs = [ gettext which ];
buildInputs = [ pciutils ];
postPatch = ''
@@ -24,11 +24,11 @@
"hash": "sha256:0d8q0vwv3lcix3wiq2n53rir3h298flg2l0ghpify4rlh2s4l1fi"
},
"6.11": {
"version": "6.11.10",
"hash": "sha256:0xzynjyyr16my0wrla4ggpjbh4g7nsqixaimz5hrsqlhaa8q9hab"
"version": "6.11.11",
"hash": "sha256:1z2913y38clnlmhvwj49h7p4pic24s4d8np7nmd4lk7m2xz8w532"
},
"6.12": {
"version": "6.12.1",
"hash": "sha256:06f6y37fi7galj001wwrq5pz3vhdl9nryydf3f4yqwnkdpcb34q1"
"version": "6.12.2",
"hash": "sha256:12rx83ryh1i1n79h05zgx1mn60s9fc0p7gh560gpp1ryqw80f7mv"
}
}
+5 -5
View File
@@ -1,18 +1,18 @@
{ lib, stdenv, kernel, fetchFromGitHub }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "new-lg4ff";
version = "0.4.0";
version = "0-unstable-2024-11-25";
src = fetchFromGitHub {
owner = "berarma";
repo = "new-lg4ff";
rev = version;
sha256 = "ZFwNdeJcSxzWtqjOF86SZpqhuz8jXZ2drvlQeIqsaNY=";
rev = "6100a34c182536c607af80e119d54a66c6fb2a23";
sha256 = "sha256-90PnQDGwp94ELvWx6p8QiZucYmTbH3N0GiZbj3fo25g=";
};
preBuild = ''
substituteInPlace Makefile --replace "modules_install" "INSTALL_MOD_PATH=$out modules_install"
substituteInPlace Makefile --replace-fail "modules_install" "INSTALL_MOD_PATH=$out modules_install"
sed -i '/depmod/d' Makefile
sed -i "10i\\\trmmod hid-logitech 2> /dev/null || true" Makefile
sed -i "11i\\\trmmod hid-logitech-new 2> /dev/null || true" Makefile
@@ -62,7 +62,7 @@ substitute {
description = "Rebuild your NixOS configuration and switch to it, on local hosts and remote";
homepage = "https://github.com/NixOS/nixpkgs/tree/master/pkgs/os-specific/linux/nixos-rebuild";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.Profpatsch ];
maintainers = with lib.maintainers; [ Profpatsch thiagokokada ];
mainProgram = "nixos-rebuild";
};
}
-4
View File
@@ -8085,10 +8085,6 @@ with pkgs;
dbt = with python3Packages; toPythonApplication dbt-core;
dprint = callPackage ../development/tools/dprint {
inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation Security;
};
devbox = callPackage ../development/tools/devbox { buildGoModule = buildGo123Module; };
libcxx = llvmPackages.libcxx;
+2
View File
@@ -7182,8 +7182,10 @@ with self; {
url = "mirror://cpan/authors/id/P/PA/PALI/DBD-MariaDB-1.23.tar.gz";
hash = "sha256-DQx2xmDd1VVw5I8+L96o9iGmmsDtSBkOjPyvy16bhZ0=";
};
nativeBuildInputs = [ pkgs.mariadb-connector-c ];
buildInputs = [ pkgs.mariadb-connector-c DevelChecklib TestDeep TestDistManifest TestPod ];
propagatedBuildInputs = [ DBI ];
strictDeps = true;
meta = {
description = "MariaDB and MySQL driver for the Perl5 Database Interface (DBI)";
homepage = "https://github.com/gooddata/DBD-MariaDB";