Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
c61915bc96
32 changed files with 378 additions and 105 deletions
|
|
@ -15294,6 +15294,12 @@
|
|||
fingerprint = "E4F4 1EAB BF0F C785 06D8 62EF EF68 CF41 D42A 593D";
|
||||
}];
|
||||
};
|
||||
ryangibb = {
|
||||
email = "ryan@freumh.org";
|
||||
github = "ryangibb";
|
||||
githubId = 22669046;
|
||||
name = "Ryan Gibb";
|
||||
};
|
||||
ryanorendorff = {
|
||||
github = "ryanorendorff";
|
||||
githubId = 12442942;
|
||||
|
|
|
|||
|
|
@ -25,13 +25,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "reaper";
|
||||
version = "6.82";
|
||||
version = "7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = url_for_platform version stdenv.hostPlatform.qemuArch;
|
||||
hash = {
|
||||
x86_64-linux = "sha256-2vtkOodMj0JGLQQn4a+XHxodHQqpnSW1ea7v6aC9sHo=";
|
||||
aarch64-linux = "sha256-FBNfXTnxqq22CnFrE2zvf6kDy/p/+SXOzqz7JS3IdG8=";
|
||||
x86_64-linux = "sha256-lHXy1xSwhNht6dt30e35nE1ZpOm8oTMMpoZJI7ELsjg=";
|
||||
aarch64-linux = "sha256-a/e8DQ9NvbLyZHqg7pUxm+kV7i5vKCjeq9EOO0/5TJk=";
|
||||
}.${stdenv.hostPlatform.system};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -732,8 +732,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "chatgpt-reborn";
|
||||
publisher = "chris-hayes";
|
||||
version = "3.16.3";
|
||||
sha256 = "wkitG5gmYKYKXRw/zVW04HN1dePiTjbnynFOY/bwxfI=";
|
||||
version = "3.19.1";
|
||||
sha256 = "1msb3lqy9p2v26nsw0clfsisiwxcid3jp1l6549hk1i1gcqhd84w";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -741,8 +741,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "path-intellisense";
|
||||
publisher = "christian-kohler";
|
||||
version = "2.8.4";
|
||||
sha256 = "sha256-FEBYcjJHOwmxVHhhyxqOpk/V6hvtMkhkvLVpmJCMSZw=";
|
||||
version = "2.8.5";
|
||||
sha256 = "1ndffv1m4ayiija1l42m28si44vx9y6x47zpxzqv2j4jj7ga1n5z";
|
||||
};
|
||||
meta = {
|
||||
description = "Visual Studio Code plugin that autocompletes filenames";
|
||||
|
|
@ -1575,9 +1575,10 @@ let
|
|||
mktplcRef = {
|
||||
publisher = "github";
|
||||
name = "copilot";
|
||||
version = "1.89.156";
|
||||
sha256 = "sha256-BJnYd9D3bWrZI8UETnAua8ngVjZJ7EXB1UrZAjVnx1E=";
|
||||
version = "1.126.493";
|
||||
sha256 = "1an7z8z3xz2piw2xz1hdrs6l5rhpyvnjmb650ff2m4k24n01svfy";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "GitHub Copilot uses OpenAI Codex to suggest code and entire functions in real-time right from your editor.";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=GitHub.copilot";
|
||||
|
|
@ -1645,8 +1646,8 @@ let
|
|||
# the VSCode Marketplace and use a calver scheme. We should avoid
|
||||
# using preview versions, because they can require insider versions
|
||||
# of VS Code
|
||||
version = "0.68.1";
|
||||
sha256 = "sha256-d60ZxWQLZa2skOB3Iv9K04aGNZA1d1A82N7zRaxAzlI=";
|
||||
version = "0.75.2023101209";
|
||||
sha256 = "1saz4brd5k1wyy7pz1h3jcl4kq35f78s2q8drjd7v2k97jhy8la1";
|
||||
};
|
||||
meta = { license = lib.licenses.mit; };
|
||||
};
|
||||
|
|
@ -1891,8 +1892,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "latex-workshop";
|
||||
publisher = "James-Yu";
|
||||
version = "9.10.0";
|
||||
sha256 = "s0+8952svPSA69M4H29zuIxUWV6xNRpIqLNd8pzGJhY=";
|
||||
version = "9.14.1";
|
||||
sha256 = "1a8im7n25jy2zyqcqhscj62bamhwzp6kk6hdarb0p38d4pwwzxbm";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog";
|
||||
|
|
@ -2361,9 +2362,10 @@ let
|
|||
mktplcRef = {
|
||||
name = "direnv";
|
||||
publisher = "mkhl";
|
||||
version = "0.14.0";
|
||||
sha256 = "sha256-T+bt6ku+zkqzP1gXNLcpjtFAevDRiSKnZaE7sM4pUOs=";
|
||||
version = "0.15.2";
|
||||
sha256 = "06lp4qgnksklgc6nvx1l9z38y7apbx0a6v886nd15aq9rq8my0ka";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "direnv support for Visual Studio Code";
|
||||
license = lib.licenses.bsd0;
|
||||
|
|
@ -2726,12 +2728,15 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
|
||||
nvarner.typst-lsp = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "typst-lsp";
|
||||
publisher = "nvarner";
|
||||
version = "0.5.0";
|
||||
sha256 = "sha256-4bZbjbcd/EjSRBMkzMs1pD00qyQb5W6gePh4xfoU6Ug=";
|
||||
# Please update the corresponding binary (typst-lsp) when updating
|
||||
# this extension.
|
||||
version = "0.10.1";
|
||||
sha256 = "sha256-+LOw9JPpL5eLNxmP4kyPo9S/w8ZxfPGSaY1oR8THmvI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ jq moreutils ];
|
||||
|
|
@ -2832,8 +2837,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "material-icon-theme";
|
||||
publisher = "PKief";
|
||||
version = "4.29.0";
|
||||
sha256 = "sha256-YqleqYSpZuhGFGkNo3FRLjiglxX+iUCJl69CRCY/oWM=";
|
||||
version = "4.31.0";
|
||||
sha256 = "0rn4dyqr46wbgi4k27ni6a6i3pa83gyaprhds5rlndjaw90iakb4";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
|
|
@ -2898,8 +2903,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "vscode-xml";
|
||||
publisher = "redhat";
|
||||
version = "0.25.2023032304";
|
||||
sha256 = "sha256-3hU/MZU9dP91p2PVycFL6yg/nf4/x8tt76vmlkiHnE8=";
|
||||
version = "0.26.2023092519";
|
||||
sha256 = "00p98qihw7ndwl4h18jx8n0lmrqsn1vab7h2k3cbjdz0b623j773";
|
||||
};
|
||||
meta.license = lib.licenses.epl20;
|
||||
};
|
||||
|
|
@ -2908,8 +2913,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "vscode-yaml";
|
||||
publisher = "redhat";
|
||||
version = "1.12.0";
|
||||
sha256 = "sha256-r/me14KonxnQeensIYyWU4dQrhomc8h2ntYoiZ+Y7jE=";
|
||||
version = "1.14.0";
|
||||
sha256 = "0pww9qndd2vsizsibjsvscz9fbfx8srrj67x4vhmwr581q674944";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
|
|
@ -3339,8 +3344,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "vscode-tailscale";
|
||||
publisher = "tailscale";
|
||||
version = "0.4.0";
|
||||
sha256 = "sha256-c/BZHKHs2EKd37148dSxEeP1wBXv75HhDqzegmHPjOs=";
|
||||
version = "0.6.4";
|
||||
sha256 = "1jcq5kdcdyb5yyy0p9cnv56vmclvb6wdwq8xvy1qbkfdqbmy05gm";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/tailscale.vscode-tailscale/changelog";
|
||||
|
|
@ -3548,8 +3553,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "errorlens";
|
||||
publisher = "usernamehw";
|
||||
version = "3.12.0";
|
||||
sha256 = "sha256-G5+We49/f5UwYqoBovegRK+UOT6KPZo85cvoDjD1Mu4=";
|
||||
version = "3.14.0";
|
||||
sha256 = "0k70f5f4hcv3jl3a04736ml8amx8w7wb3mb8f6l5gngnvq9fj528";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/usernamehw.errorlens/changelog";
|
||||
|
|
@ -3750,8 +3755,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "gitblame";
|
||||
publisher = "waderyan";
|
||||
version = "10.1.0";
|
||||
sha256 = "TTYBaJ4gcMVICz4bGZTvbNRPpWD4tXuAJbI8QcHNDv0=";
|
||||
version = "10.5.1";
|
||||
sha256 = "119rf52xnxz0cwvvjjfc5m5iv19288cxz33xzr79b67wyfd79hl9";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/waderyan.gitblame/changelog";
|
||||
|
|
@ -3888,8 +3893,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "material-theme";
|
||||
publisher = "zhuangtongfa";
|
||||
version = "3.15.8";
|
||||
sha256 = "sha256-PwWGs9KRfV3qpYbgdiw8FYvnkaJQ2VW2H6p6+umk7eg=";
|
||||
version = "3.16.2";
|
||||
sha256 = "0ava94zn68lxy3ph78r5rma39qz03al5l5i6x070mpa1hzj3i319";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p curl jq unzip
|
||||
#! nix-shell -i bash -p cacert curl jq unzip
|
||||
# shellcheck shell=bash
|
||||
set -eu -o pipefail
|
||||
|
||||
|
|
|
|||
|
|
@ -6,23 +6,23 @@
|
|||
, pipewire
|
||||
, libpulseaudio
|
||||
, xdg-utils
|
||||
, electron_25
|
||||
, electron_27
|
||||
, makeDesktopItem
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "webcord";
|
||||
version = "4.4.3";
|
||||
version = "4.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SpacingBat3";
|
||||
repo = "WebCord";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Se73TANnZUvbSe3v4woofRzYARP2h2HjO1kv/5sDRyA=";
|
||||
hash = "sha256-SIGV/Hl5O+xs1DbA25TGasXJVYgCzAP/GCtsDmxKDvI=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-O3eFtgDO+2A7PygrLj6iT/rptnG+oR5tD2lhhz6Iwug=";
|
||||
npmDepsHash = "sha256-ClPcLHO4+CzOswQaItbFYHVlb0W6Y5NZF140jGpoSJ8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
|
|
@ -59,7 +59,7 @@ buildNpmPackage rec {
|
|||
install -Dm644 sources/assets/icons/app.png $out/share/icons/hicolor/256x256/apps/webcord.png
|
||||
|
||||
# Add xdg-utils to path via suffix, per PR #181171
|
||||
makeWrapper '${lib.getExe electron_25}' $out/bin/webcord \
|
||||
makeWrapper '${lib.getExe electron_27}' $out/bin/webcord \
|
||||
--prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/webcord \
|
||||
--suffix PATH : "${binPath}" \
|
||||
--add-flags "--ozone-platform-hint=auto" \
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://gnunet.org/";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ pstn vrthra ];
|
||||
platforms = platforms.gnu ++ platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
changelog = "https://git.gnunet.org/gnunet.git/tree/ChangeLog?h=v${version}";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,26 +1,32 @@
|
|||
{ fetchurl, lib, stdenv, libxml2, freetype, libGLU, libGL, glew
|
||||
, qtbase, wrapQtAppsHook, python3
|
||||
, cmake, libjpeg }:
|
||||
{ lib, stdenv, fetchurl, libxml2, freetype, libGLU, libGL, glew
|
||||
, qtbase, wrapQtAppsHook, autoPatchelfHook, python3
|
||||
, cmake, libjpeg, llvmPackages }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tulip";
|
||||
version = "5.6.1";
|
||||
version = "5.7.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/auber/${pname}-${version}_src.tar.gz";
|
||||
sha256 = "1fy3nvgxv3igwc1d23zailcgigj1d0f2kkh7a5j24c0dyqz5zxmw";
|
||||
url = "mirror://sourceforge/auber/tulip-${version}_src.tar.gz";
|
||||
hash = "sha256-b+XFCS6Ks+EpwxgYFzWdRomfCpHXmZHXnrQM+ZSLN/0=";
|
||||
};
|
||||
|
||||
buildInputs = [ libxml2 freetype glew libGLU libGL libjpeg qtbase python3 ];
|
||||
nativeBuildInputs = [ cmake wrapQtAppsHook ];
|
||||
nativeBuildInputs = [ cmake wrapQtAppsHook ]
|
||||
++ lib.optionals stdenv.isLinux [ autoPatchelfHook ];
|
||||
|
||||
buildInputs = [ libxml2 freetype glew libjpeg qtbase python3 ]
|
||||
++ lib.optionals stdenv.isDarwin [ llvmPackages.openmp ]
|
||||
++ lib.optionals stdenv.isLinux [ libGLU libGL ];
|
||||
|
||||
qtWrapperArgs = [ ''--prefix PATH : ${lib.makeBinPath [ python3 ]}'' ];
|
||||
|
||||
# error: format string is not a string literal (potentially insecure)
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-format-security";
|
||||
|
||||
# FIXME: "make check" needs Docbook's DTD 4.4, among other things.
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64);
|
||||
description = "A visualization framework for the analysis and visualization of relational data";
|
||||
|
||||
longDescription =
|
||||
|
|
@ -36,6 +42,6 @@ stdenv.mkDerivation rec {
|
|||
license = lib.licenses.gpl3Plus;
|
||||
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -53,6 +53,13 @@ let
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
doInstallCheck = previousAttrs.doInstallCheck or false;
|
||||
installCheckPhase = previousAttrs.installCheckPhase or ''
|
||||
runHook preCheckInstall
|
||||
|
||||
runHook postCheckInstall
|
||||
'';
|
||||
|
||||
composerRepository = phpDrv.mkComposerRepository {
|
||||
inherit composer composer-local-repo-plugin;
|
||||
inherit (finalAttrs) patches pname src vendorHash version;
|
||||
|
|
|
|||
|
|
@ -74,6 +74,13 @@ let
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
doInstallCheck = previousAttrs.doInstallCheck or false;
|
||||
installCheckPhase = previousAttrs.installCheckPhase or ''
|
||||
runHook preCheckInstall
|
||||
|
||||
runHook postCheckInstall
|
||||
'';
|
||||
|
||||
COMPOSER_CACHE_DIR = "/dev/null";
|
||||
COMPOSER_MIRROR_PATH_REPOS = "1";
|
||||
COMPOSER_HTACCESS_PROTECT = "0";
|
||||
|
|
|
|||
|
|
@ -77,9 +77,9 @@ composerInstallBuildHook() {
|
|||
# because the file contains hardcoded nix store paths, we generate it here.
|
||||
composer-local-repo-plugin --no-ansi build-local-repo -m "${composerRepository}" .
|
||||
|
||||
# Remove all the repositories of type "composer"
|
||||
# Remove all the repositories of type "composer" and "vcs"
|
||||
# from the composer.json file.
|
||||
jq -r -c 'del(try .repositories[] | select(.type == "composer"))' composer.json | sponge composer.json
|
||||
jq -r -c 'del(try .repositories[] | select(.type == "composer" or .type == "vcs"))' composer.json | sponge composer.json
|
||||
|
||||
# Configure composer to disable packagist and avoid using the network.
|
||||
composer config repo.packagist false
|
||||
|
|
|
|||
|
|
@ -71,7 +71,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||
|
||||
composer global config --quiet minimum-stability dev
|
||||
composer global config --quiet prefer-stable true
|
||||
composer global config --quiet autoloader-suffix "nixPredictableAutoloaderSuffix"
|
||||
composer global config --quiet apcu-autoloader false
|
||||
composer global config --quiet allow-plugins.nix-community/composer-local-repo-plugin true
|
||||
composer global config --quiet repo.packagist false
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cpu-x";
|
||||
version = "4.5.3";
|
||||
version = "5.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "X0rg";
|
||||
repo = "CPU-X";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-o48NkOPabfnwsu+nyXJOstW6g0JSUgIrEFx1nNCR7XE=";
|
||||
sha256 = "sha256-mykN+E2ghp2+a06WLYXg9oaQQ2SJDyxIVQSUM00zrCo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config wrapGAppsHook nasm makeWrapper ];
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
let
|
||||
validThemes = [ "bat" "bottom" "btop" "k9s" "lazygit" ];
|
||||
validThemes = [ "bat" "bottom" "btop" "hyprland" "k9s" "kvantum" "lazygit" "plymouth" "refind" "rofi" "waybar" ];
|
||||
in
|
||||
{ fetchFromGitHub
|
||||
, lib
|
||||
|
|
@ -40,6 +40,14 @@ let
|
|||
hash = "sha256-J3UezOQMDdxpflGax0rGBF/XMiKqdqZXuX4KMVGTxFk=";
|
||||
};
|
||||
|
||||
hyprland = fetchFromGitHub {
|
||||
name = "hyprland";
|
||||
owner = "catppuccin";
|
||||
repo = "hyprland";
|
||||
rev = "v1.2";
|
||||
hash = "sha256-07B5QmQmsUKYf38oWU3+2C6KO4JvinuTwmW1Pfk8CT8=";
|
||||
};
|
||||
|
||||
k9s = fetchFromGitHub {
|
||||
name = "k9s";
|
||||
owner = "catppuccin";
|
||||
|
|
@ -48,6 +56,14 @@ let
|
|||
hash = "sha256-PtBJRBNbLkj7D2ko7ebpEjbfK9Ywjs7zbE+Y8FQVEfA=";
|
||||
};
|
||||
|
||||
kvantum = fetchFromGitHub {
|
||||
name = "kvantum";
|
||||
owner = "catppuccin";
|
||||
repo = "Kvantum";
|
||||
rev = "d1e174c85311de9715aefc1eba4b8efd6b2730fc";
|
||||
sha256 = "sha256-IrHo8pnR3u90bq12m7FEXucUF79+iub3I9vgH5h86Lk=";
|
||||
};
|
||||
|
||||
lazygit = fetchFromGitHub {
|
||||
name = "lazygit";
|
||||
owner = "catppuccin";
|
||||
|
|
@ -55,6 +71,38 @@ let
|
|||
rev = "0543c28e8af1a935f8c512ad9451facbcc17d8a8";
|
||||
hash = "sha256-OVihY5E+elPKag2H4RyWiSv+MdIqHtfGNM3/1u2ik6U=";
|
||||
};
|
||||
|
||||
plymouth = fetchFromGitHub {
|
||||
name = "plymouth";
|
||||
owner = "catppuccin";
|
||||
repo = "plymouth";
|
||||
rev = "d4105cf336599653783c34c4a2d6ca8c93f9281c";
|
||||
hash = "sha256-quBSH8hx3gD7y1JNWAKQdTk3CmO4t1kVo4cOGbeWlNE=";
|
||||
};
|
||||
|
||||
refind = fetchFromGitHub {
|
||||
name = "refind";
|
||||
owner = "catppuccin";
|
||||
repo = "refind";
|
||||
rev = "ff0b593c19bb9b469ee0ee36068b8d373f0fadc5";
|
||||
hash = "sha256-itUMo0lA23bJzH0Ndq7L2IaEYoVdNPYxbB/VWkRfRso=";
|
||||
};
|
||||
|
||||
rofi = fetchFromGitHub {
|
||||
name = "rofi";
|
||||
owner = "catppuccin";
|
||||
repo = "rofi";
|
||||
rev = "5350da41a11814f950c3354f090b90d4674a95ce";
|
||||
hash = "sha256-DNorfyl3C4RBclF2KDgwvQQwixpTwSRu7fIvihPN8JY=";
|
||||
};
|
||||
|
||||
waybar = fetchFromGitHub {
|
||||
name = "waybar";
|
||||
owner = "catppuccin";
|
||||
repo = "waybar";
|
||||
rev = "v1.0";
|
||||
hash = "sha256-vfwfBE3iqIN1cGoItSssR7h0z6tuJAhNarkziGFlNBw=";
|
||||
};
|
||||
};
|
||||
in
|
||||
lib.checkListOfEnum "${pname}: variant" validVariants [ variant ]
|
||||
|
|
@ -77,6 +125,9 @@ stdenvNoCC.mkDerivation {
|
|||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
local capitalizedVariant=$(sed 's/^\(.\)/\U\1/' <<< "${variant}")
|
||||
local capitalizedAccent=$(sed 's/^\(.\)/\U\1/' <<< "${accent}")
|
||||
|
||||
'' + lib.optionalString (lib.elem "bat" themeList) ''
|
||||
mkdir -p $out/bat
|
||||
cp "${sources.bat}/Catppuccin-${variant}.tmTheme" "$out/bat/"
|
||||
|
|
@ -89,15 +140,41 @@ stdenvNoCC.mkDerivation {
|
|||
mkdir -p $out/bottom
|
||||
cp "${sources.bottom}/themes/${variant}.toml" "$out/bottom/"
|
||||
|
||||
'' + lib.optionalString (lib.elem "hyprland" themeList) ''
|
||||
mkdir -p $out/hyprland
|
||||
cp "${sources.hyprland}/themes/${variant}.conf" "$out/hyprland/"
|
||||
|
||||
'' + lib.optionalString (lib.elem "k9s" themeList) ''
|
||||
mkdir -p $out/k9s
|
||||
cp "${sources.k9s}/dist/${variant}.yml" "$out/k9s/"
|
||||
|
||||
'' + lib.optionalString (lib.elem "kvantum" themeList) ''
|
||||
mkdir -p $out/share/Kvantum
|
||||
cp -r ${sources.kvantum}/src/Catppuccin-"$capitalizedVariant"-"$capitalizedAccent" $out/share/Kvantum
|
||||
|
||||
'' + lib.optionalString (lib.elem "lazygit" themeList) ''
|
||||
mkdir -p $out/lazygit/{themes,themes-mergable}
|
||||
cp "${sources.lazygit}/themes/${variant}/${variant}-${accent}.yml" "$out/lazygit/themes/"
|
||||
cp "${sources.lazygit}/themes-mergable/${variant}/${variant}-${accent}.yml" "$out/lazygit/themes-mergable/"
|
||||
|
||||
'' + lib.optionalString (lib.elem "plymouth" themeList) ''
|
||||
mkdir -p $out/share/plymouth/themes/catppuccin-${variant}
|
||||
cp ${sources.plymouth}/themes/catppuccin-${variant}/* $out/share/plymouth/themes/catppuccin-${variant}
|
||||
sed -i 's:\(^ImageDir=\)/usr:\1'"$out"':' $out/share/plymouth/themes/catppuccin-${variant}/catppuccin-${variant}.plymouth
|
||||
|
||||
'' + lib.optionalString (lib.elem "rofi" themeList) ''
|
||||
mkdir -p $out/rofi
|
||||
cp ${sources.rofi}/basic/.local/share/rofi/themes/catppuccin-${variant}.rasi $out/rofi/
|
||||
|
||||
'' + lib.optionalString (lib.elem "refind" themeList) ''
|
||||
mkdir -p $out/refind/assets
|
||||
cp ${sources.refind}/${variant}.conf $out/refind/
|
||||
cp -r ${sources.refind}/assets/${variant} $out/refind/assets/
|
||||
|
||||
'' + lib.optionalString (lib.elem "waybar" themeList) ''
|
||||
mkdir -p $out/waybar
|
||||
cp ${sources.waybar}/${variant}.css $out/waybar/
|
||||
|
||||
'' + ''
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, substituteAll
|
||||
, libtool, gettext, zlib, bzip2, flac, libvorbis
|
||||
, exiv2, libgsf, rpm, pkg-config
|
||||
, exiv2, libgsf, pkg-config
|
||||
, rpmSupport ? stdenv.isLinux, rpm
|
||||
, gstreamerSupport ? true, gst_all_1
|
||||
# ^ Needed e.g. for proper id3 and FLAC support.
|
||||
# Set to `false` to decrease package closure size by about 87 MB (53%).
|
||||
|
|
@ -52,8 +53,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs =
|
||||
[ libtool gettext zlib bzip2 flac libvorbis exiv2
|
||||
libgsf rpm
|
||||
] ++ lib.optionals gstreamerSupport
|
||||
libgsf
|
||||
] ++ lib.optionals rpmSupport [ rpm ]
|
||||
++ lib.optionals gstreamerSupport
|
||||
([ gst_all_1.gstreamer ] ++ gstPlugins gst_all_1)
|
||||
++ lib.optionals gtkSupport [ glib gtk3 ]
|
||||
++ lib.optionals videoSupport [ ffmpeg_4 libmpeg2 ];
|
||||
|
|
@ -68,7 +70,7 @@ stdenv.mkDerivation rec {
|
|||
# Checks need to be run after "make install", otherwise plug-ins are not in
|
||||
# the search path, etc.
|
||||
doCheck = false;
|
||||
doInstallCheck = true;
|
||||
doInstallCheck = !stdenv.isDarwin;
|
||||
installCheckPhase = "make check";
|
||||
|
||||
meta = with lib; {
|
||||
|
|
@ -98,6 +100,6 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl3Plus;
|
||||
|
||||
maintainers = [ maintainers.jorsn ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
|||
description = "A fork of libcurl used by GNUnet";
|
||||
homepage = "https://gnunet.org/en/gnurl.html";
|
||||
maintainers = with maintainers; [ vrthra ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
license = licenses.curl;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake
|
||||
{ lib, stdenv, fetchFromGitHub, cmake
|
||||
, gfortran, blas, lapack, eigen
|
||||
, useMpi ? false
|
||||
, mpi
|
||||
, openssh
|
||||
, igraph
|
||||
}:
|
||||
|
||||
# MPI version can only be built with LP64 interface.
|
||||
|
|
@ -11,25 +12,15 @@ assert useMpi -> !blas.isILP64;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "arpack";
|
||||
version = "3.8.0";
|
||||
version = "3.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opencollab";
|
||||
repo = "arpack-ng";
|
||||
rev = version;
|
||||
sha256 = "sha256-nc710iLRqy/p3EaVgbEoCRzNJ9GpKqqQp33tbn7R6lA=";
|
||||
sha256 = "sha256-HCvapLba8oLqx9I5+KDAU0s/dTmdWOEilS75i4gyfC0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/opencollab/arpack-ng/pull/301
|
||||
(fetchpatch {
|
||||
name = "pkg-config-paths.patch";
|
||||
url = "https://github.com/opencollab/arpack-ng/commit/47fc83cb371a9cc8a8c058097de5e0298cd548f5.patch";
|
||||
excludes = [ "CHANGES" ];
|
||||
sha256 = "1aijvrfsxkgzqmkzq2dmaj8q3jdpg2hwlqpfl8ddk9scv17gh9m8";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake gfortran ];
|
||||
buildInputs = assert (blas.isILP64 == lapack.isILP64); [
|
||||
blas
|
||||
|
|
@ -56,10 +47,16 @@ stdenv.mkDerivation rec {
|
|||
install_name_tool -change libblas.dylib ${blas}/lib/libblas.dylib $out/lib/libarpack.dylib
|
||||
'';
|
||||
|
||||
passthru = { inherit (blas) isILP64; };
|
||||
passthru = {
|
||||
inherit (blas) isILP64;
|
||||
tests = {
|
||||
inherit igraph;
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/opencollab/arpack-ng";
|
||||
changelog = "https://github.com/opencollab/arpack-ng/blob/${src.rev}/CHANGES";
|
||||
description = ''
|
||||
A collection of Fortran77 subroutines to solve large scale eigenvalue
|
||||
problems.
|
||||
|
|
|
|||
32
pkgs/development/php-packages/php-spx/default.nix
Normal file
32
pkgs/development/php-packages/php-spx/default.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ buildPecl, lib, fetchFromGitHub, zlib }:
|
||||
|
||||
let
|
||||
version = "0.4.14";
|
||||
in buildPecl {
|
||||
inherit version;
|
||||
pname = "php-spx";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NoiseByNorthwest";
|
||||
repo = "php-spx";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LdR3ilknSUuNTAb9wfIpNGdaR3uwd4C47nZYRzfTfx8=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
"--with-zlib-dir=${zlib.dev}"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace Makefile.frag \
|
||||
--replace '$(INSTALL_ROOT)$(prefix)/share/misc/php-spx/assets/web-ui' '${placeholder "out"}/share/misc/php-spx/assets/web-ui'
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/NoiseByNorthwest/php-spx/releases/tag/${version}";
|
||||
description = "A simple & straight-to-the-point PHP profiling extension with its built-in web UI";
|
||||
homepage = "https://github.com/NoiseByNorthwest/php-spx";
|
||||
license = lib.licenses.php301;
|
||||
maintainers = with lib.maintainers; [ drupol ];
|
||||
};
|
||||
}
|
||||
|
|
@ -23,17 +23,15 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "altair";
|
||||
# current version, 5.0.1, is broken with jsonschema>=4.18
|
||||
# we use unstable version instead of patch due to many changes
|
||||
version = "unstable-2023-08-12";
|
||||
version = "5.1.2";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "altair-viz";
|
||||
repo = "altair";
|
||||
rev = "56b3b66daae7160c8d82777d2646131afcc3dab4";
|
||||
hash = "sha256-uVE3Bth1D1mIhaULB4IxEtOzhQd51Pscqyfdys65F6A=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-30M+rt5IfD4hvK5CwaW8HfQacDBPjowff/f9o7iido0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -74,6 +72,7 @@ buildPythonPackage rec {
|
|||
description = "A declarative statistical visualization library for Python.";
|
||||
homepage = "https://altair-viz.github.io";
|
||||
downloadPage = "https://github.com/altair-viz/altair";
|
||||
changelog = "https://altair-viz.github.io/releases/changes.html";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ teh vinetos ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "Project-MONAI";
|
||||
repo = "MONAI";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-wjpHgDNNxPC4b0Yy6zponGZPHV9qGSnbLfccMeick3I=";
|
||||
hash = "sha256-h//igmSV1cPAFifE1woIluSyGwZBRByYMLqeY3oLHnk=";
|
||||
};
|
||||
|
||||
# Ninja is not detected by setuptools for some reason even though it's present:
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "typst-lsp";
|
||||
# Please update the corresponding vscode extension when updating
|
||||
# this derivation.
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rbspy";
|
||||
version = "0.17.0";
|
||||
version = "0.17.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-NshDX7sbXnmK6k/EDD5thUcNKvSV4bNdJ5N2hNLlsnA=";
|
||||
hash = "sha256-stZWTzrRk+dyscV+OtL5aEOv+MLrN3bMSIrhrZXmCfc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-JzspNL4T28awa/1Uajw0gLM3bYyUBYTjnfCXn9qG7SY=";
|
||||
cargoHash = "sha256-pexYgL3gSeuglAQWn09nXgxQCUX+TFvnFU0uiwHEfzk=";
|
||||
|
||||
# error: linker `aarch64-linux-gnu-gcc` not found
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -25,11 +25,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "publii";
|
||||
version = "0.42.1";
|
||||
version = "0.43.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://getpublii.com/download/Publii-${version}.deb";
|
||||
hash = "sha256-GHGXu/z2L4aJG1O1THPIxnRBdPJOIVuQsZP0zhjTZlo=";
|
||||
hash = "sha256-WZX0OugHFuqXxwq7LLGzEG/H+pz9siBukvgBCu5/isI=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
|
|||
|
|
@ -7,24 +7,30 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "qmk_hid";
|
||||
version = "0.1.5";
|
||||
version = "0.1.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FrameworkComputer";
|
||||
repo = "qmk_hid";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-k5D+Ph4DtdTafdNhclK3t4SmHmktuOKRlMMGMmKp48E=";
|
||||
hash = "sha256-k5cZcrjen7nNJM9mKQEwNTVfBPawXwbwNlCyTARdH/g=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-+frWup9sbxCAxl2oiHAn1ccpuGkfa3kjerUByd65oSI=";
|
||||
cargoHash = "sha256-GrerrNDoSFtOEAf0vB9MlkBl+yLnzd/szrpFsAmkB6s=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
systemd
|
||||
];
|
||||
|
||||
checkFlags = [
|
||||
# test doesn't compile
|
||||
"--skip=src/lib.rs"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Commandline tool for interactng with QMK devices over HID";
|
||||
homepage = "https://github.com/FrameworkComputer/qmk_hid";
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fh";
|
||||
version = "0.1.6";
|
||||
version = "0.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DeterminateSystems";
|
||||
repo = "fh";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Pbw1yggqIzmY23DuxrmSSf9IbOy5olAqVWectq97j20=";
|
||||
hash = "sha256-gyxlVSraZIVAyOaJk90fub4b8g1w4KXwqa1ecNAC7xA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-vr5M2TAty9z/n9wdA/ANnRp7Hq5S3Hpa4dE7mA59Keg=";
|
||||
cargoHash = "sha256-Tm/O9H0l37h+2zb4dgO6Z6CaYye8O+zVMrsUpWJ9okI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
108
pkgs/tools/system/dell-command-configure/default.nix
Normal file
108
pkgs/tools/system/dell-command-configure/default.nix
Normal file
|
|
@ -0,0 +1,108 @@
|
|||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchurl,
|
||||
dpkg,
|
||||
autoPatchelfHook,
|
||||
patchelfUnstable,
|
||||
openssl,
|
||||
}:
|
||||
|
||||
# Use techniques described in https://web.archive.org/web/20220904051329/https://tapesoftware.net/replace-symbol/
|
||||
|
||||
# Adapted from https://github.com/KenMacD/etc-nixos/blob/d3d28085586358a62b2bb4b427eb21aad05b5b23/dcc/default.nix
|
||||
|
||||
# Used https://github.com/NixOS/nixpkgs/pull/84926 as a template
|
||||
# then converted to use autoPatchelfHook instead, and link with
|
||||
# the dependencies from other pkgs.
|
||||
|
||||
let
|
||||
version = "4.8.0-494";
|
||||
|
||||
unpacked = stdenv.mkDerivation rec {
|
||||
inherit version;
|
||||
pname = "dell-command-configure-unpacked";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
"https://dl.dell.com/FOLDER08911312M/1/command-configure_${version}.ubuntu20_amd64.tar.gz";
|
||||
# The CDN blocks the Curl user-agent, so set to blank instead.
|
||||
curlOpts = ''-A=""'';
|
||||
hash = "sha256-l5oHgDkFBF6llNsHufTmuDzjkhGmXHYXlOJ4hvZfRoE=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
nativeBuildInputs = [ dpkg ];
|
||||
|
||||
unpackPhase = ''
|
||||
tar -xzf ${src}
|
||||
dpkg-deb -x command-configure_${version}.ubuntu20_amd64.deb command-configure
|
||||
dpkg-deb -x srvadmin-hapi_9.5.0_amd64.deb srvadmin-hapi
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir $out
|
||||
cp -r . $out
|
||||
'';
|
||||
};
|
||||
|
||||
# Contains a fopen() wrapper for finding the firmware package
|
||||
wrapperLibName = "wrapper-lib.so";
|
||||
wrapperLib = stdenv.mkDerivation {
|
||||
pname = "dell-command-configure-unpacked-wrapper-lib";
|
||||
inherit version;
|
||||
|
||||
src = ./.;
|
||||
|
||||
postPatch = ''
|
||||
ls -al
|
||||
substitute wrapper-lib.c lib.c \
|
||||
--subst-var-by to "${unpacked}/srvadmin-hapi/opt/dell/srvadmin/etc/omreg.d/omreg-hapi.cfg"
|
||||
cc -fPIC -shared lib.c -o ${wrapperLibName}
|
||||
'';
|
||||
installPhase = ''
|
||||
install -D ${wrapperLibName} -t $out/lib
|
||||
'';
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
inherit version;
|
||||
pname = "dell-command-configure";
|
||||
|
||||
buildInputs = [ openssl stdenv.cc.cc.lib ];
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
dontConfigure = true;
|
||||
|
||||
src = unpacked;
|
||||
|
||||
installPhase = ''
|
||||
install -D -t $out/lib -m644 -v command-configure/opt/dell/dcc/libhapiintf.so
|
||||
install -D -t $out/lib -m644 -v command-configure/opt/dell/dcc/libsmbios_c.so.2
|
||||
install -D -t $out/bin -m755 -v command-configure/opt/dell/dcc/cctk
|
||||
install -D -t $out/bin -m755 -v srvadmin-hapi/opt/dell/srvadmin/sbin/dchcfg
|
||||
for lib in $(find srvadmin-hapi/opt/dell/srvadmin/lib64 -type l); do
|
||||
install -D -t $out/lib -m644 -v $lib
|
||||
done
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
echo fopen fopen_wrapper > fopen_name_map
|
||||
echo access access_wrapper > access_name_map
|
||||
${patchelfUnstable}/bin/patchelf \
|
||||
--rename-dynamic-symbols fopen_name_map \
|
||||
--rename-dynamic-symbols access_name_map \
|
||||
--add-needed ${wrapperLibName} \
|
||||
--set-rpath ${lib.makeLibraryPath [ wrapperLib ]} \
|
||||
$out/lib/*
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Configure BIOS settings on Dell laptops.";
|
||||
homepage =
|
||||
"https://www.dell.com/support/article/us/en/19/sln311302/dell-command-configure";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ ryangibb ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
23
pkgs/tools/system/dell-command-configure/wrapper-lib.c
Executable file
23
pkgs/tools/system/dell-command-configure/wrapper-lib.c
Executable file
|
|
@ -0,0 +1,23 @@
|
|||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
static const char from[] = "/usr/lib/ext/dell/omreg.cfg";
|
||||
static const char to[] = "@to@";
|
||||
|
||||
int access_wrapper(const char *fn, int mode)
|
||||
{
|
||||
if (!strcmp(fn, from)) {
|
||||
printf("access_wrapper.c: Replacing path '%s' with '%s'\n", from, to);
|
||||
fn = to;
|
||||
}
|
||||
return access(fn, mode);
|
||||
}
|
||||
|
||||
FILE* fopen_wrapper(const char* fn, const char* mode)
|
||||
{
|
||||
if (!strcmp(fn, from)) {
|
||||
printf("fopen_wrapper.c: Replacing path '%s' with '%s'\n", from, to);
|
||||
fn = to;
|
||||
}
|
||||
return fopen(fn, mode);
|
||||
}
|
||||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mdbook";
|
||||
version = "0.4.34";
|
||||
version = "0.4.35";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-lang";
|
||||
repo = "mdBook";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-QkgsFnX6J0ZgXCzGE/dTNLxdXLhCFwLsZCvmZ4SU4Zs=";
|
||||
sha256 = "sha256-oplR34M2PbcIwrfIkA4Ttk2zt3ve883TfXGIDnfJt/4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Dhblzn7NytYeY76RmvI8cNjChnCSnTPadxPKyU5QT1Q=";
|
||||
cargoHash = "sha256-D0XhrweO0A1+81Je4JZ0lmnbIHstNvefpmogCyB4FEE=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
|
||||
|
||||
|
|
|
|||
|
|
@ -559,8 +559,6 @@ with pkgs;
|
|||
|
||||
cpm-cmake = callPackage ../development/tools/cpm-cmake { };
|
||||
|
||||
cpu-x = callPackage ../applications/misc/cpu-x { };
|
||||
|
||||
crackle = callPackage ../tools/networking/crackle { };
|
||||
|
||||
crackql = callPackage ../tools/security/crackql { };
|
||||
|
|
@ -1846,8 +1844,6 @@ with pkgs;
|
|||
|
||||
fm = callPackage ../applications/file-managers/fm { };
|
||||
|
||||
fm-tune = callPackage ../applications/radio/fm-tune { };
|
||||
|
||||
fwbuilder = libsForQt5.callPackage ../tools/security/fwbuilder { };
|
||||
|
||||
hblock = callPackage ../tools/networking/hblock { };
|
||||
|
|
@ -3717,6 +3713,8 @@ with pkgs;
|
|||
|
||||
delayarchitect = callPackage ../applications/audio/delayarchitect { };
|
||||
|
||||
dell-command-configure = callPackage ../tools/system/dell-command-configure { };
|
||||
|
||||
deltachat-desktop = callPackage ../applications/networking/instant-messengers/deltachat-desktop {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
||||
};
|
||||
|
|
@ -18877,8 +18875,6 @@ with pkgs;
|
|||
|
||||
coder = callPackage ../development/tools/coder { };
|
||||
|
||||
codespelunker = callPackage ../development/tools/codespelunker { };
|
||||
|
||||
compile-daemon = callPackage ../development/tools/compile-daemon { };
|
||||
|
||||
complexity = callPackage ../development/tools/misc/complexity { };
|
||||
|
|
@ -26418,8 +26414,6 @@ with pkgs;
|
|||
|
||||
go-autoconfig = callPackage ../servers/go-autoconfig { };
|
||||
|
||||
go-camo = callPackage ../servers/http/go-camo { };
|
||||
|
||||
go-cqhttp = callPackage ../servers/go-cqhttp { };
|
||||
|
||||
gofish = callPackage ../servers/gopher/gofish { };
|
||||
|
|
|
|||
|
|
@ -304,6 +304,8 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
|
||||
phalcon = callPackage ../development/php-packages/phalcon { };
|
||||
|
||||
php-spx = callPackage ../development/php-packages/php-spx { };
|
||||
|
||||
pinba = callPackage ../development/php-packages/pinba { };
|
||||
|
||||
protobuf = callPackage ../development/php-packages/protobuf { };
|
||||
|
|
@ -462,9 +464,10 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
}
|
||||
{
|
||||
name = "opcache";
|
||||
buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [
|
||||
valgrind.dev
|
||||
];
|
||||
buildInputs = [ pcre2 ] ++
|
||||
lib.optional
|
||||
(!stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind)
|
||||
valgrind.dev;
|
||||
zendExtension = true;
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
# Tests are flaky on darwin
|
||||
|
|
|
|||
Loading…
Reference in a new issue