Merge master into staging-next

This commit is contained in:
github-actions[bot]
2024-12-28 06:04:21 +00:00
committed by GitHub
26 changed files with 591 additions and 201 deletions
+8
View File
@@ -10335,6 +10335,14 @@
githubId = 938744;
name = "John Chadwick";
};
jcollie = {
email = "jeff@ocjtech.us";
github = "jcollie";
githubId = 740022;
matrix = "@jeff:ocjtech.us";
name = "Jeffrey C. Ollie";
keys = [ { fingerprint = "A8CF 5B72 ABC3 9A17 3FEA 620E 6F86 035A 6D97 044E"; } ];
};
jcouyang = {
email = "oyanglulu@gmail.com";
github = "jcouyang";
+1
View File
@@ -43,6 +43,7 @@
alacritty
contour
foot
ghostty
kitty
mtm
rio
@@ -6,6 +6,7 @@
vimUtils,
nix-update-script,
git,
replaceVars,
}:
let
version = "0.8.2";
@@ -39,6 +40,10 @@ vimUtils.buildVimPlugin {
ln -s ${blink-fuzzy-lib}/lib/libblink_cmp_fuzzy.${libExt} target/release/libblink_cmp_fuzzy.${libExt}
'';
patches = [
(replaceVars ./force-version.patch { inherit (src) tag; })
];
passthru = {
updateScript = nix-update-script {
attrPath = "vimPlugins.blink-cmp.blink-fuzzy-lib";
@@ -0,0 +1,11 @@
--- a/lua/blink/cmp/fuzzy/download/init.lua
+++ b/lua/blink/cmp/fuzzy/download/init.lua
@@ -21,7 +21,7 @@ function download.ensure_downloaded(callback)
}
end)
:map(function(version)
- local target_git_tag = download_config.force_version or version.git.tag
+ local target_git_tag = download_config.force_version or '@tag@'
-- not built locally, not on a git tag, error
assert(
@@ -35,14 +35,14 @@
with python3Packages;
buildPythonApplication rec {
pname = "kitty";
version = "0.38.0";
version = "0.38.1";
format = "other";
src = fetchFromGitHub {
owner = "kovidgoyal";
repo = "kitty";
rev = "refs/tags/v${version}";
hash = "sha256-XURoUYo0Nejcfi49s9AlyoG5fpE0/mjMke2UWG8lUiA=";
hash = "sha256-0M4Bvhh3j9vPedE/d+8zaiZdET4mXcrSNUgLllhaPJw=";
};
goModules = (buildGo123Module {
+4 -4
View File
@@ -1,18 +1,18 @@
{
lib,
stdenv,
python311,
python312,
fetchFromGitHub,
gitMinimal,
portaudio,
}:
let
python3 = python311.override {
python3 = python312.override {
self = python3;
packageOverrides = _: super: { tree-sitter = super.tree-sitter_0_21; };
};
version = "0.69.0";
version = "0.70.0";
aider-chat = python3.pkgs.buildPythonApplication {
pname = "aider-chat";
inherit version;
@@ -22,7 +22,7 @@ let
owner = "Aider-AI";
repo = "aider";
rev = "refs/tags/v${version}";
hash = "sha256-fJLLWL31BLEpgBrYDq0E8t7GN9TyOA5pwt42H/Hqh58=";
hash = "sha256-wGm6JV9ISRi/p1lA3JyzOdHQKFHFxEhfr+NdShUxm0M=";
};
pythonRelaxDeps = true;
@@ -33,13 +33,13 @@
stdenv.mkDerivation rec {
pname = "cinnamon-settings-daemon";
version = "6.4.2";
version = "6.4.3";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-VnplZ9HDmrBuDybV5YJBbqaETdUQHdUfgsTZ+Zj1/4c=";
hash = "sha256-L7+OgymYoYBdprw66RW8tiGA7XGWjTBpDpXhli8Fjoo=";
};
patches = [
@@ -17,11 +17,11 @@ stdenv.mkDerivation rec {
# the wrapped version of Descent 3. Once theres a stable version of Descent
# 3 that supports the -additionaldir command-line option, we can stop using
# an unstable version of Descent 3.
version = "1.5.0-beta-unstable-2024-12-14";
version = "1.5.0-beta-unstable-2024-12-20";
src = fetchFromGitHub {
owner = "DescentDevelopers";
repo = "Descent3";
rev = "6583bfe575e57effd877415c9d03b83c8e9e271e";
rev = "4ff0665dc4779c262f6dec4c50fdd4763acdfad3";
fetchSubmodules = true;
leaveDotGit = true;
# Descent 3 is supposed to display its Git commit hash in the bottom right
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
git rev-parse --verify HEAD | tr --delete '\n' > git-hash.txt
rm -r .git
'';
hash = "sha256-GQaYgmwAmAxdMq+7RQcElkX74xBAKbjYkx5W3MNWUvs=";
hash = "sha256-8pK+lniWBlsGQvWXwEpBnpDz2CMcCOmdSc4Q9Hedo3U=";
};
hardeningDisable = [ "format" ];
+3 -3
View File
@@ -11,7 +11,7 @@
rustPlatform.buildRustPackage rec {
pname = "dprint";
version = "0.47.6";
version = "0.48.0";
# Prefer repository rather than crate here
# - They have Cargo.lock in the repository
@@ -20,10 +20,10 @@ rustPlatform.buildRustPackage rec {
owner = "dprint";
repo = "dprint";
rev = "refs/tags/${version}";
hash = "sha256-zyiBFZbetKx0H47MAU4JGauAmthcuEdJMl93M6MobD8=";
hash = "sha256-Zem37oHku90c7PDV8ep/7FN128eGRUvfIvRsaXa7X9g=";
};
cargoHash = "sha256-XuzxoJgJJl4Blw1lDnCG3faEqL9U40MhZEb9LYjiaSs=";
cargoHash = "sha256-vlG+0cQMUev8iEgut9l1bCDpS85bRWsNWZyJJXcgSlw=";
nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
installShellFiles
+14
View File
@@ -0,0 +1,14 @@
diff --git a/src/d3d10/d3d10_interfaces.h b/src/d3d10/d3d10_interfaces.h
index aa028ab575..99f1dc4567 100644
--- a/src/d3d10/d3d10_interfaces.h
+++ b/src/d3d10/d3d10_interfaces.h
@@ -1,9 +1,3 @@
#pragma once
#include "d3d10_include.h"
-
-#ifdef _MSC_VER
-struct __declspec(uuid("0803425a-57f5-4dd6-9465-a87570834a08")) ID3D10StateBlock;
-#else
-__CRT_UUID_DECL(ID3D10StateBlock, 0x0803425a,0x57f5,0x4dd6,0x94,0x65,0xa8,0x75,0x70,0x83,0x4a,0x08);
-#endif
+2
View File
@@ -29,6 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
url = "https://github.com/doitsujin/dxvk/commit/1a5afc77b1859e6c7e31b55e11ece899e3b5295a.patch";
hash = "sha256-tTAsQOMAazgH/6laLNTuG2lki257VUR9EBivnD4vCuY=";
})
# Fixes errors building with GCC 14.
./gcc14-compat.patch
]
++ lib.optionals enableMoltenVKCompat [
# Patch DXVK to work with MoltenVK even though it doesnt support some required features.
+347
View File
@@ -0,0 +1,347 @@
# generated by zon2nix (https://github.com/Cloudef/zig2nix)
{
lib,
linkFarm,
fetchurl,
fetchgit,
runCommandLocal,
zig,
name ? "zig-packages",
}:
with builtins;
with lib;
let
unpackZigArtifact =
{
name,
artifact,
}:
runCommandLocal name
{
nativeBuildInputs = [ zig ];
}
''
hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})"
mv "$TMPDIR/p/$hash" "$out"
chmod 755 "$out"
'';
fetchZig =
{
name,
url,
hash,
}:
let
artifact = fetchurl { inherit url hash; };
in
unpackZigArtifact { inherit name artifact; };
fetchGitZig =
{
name,
url,
hash,
}:
let
parts = splitString "#" url;
url_base = elemAt parts 0;
url_without_query = elemAt (splitString "?" url_base) 0;
rev_base = elemAt parts 1;
rev = if match "^[a-fA-F0-9]{40}$" rev_base != null then rev_base else "refs/heads/${rev_base}";
in
fetchgit {
inherit name rev hash;
url = url_without_query;
deepClone = false;
};
fetchZigArtifact =
{
name,
url,
hash,
}:
let
parts = splitString "://" url;
proto = elemAt parts 0;
path = elemAt parts 1;
fetcher = {
"git+http" = fetchGitZig {
inherit name hash;
url = "http://${path}";
};
"git+https" = fetchGitZig {
inherit name hash;
url = "https://${path}";
};
http = fetchZig {
inherit name hash;
url = "http://${path}";
};
https = fetchZig {
inherit name hash;
url = "https://${path}";
};
};
in
fetcher.${proto};
in
linkFarm name [
{
name = "12206029de146b685739f69b10a6f08baee86b3d0a5f9a659fa2b2b66c9602078bbf";
path = fetchZigArtifact {
name = "libxev";
url = "https://github.com/mitchellh/libxev/archive/db6a52bafadf00360e675fefa7926e8e6c0e9931.tar.gz";
hash = "sha256-4GT5wkfkZnIjNv20yDiWEzHAhbIiwHHJfS7A4u/LoNQ=";
};
}
{
name = "12206ed982e709e565d536ce930701a8c07edfd2cfdce428683f3f2a601d37696a62";
path = fetchZigArtifact {
name = "mach_glfw";
url = "https://github.com/mitchellh/mach-glfw/archive/37c2995f31abcf7e8378fba68ddcf4a3faa02de0.tar.gz";
hash = "sha256-HhXIvWUS8/CHWY4VXPG2ZEo+we8XOn3o5rYJCQ1n8Nk=";
};
}
{
name = "1220736fa4ba211162c7a0e46cc8fe04d95921927688bff64ab5da7420d098a7272d";
path = fetchZigArtifact {
name = "glfw";
url = "https://github.com/mitchellh/glfw/archive/b552c6ec47326b94015feddb36058ea567b87159.tar.gz";
hash = "sha256-IeBVAOQmtyFqVxzuXPek1onuPwIamcOyYtxqKpPEQjU=";
};
}
{
name = "12202adbfecdad671d585c9a5bfcbd5cdf821726779430047742ce1bf94ad67d19cb";
path = fetchZigArtifact {
name = "xcode_frameworks";
url = "https://github.com/mitchellh/xcode-frameworks/archive/69801c154c39d7ae6129ea1ba8fe1afe00585fc8.tar.gz";
hash = "sha256-mP/I2coL57UJm/3+4Q8sPAgQwk8V4zM+S4VBBTrX2To=";
};
}
{
name = "122004bfd4c519dadfb8e6281a42fc34fd1aa15aea654ea8a492839046f9894fa2cf";
path = fetchZigArtifact {
name = "vulkan_headers";
url = "https://github.com/mitchellh/vulkan-headers/archive/04c8a0389d5a0236a96312988017cd4ce27d8041.tar.gz";
hash = "sha256-K+zrRudgHFukOM6En1StRYRMNYkeRk+qHTXvrXaG+FU=";
};
}
{
name = "1220b3164434d2ec9db146a40bf3a30f490590d68fa8529776a3138074f0da2c11ca";
path = fetchZigArtifact {
name = "wayland_headers";
url = "https://github.com/mitchellh/wayland-headers/archive/5f991515a29f994d87b908115a2ab0b899474bd1.tar.gz";
hash = "sha256-uFilLZinKkZt6RdVTV3lUmJpzpswDdFva22FvwU/XQI=";
};
}
{
name = "122089c326186c84aa2fd034b16abc38f3ebf4862d9ae106dc1847ac44f557b36465";
path = fetchZigArtifact {
name = "x11_headers";
url = "https://github.com/mitchellh/x11-headers/archive/2ffbd62d82ff73ec929dd8de802bc95effa0ef88.tar.gz";
hash = "sha256-EhV2bmTY/OMYN1wEul35gD0hQgS/Al262jO3pVr0O+c=";
};
}
{
name = "1220e17e64ef0ef561b3e4b9f3a96a2494285f2ec31c097721bf8c8677ec4415c634";
path = fetchZigArtifact {
name = "zig_objc";
url = "https://github.com/mitchellh/zig-objc/archive/9b8ba849b0f58fe207ecd6ab7c147af55b17556e.tar.gz";
hash = "sha256-H+HIbh2T23uzrsg9/1/vl9Ir1HCAa2pzeTx6zktJH9Q=";
};
}
{
name = "12205a66d423259567764fa0fc60c82be35365c21aeb76c5a7dc99698401f4f6fefc";
path = fetchZigArtifact {
name = "zig_js";
url = "https://github.com/mitchellh/zig-js/archive/d0b8b0a57c52fbc89f9d9fecba75ca29da7dd7d1.tar.gz";
hash = "sha256-fyNeCVbC9UAaKJY6JhAZlT0A479M/AKYMPIWEZbDWD0=";
};
}
{
name = "12207831bce7d4abce57b5a98e8f3635811cfefd160bca022eb91fe905d36a02cf25";
path = fetchZigArtifact {
name = "ziglyph";
url = "https://deps.files.ghostty.org/ziglyph-b89d43d1e3fb01b6074bc1f7fc980324b04d26a5.tar.gz";
hash = "sha256-cse98+Ft8QUjX+P88yyYfaxJOJGQ9M7Ymw7jFxDz89k=";
};
}
{
name = "12204358b2848ffd993d3425055bff0a5ba9b1b60bead763a6dea0517965d7290a6c";
path = fetchZigArtifact {
name = "iterm2_themes";
url = "https://github.com/mbadolato/iTerm2-Color-Schemes/archive/d6c42066b3045292e0b1154ad84ff22d6863ebf7.tar.gz";
hash = "sha256-s6us3PkOPmQCtLS9QNPM7BDLt7x+37KbmYF9d4NMD/c=";
};
}
{
name = "12200df4ebeaed45de26cb2c9f3b6f3746d8013b604e035dae658f86f586c8c91d2f";
path = fetchZigArtifact {
name = "vaxis";
url = "git+https://github.com/rockorager/libvaxis/?ref=main#6d729a2dc3b934818dffe06d2ba3ce02841ed74b";
hash = "sha256-fFf79fCy4QQFVNcN722tSMjB6FyVEzCB36oH1olk9JQ=";
};
}
{
name = "1220dd654ef941fc76fd96f9ec6adadf83f69b9887a0d3f4ee5ac0a1a3e11be35cf5";
path = fetchZigArtifact {
name = "zigimg";
url = "git+https://github.com/zigimg/zigimg#3a667bdb3d7f0955a5a51c8468eac83210c1439e";
hash = "sha256-oLf3YH3yeg4ikVO/GahMCDRMTU31AHkfSnF4rt7xTKo=";
};
}
{
name = "122055beff332830a391e9895c044d33b15ea21063779557024b46169fb1984c6e40";
path = fetchZigArtifact {
name = "zg";
url = "https://codeberg.org/atman/zg/archive/v0.13.2.tar.gz";
hash = "sha256-2x9hT7bYq9KJYWLVOf21a+QvTG/F7HWT+YK15IMRzNY=";
};
}
{
name = "1220edc3b8d8bedbb50555947987e5e8e2f93871ca3c8e8d4cc8f1377c15b5dd35e8";
path = fetchZigArtifact {
name = "zf";
url = "git+https://github.com/natecraddock/zf/?ref=main#ed99ca18b02dda052e20ba467e90b623c04690dd";
hash = "sha256-t6QNrEJZ4GZZsYixjYvpdrYoCmNbG8TTUmGs2MFa4sU=";
};
}
{
name = "1220c72c1697dd9008461ead702997a15d8a1c5810247f02e7983b9f74c6c6e4c087";
path = fetchZigArtifact {
name = "vaxis";
url = "git+https://github.com/rockorager/libvaxis/?ref=main#dc0a228a5544988d4a920cfb40be9cd28db41423";
hash = "sha256-QWN4jOrA91KlbqmeEHHJ4HTnCC9nmfxt8DHUXJpAzLI=";
};
}
{
name = "12201f0d542e7541cf492a001d4d0d0155c92f58212fbcb0d224e95edeba06b5416a";
path = fetchZigArtifact {
name = "z2d";
url = "git+https://github.com/vancluever/z2d?ref=v0.4.0#4638bb02a9dc41cc2fb811f092811f6a951c752a";
hash = "sha256-YpWXn1J3JKQSCrWB25mAfzd1/T56QstEZnhPzBwxgoM=";
};
}
{
name = "1220bc6b9daceaf7c8c60f3c3998058045ba0c5c5f48ae255ff97776d9cd8bfc6402";
path = fetchZigArtifact {
name = "imgui";
url = "https://github.com/ocornut/imgui/archive/e391fe2e66eb1c96b1624ae8444dc64c23146ef4.tar.gz";
hash = "sha256-oF/QHgTPEat4Hig4fGIdLkIPHmBEyOJ6JeYD6pnveGA=";
};
}
{
name = "1220b81f6ecfb3fd222f76cf9106fecfa6554ab07ec7fdc4124b9bb063ae2adf969d";
path = fetchZigArtifact {
name = "freetype";
url = "https://github.com/freetype/freetype/archive/refs/tags/VER-2-13-2.tar.gz";
hash = "sha256-QnIB9dUVFnDQXB9bRb713aHy592XHvVPD+qqf/0quQw=";
};
}
{
name = "1220aa013f0c83da3fb64ea6d327f9173fa008d10e28bc9349eac3463457723b1c66";
path = fetchZigArtifact {
name = "libpng";
url = "https://github.com/glennrp/libpng/archive/refs/tags/v1.6.43.tar.gz";
hash = "sha256-/syVtGzwXo4/yKQUdQ4LparQDYnp/fF16U/wQcrxoDo=";
};
}
{
name = "1220fed0c74e1019b3ee29edae2051788b080cd96e90d56836eea857b0b966742efb";
path = fetchZigArtifact {
name = "zlib";
url = "https://github.com/madler/zlib/archive/refs/tags/v1.3.1.tar.gz";
hash = "sha256-F+iIY/NgBnKrSRgvIXKBtvxNPHYr3jYZNeQ2qVIU0Fw=";
};
}
{
name = "12201149afb3326c56c05bb0a577f54f76ac20deece63aa2f5cd6ff31a4fa4fcb3b7";
path = fetchZigArtifact {
name = "fontconfig";
url = "https://deps.files.ghostty.org/fontconfig-2.14.2.tar.gz";
hash = "sha256-O6LdkhWHGKzsXKrxpxYEO1qgVcJ7CB2RSvPMtA3OilU=";
};
}
{
name = "122032442d95c3b428ae8e526017fad881e7dc78eab4d558e9a58a80bfbd65a64f7d";
path = fetchZigArtifact {
name = "libxml2";
url = "https://github.com/GNOME/libxml2/archive/refs/tags/v2.11.5.tar.gz";
hash = "sha256-bCgFni4+60K1tLFkieORamNGwQladP7jvGXNxdiaYhU=";
};
}
{
name = "1220b8588f106c996af10249bfa092c6fb2f35fbacb1505ef477a0b04a7dd1063122";
path = fetchZigArtifact {
name = "harfbuzz";
url = "https://github.com/harfbuzz/harfbuzz/archive/refs/tags/8.4.0.tar.gz";
hash = "sha256-nxygiYE7BZRK0c6MfgGCEwJtNdybq0gKIeuHaDg5ZVY=";
};
}
{
name = "12205c83b8311a24b1d5ae6d21640df04f4b0726e314337c043cde1432758cbe165b";
path = fetchZigArtifact {
name = "highway";
url = "https://github.com/google/highway/archive/refs/tags/1.1.0.tar.gz";
hash = "sha256-NUqLRTm1iOcLmOxwhEJz4/J0EwLEw3e8xOgbPRhm98k=";
};
}
{
name = "1220c15e72eadd0d9085a8af134904d9a0f5dfcbed5f606ad60edc60ebeccd9706bb";
path = fetchZigArtifact {
name = "oniguruma";
url = "https://github.com/kkos/oniguruma/archive/refs/tags/v6.9.9.tar.gz";
hash = "sha256-ABqhIC54RI9MC/GkjHblVodrNvFtks4yB+zP1h2Z8qA=";
};
}
{
name = "1220446be831adcca918167647c06c7b825849fa3fba5f22da394667974537a9c77e";
path = fetchZigArtifact {
name = "sentry";
url = "https://github.com/getsentry/sentry-native/archive/refs/tags/0.7.8.tar.gz";
hash = "sha256-KsZJfMjWGo0xCT5HrduMmyxFsWsHBbszSoNbZCPDGN8=";
};
}
{
name = "12207fd37bb8251919c112dcdd8f616a491857b34a451f7e4486490077206dc2a1ea";
path = fetchZigArtifact {
name = "breakpad";
url = "https://github.com/getsentry/breakpad/archive/b99f444ba5f6b98cac261cbb391d8766b34a5918.tar.gz";
hash = "sha256-bMqYlD0amQdmzvYQd8Ca/1k4Bj/heh7+EijlQSttatk=";
};
}
{
name = "1220d4d18426ca72fc2b7e56ce47273149815501d0d2395c2a98c726b31ba931e641";
path = fetchZigArtifact {
name = "utfcpp";
url = "https://github.com/nemtrif/utfcpp/archive/refs/tags/v4.0.5.tar.gz";
hash = "sha256-/8ZooxDndgfTk/PBizJxXyI9oerExNbgV5oR345rWc8=";
};
}
{
name = "12200984439edc817fbcbbaff564020e5104a0d04a2d0f53080700827052de700462";
path = fetchZigArtifact {
name = "wuffs";
url = "https://github.com/google/wuffs/archive/refs/tags/v0.4.0-alpha.8.tar.gz";
hash = "sha256-P3fpKYaiOpZffe2uNDkC43MFntV38Cl2XpHFF50r80Q=";
};
}
{
name = "12201278a1a05c0ce0b6eb6026c65cd3e9247aa041b1c260324bf29cee559dd23ba1";
path = fetchZigArtifact {
name = "glslang";
url = "https://github.com/KhronosGroup/glslang/archive/refs/tags/14.2.0.tar.gz";
hash = "sha256-FKLtu1Ccs+UamlPj9eQ12/WXFgS0uDPmPmB26MCpl7U=";
};
}
{
name = "1220fb3b5586e8be67bc3feb34cbe749cf42a60d628d2953632c2f8141302748c8da";
path = fetchZigArtifact {
name = "spirv_cross";
url = "https://github.com/KhronosGroup/SPIRV-Cross/archive/476f384eb7d9e48613c45179e502a15ab95b6b49.tar.gz";
hash = "sha256-tStvz8Ref6abHwahNiwVVHNETizAmZVVaxVsU7pmV+M=";
};
}
]
+153
View File
@@ -0,0 +1,153 @@
{
bzip2,
callPackage,
expat,
fetchFromGitHub,
fontconfig,
freetype,
glib,
glslang,
harfbuzz,
lib,
libadwaita,
libGL,
libpng,
libX11,
libXcursor,
libXi,
libXrandr,
ncurses,
nixosTests,
oniguruma,
pandoc,
pkg-config,
removeReferencesTo,
stdenv,
versionCheckHook,
wrapGAppsHook4,
zig_0_13,
zlib,
}:
let
# Ghostty needs to be built with --release=fast, --release=debug and
# --release=safe enable too many runtime safety checks.
zig_hook = zig_0_13.hook.overrideAttrs {
zig_default_flags = "-Dcpu=baseline -Doptimize=ReleaseFast --color off";
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "ghostty";
version = "1.0.0";
src = fetchFromGitHub {
owner = "ghostty-org";
repo = "ghostty";
tag = "v${finalAttrs.version}";
hash = "sha256-AHI1Z4mfgXkNwQA8xYq4tS0/BARbHL7gQUT41vCxQTM=";
};
strictDeps = true;
nativeBuildInputs = [
glib # Required for `glib-compile-schemas`
ncurses
pandoc
pkg-config
removeReferencesTo
wrapGAppsHook4
zig_hook
];
buildInputs = [
bzip2
expat
fontconfig
freetype
glslang
harfbuzz
libadwaita
libGL
libpng
libX11
libXcursor
libXi
libXrandr
oniguruma
zlib
];
dontConfigure = true;
# doCheck is set to false because unit tests currently fail inside the Nix sandbox.
doCheck = false;
doInstallCheck = true;
deps = callPackage ./deps.nix {
name = "${finalAttrs.pname}-cache-${finalAttrs.version}";
};
zigBuildFlags =
[
"--system"
"${finalAttrs.deps}"
"-Dversion-string=${finalAttrs.version}"
]
++ lib.mapAttrsToList (name: package: "-fsys=${name} --search-prefix ${lib.getLib package}") {
inherit glslang;
};
zigCheckFlags = finalAttrs.zigBuildFlags;
outputs = [
"out"
"terminfo"
"shell_integration"
"vim"
];
postInstall = ''
mkdir -p "$terminfo/share"
mv "$out/share/terminfo" "$terminfo/share/terminfo"
ln -sf "$terminfo/share/terminfo" "$out/share/terminfo"
mkdir -p "$shell_integration"
mv "$out/share/ghostty/shell-integration" "$shell_integration/shell-integration"
ln -sf "$shell_integration/shell-integration" "$out/share/ghostty/shell-integration"
mv "$out/share/vim/vimfiles" "$vim"
ln -sf "$vim" "$out/share/vim/vimfiles"
'';
preFixup = ''
remove-references-to -t ${finalAttrs.deps} $out/bin/ghostty
'';
NIX_LDFLAGS = [ "-lX11" ];
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
meta = {
homepage = "https://ghostty.org/";
description = "Fast, native, feature-rich terminal emulator pushing modern features";
longDescription = ''
Ghostty is a terminal emulator that differentiates itself by being
fast, feature-rich, and native. While there are many excellent terminal
emulators available, they all force you to choose between speed,
features, or native UIs. Ghostty provides all three.
'';
downloadPage = "https://ghostty.org/download";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
mainProgram = "ghostty";
outputsToInstall = finalAttrs.outputs;
maintainers = with lib.maintainers; [
jcollie
pluiedev
getchoo
];
};
})
@@ -1,48 +0,0 @@
{
stdenv,
lib,
fetchFromGitHub,
meson,
ninja,
gobject-introspection,
gmime3,
libxml2,
libsoup_2_4,
pkg-config,
}:
stdenv.mkDerivation rec {
pname = "xplayer-plparser";
version = "1.0.3";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-6GMKsIpyQdiyHPxrjWHAHvuCouJxrAcYPIo9u6TLOA4=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
gobject-introspection
];
buildInputs = [
gmime3
libxml2
libsoup_2_4
];
meta = with lib; {
description = "Playlist parsing library for xplayer";
homepage = "https://github.com/linuxmint/xplayer-plparser";
maintainers = with maintainers; [
tu-maurice
bobby285271
];
license = licenses.lgpl2Plus;
platforms = platforms.linux;
};
}
+2 -2
View File
@@ -27,14 +27,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "xemu";
version = "0.7.134";
version = "0.7.135";
src = fetchFromGitHub {
owner = "xemu-project";
repo = "xemu";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-HnTNd1+VDfzetstrsQs/CpyD9XzHQGj0O912I+ejJCE=";
hash = "sha256-lTZ5j5ULh4GFW4zlQy4l7e4zr8TEIvenGNC59O6G0Wg=";
};
nativeBuildInputs =
-109
View File
@@ -1,109 +0,0 @@
{
stdenv,
lib,
fetchFromGitHub,
autoreconfHook,
autoconf-archive,
clutter-gst,
clutter-gtk,
gettext,
glib,
gobject-introspection,
gst_all_1,
gtk-doc,
gtk3,
intltool,
itstool,
libpeas,
libxml2,
libxplayer-plparser,
pkg-config,
python3,
wrapGAppsHook3,
xapp,
yelp-tools,
}:
stdenv.mkDerivation rec {
pname = "xplayer";
version = "2.4.4";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-o2vLNIELd1EYWG26t5gOpnamJrBJeg4P6fcLirkcmfM=";
};
# configure wants to find gst-inspect-1.0 via pkgconfig but
# the gstreamer toolsdir points to the wrong derivation output
postPatch = ''
substituteInPlace configure.ac \
--replace '$gst10_toolsdir/gst-inspect-1.0' '${gst_all_1.gstreamer}/bin/gst-inspect-1.0' \
'';
preBuild = ''
makeFlagsArray+=(
"INCLUDES=-I${glib.dev}/include/gio-unix-2.0"
"CFLAGS=-Wno-error" # Otherwise a lot of deprecated warnings are treated as error
)
'';
nativeBuildInputs = [
autoreconfHook
wrapGAppsHook3
autoconf-archive
gettext
gtk-doc
intltool
itstool
pkg-config
python3.pkgs.wrapPython
yelp-tools
gobject-introspection
];
buildInputs = [
clutter-gst
clutter-gtk
glib
gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
gst_all_1.gstreamer
gtk3
libpeas
libxml2
libxplayer-plparser
python3
xapp
# to satisfy configure script
python3.pkgs.pygobject3
];
postFixup = ''
buildPythonPath ${python3.pkgs.dbus-python}
patchPythonScript $out/lib/xplayer/plugins/dbus/dbusservice.py
'';
env = lib.optionalAttrs stdenv.cc.isGNU {
NIX_CFLAGS_COMPILE = toString [
"-Wno-error=incompatible-pointer-types"
"-Wno-error=return-mismatch"
];
};
meta = with lib; {
description = "Generic media player from Linux Mint";
license = with licenses; [
gpl2Plus
lgpl21Plus
];
homepage = "https://github.com/linuxmint/xplayer";
maintainers = with maintainers; [
tu-maurice
bobby285271
];
platforms = platforms.linux;
};
}
@@ -2,8 +2,8 @@
lib,
stdenv,
fetchurl,
gettext,
pkg-config,
intltool,
xfce4-panel,
libxfce4ui,
libxfce4util,
@@ -21,15 +21,15 @@ in
stdenv.mkDerivation rec {
pname = "xfce4-mailwatch-plugin";
version = "1.3.1";
version = "1.3.2";
src = fetchurl {
url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "sha256-BUlk6f5MpmhIZACZHOHqAdB6rHuiNfSxTUqPfZgABGo=";
sha256 = "sha256-xHg/FTOJHNLgw0Bm2oWYZNzkWiPKpgFbWMufqdZafkQ=";
};
nativeBuildInputs = [
intltool
gettext
pkg-config
];
@@ -2,8 +2,8 @@
lib,
stdenv,
fetchurl,
gettext,
pkg-config,
intltool,
libxfce4util,
xfce4-panel,
libxfce4ui,
@@ -18,16 +18,16 @@ in
stdenv.mkDerivation rec {
pname = "xfce4-mpc-plugin";
version = "0.5.3";
version = "0.5.5";
src = fetchurl {
url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "sha256-BGf7TRrNmC08PguJy0EBmUaFBST/Ge0PZYqNVse3Zk0=";
sha256 = "sha256-TOfXdmeiY+6ZFsDKsqczsX471lcFzU7VzsPL3m5ymM8=";
};
nativeBuildInputs = [
gettext
pkg-config
intltool
];
buildInputs = [
@@ -11,10 +11,10 @@
mkXfceDerivation {
category = "panel-plugins";
pname = "xfce4-netload-plugin";
version = "1.4.1";
version = "1.4.2";
rev-prefix = "xfce4-netload-plugin-";
odd-unstable = false;
sha256 = "sha256-PwbyYi9EeSTKilVXlbseY2zkabcL7o2CGnk2DFFVI94=";
sha256 = "sha256-g4pkNzggVjC0AuUnJeleR3RQCrneetjDyv8eCXmrYzI=";
buildInputs = [
glib
@@ -2,8 +2,8 @@
stdenv,
lib,
fetchurl,
gettext,
pkg-config,
intltool,
gtk3,
libxfce4ui,
libxfce4util,
@@ -23,16 +23,16 @@ in
stdenv.mkDerivation rec {
pname = "xfce4-sensors-plugin";
version = "1.4.4";
version = "1.4.5";
src = fetchurl {
url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "sha256-bBYFpzjl30DghNCKyT+WLNRFCTOW3h6b+tx6tFiMNrY=";
sha256 = "sha256-9p/febf3bSqBckgoEkpvznaAOpEipMgt6PPfo++7F5o=";
};
nativeBuildInputs = [
gettext
pkg-config
intltool
];
buildInputs = [
@@ -2,10 +2,12 @@
lib,
stdenv,
fetchurl,
gettext,
pkg-config,
intltool,
xfce4-panel,
libgtop,
libxfce4ui,
upower,
xfconf,
gitUpdater,
}:
@@ -15,20 +17,22 @@ let
in
stdenv.mkDerivation rec {
pname = "xfce4-systemload-plugin";
version = "1.3.2";
version = "1.3.3";
src = fetchurl {
url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "sha256-uzA/wwIOBTrR+guPy/DXaBxVY7uPZJNX1qlaV3gCsHI=";
sha256 = "sha256-aFLV2cmnTQ4NtYLG9f5zkOvkii61aSF3rhLhxMzG78k=";
};
nativeBuildInputs = [
gettext
pkg-config
intltool
];
buildInputs = [
libgtop
libxfce4ui
upower
xfce4-panel
xfconf
];
@@ -12,10 +12,10 @@
mkXfceDerivation {
category = "panel-plugins";
pname = "xfce4-time-out-plugin";
version = "1.1.3";
version = "1.1.4";
rev-prefix = "xfce4-time-out-plugin-";
odd-unstable = false;
sha256 = "sha256-sm6y3t4nngZDg4Q8S3SVkNR++XkCKysQePN6Qei1OY8=";
sha256 = "sha256-FYcmeOBSBxcPSm/4j294DSi8XZBTKHvAwTBdj0yCY7o=";
buildInputs = [
glib
@@ -2,8 +2,8 @@
lib,
stdenv,
fetchurl,
gettext,
pkg-config,
intltool,
libxfce4util,
xfce4-panel,
libxfce4ui,
@@ -19,16 +19,16 @@ in
stdenv.mkDerivation rec {
pname = "xfce4-timer-plugin";
version = "1.7.2";
version = "1.7.3";
src = fetchurl {
url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "sha256-/rO4wtOVBegWaDVAoyJr172ocMy8tMfQ9qv+7/XFi30=";
sha256 = "sha256-rPTIYa+IYIuegCp2pLBYRr0wGJ4AhegmaAzBebbfTNM=";
};
nativeBuildInputs = [
gettext
pkg-config
intltool
];
buildInputs = [
@@ -12,8 +12,8 @@
mkXfceDerivation {
category = "panel-plugins";
pname = "xfce4-verve-plugin";
version = "2.0.3";
sha256 = "sha256-K335cs1vWKTNQjZlSUuhK8OmgTsKSzN87IZwS4RtvB8=";
version = "2.0.4";
sha256 = "sha256-j0uKYj9PeLEVaocHRw87Dz+YFqDr1BImejEpDPYObQg=";
buildInputs = [
glib
@@ -2,8 +2,8 @@
lib,
stdenv,
fetchurl,
gettext,
pkg-config,
intltool,
glib,
gtk3,
json_c,
@@ -32,8 +32,8 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
gettext
pkg-config
intltool
];
buildInputs = [
+2
View File
@@ -697,6 +697,7 @@ mapAliases {
libusb = throw "'libusb' has been renamed to/replaced by 'libusb1'"; # Converted to throw 2024-10-17
libvpx_1_8 = throw "libvpx_1_8 has been removed because it is impacted by security issues and not used in nixpkgs, move to 'libvpx'"; # Added 2024-07-26
libwnck3 = libwnck;
libxplayer-plparser = throw "libxplayer-plparser has been removed as the upstream project was archived"; # Added 2024-12-27
libyamlcpp = yaml-cpp; # Added 2023-01-29
libyamlcpp_0_3 = yaml-cpp_0_3; # Added 2023-01-29
lightdm_gtk_greeter = lightdm-gtk-greeter; # Added 2022-08-01
@@ -1457,6 +1458,7 @@ mapAliases {
xmake-core-sv = throw "'xmake-core-sv' has been removed, use 'libsv' instead"; # Added 2024-10-10
xournal = throw "'xournal' has been removed due to lack of activity upstream and depending on gnome2. Consider using 'xournalpp' instead."; # Added 2024-12-06
xonsh-unwrapped = python3Packages.xonsh; # Added 2024-06-18
xplayer = throw "xplayer has been removed as the upstream project was archived"; # Added 2024-12-27
xprite-editor = throw "'xprite-editor' has been removed due to lack of maintenance upstream. Consider using 'pablodraw' or 'aseprite' instead"; # Added 2024-09-14
xulrunner = firefox-unwrapped; # Added 2023-11-03
xvfb_run = throw "'xvfb_run' has been renamed to/replaced by 'xvfb-run'"; # Converted to throw 2024-10-17