Merge master into staging-next
This commit is contained in:
@@ -6,14 +6,14 @@
|
||||
}:
|
||||
vimUtils.buildVimPlugin {
|
||||
pname = "zig.vim";
|
||||
version = "0-unstable-2025-11-28";
|
||||
version = "0-unstable-2025-12-07";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "ziglang";
|
||||
repo = "zig.vim";
|
||||
rev = "8ff80c24a2ff8fd9edd4a92c2f5793e921043cd6";
|
||||
hash = "sha256-VhEObsEYN/7o+U48MIywhPoYMHemXnKplX+zOrRHuxM=";
|
||||
rev = "74bdb43c9d5da8d6b715809b79f92ef8f711df8e";
|
||||
hash = "sha256-RmrRgJ6YdExMwmua6nGv6W7DPP98k2URIaJTm+O4uR8=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
|
||||
@@ -54,11 +54,11 @@
|
||||
"vendorHash": "sha256-LSvX63g4GWcr2Uo6H50dOWG0XWUhmbhUw9EYsQqs+HU="
|
||||
},
|
||||
"aminueza_minio": {
|
||||
"hash": "sha256-7nBNfOBzRJ2DkIErr48vTEkn1re7e2DapSx1RBQNZTc=",
|
||||
"hash": "sha256-G6eQeoxIeuUJK7LF8gByOrNP27i3p0OccZNxL2DxDw0=",
|
||||
"homepage": "https://registry.terraform.io/providers/aminueza/minio",
|
||||
"owner": "aminueza",
|
||||
"repo": "terraform-provider-minio",
|
||||
"rev": "v3.11.5",
|
||||
"rev": "v3.12.0",
|
||||
"spdx": "AGPL-3.0",
|
||||
"vendorHash": "sha256-6Tw4rCOzrvN2pK83NejdJJBjljfDfHEniIX+EdfqujA="
|
||||
},
|
||||
@@ -1310,11 +1310,11 @@
|
||||
"vendorHash": "sha256-9GjhP/Oh2HlVuMcuXFhS7MUmF3eS4qlUsW5XhugaK14="
|
||||
},
|
||||
"tencentcloudstack_tencentcloud": {
|
||||
"hash": "sha256-BCYwbyaZFA1zVlfDaTdUDiAFH683zfAoXIE4pj1OzOs=",
|
||||
"hash": "sha256-VpaGrpwILnJroZ+4mAM9eVhxXAUl8QMShAwgCzNAi4Q=",
|
||||
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
|
||||
"owner": "tencentcloudstack",
|
||||
"repo": "terraform-provider-tencentcloud",
|
||||
"rev": "v1.82.44",
|
||||
"rev": "v1.82.47",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
||||
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
version = "12.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "markummitchell";
|
||||
owner = "akhuettel";
|
||||
repo = "engauge-digitizer";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Wj9o3wWbtHsEi6LFH4xDpwVR9BwcWc472jJ/QFDQZvY=";
|
||||
|
||||
@@ -264,6 +264,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
popd
|
||||
'';
|
||||
|
||||
sandboxProfile = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
(allow mach-lookup (global-name "com.apple.coreservices.launchservicesd"))
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# Use a standard font
|
||||
mkdir -p $out/share/mpv
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "apache-answer";
|
||||
version = "1.6.0";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "apache";
|
||||
repo = "answer";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-QrLYkGiEDBB4uUzG2yrlEUYXpQxovKFBmGZjLbZiGKk=";
|
||||
hash = "sha256-QTm/6srSn4oF78795ADpW10bZmyEmqTNezB6JSkS2I4=";
|
||||
};
|
||||
|
||||
webui = stdenv.mkDerivation {
|
||||
@@ -58,7 +58,7 @@ buildGoModule rec {
|
||||
'';
|
||||
};
|
||||
|
||||
vendorHash = "sha256-mWSKoEYj23fy6ix3mK1/5HeGugp1UAUO+iwInXkzgU4=";
|
||||
vendorHash = "sha256-ZZ+6OS967qtstMxdBzDxTU2wvyieZJM+/g9V96rXPVI=";
|
||||
|
||||
doCheck = false; # TODO checks are currently broken upstream
|
||||
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "armadillo";
|
||||
version = "15.2.1";
|
||||
version = "15.2.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
|
||||
hash = "sha256-pbgQnaPBaYAvUaFNO9EkY5XCS7ylVgF2CwyWo8Cy+Po=";
|
||||
hash = "sha256-juAc1NpVvAe3vH08unAqxugTfThNfnGF8/SuHwx5cE8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -1,17 +1,18 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchzip,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "barlow";
|
||||
version = "1.422";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://tribby.com/fonts/barlow/download/barlow-${version}.zip";
|
||||
stripRoot = false;
|
||||
hash = "sha256-aHAGPEgBkH41r7HR0D74OGCa7ta7Uo8Mgq4YVtYOwU8=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jpt";
|
||||
repo = "barlow";
|
||||
tag = "${version}";
|
||||
hash = "sha256-FG68o6qN/296RhSNDHFXYXbkhlXSZJgGhVjzlJqsksY=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -15,12 +15,12 @@
|
||||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "borgmatic";
|
||||
version = "2.0.12";
|
||||
version = "2.0.13";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-z2LOj7NW1S1C6hSsaeBKXYnrwS0XskOK9idwIfiA9Do=";
|
||||
hash = "sha256-0Prjgh/L5nCo3CNXZccNW9Dz3d6jIfrXDZmy5fL6zrU=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
@@ -3,24 +3,24 @@
|
||||
|
||||
let
|
||||
pname = "brave";
|
||||
version = "1.85.117";
|
||||
version = "1.85.118";
|
||||
|
||||
allArchives = {
|
||||
aarch64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
|
||||
hash = "sha256-cGqxB3dVYraCqf3DoO3Who2RFm+ZnSedUG5jb8D9Mk8=";
|
||||
hash = "sha256-xn7x6O2JVKu2KlcMXSo7P4oTYfVyC1S4OIemXK82vD0=";
|
||||
};
|
||||
x86_64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
hash = "sha256-ov0gwAv9tCX45EqZa3SBXIzgczBD1RwNS+N1L2vE3Uc=";
|
||||
hash = "sha256-I++3Oq+iW4uuccKiSa5FwS652aT+tFQI0D0n4Nq6U1w=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
|
||||
hash = "sha256-SFe2qX/BugI9Pumv2me5jfC1FpRUsSbtSm+Jl+gW03U=";
|
||||
hash = "sha256-Igh0anjOkf+nemi4hi6kOu49+oXL4cQ0z7bxjyAt5AU=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
|
||||
hash = "sha256-Z0n+TqcgZXqjS1hBx9uznEC6/LftZfaE7k26RhsWI0I=";
|
||||
hash = "sha256-NxL7IsFhPIthG8kO1wO6lbxqlghixZvnsgTbLfi2OX4=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "cloudlog";
|
||||
version = "2.8.2";
|
||||
version = "2.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "magicbug";
|
||||
repo = "Cloudlog";
|
||||
rev = version;
|
||||
hash = "sha256-+NE8gu7PxaA+CrDgkMEA/jtnBbOQt8WbvxY4BHOhQQI=";
|
||||
hash = "sha256-7Ja/EcD2oiwD2xIdeZNAl+np2nd+6zluzQ87dmUgDVg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -1,59 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchzip,
|
||||
pkg-config,
|
||||
autoPatchelfHook,
|
||||
installShellFiles,
|
||||
ocl-icd,
|
||||
zlib,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "computecpp";
|
||||
version = "2.11.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://computecpp.codeplay.com/downloads/computecpp-ce/${version}/x86_64-linux-gnu.tar.gz";
|
||||
hash = "sha256-xHOPuijx5TZeHzRHPXcll0WqoBzHBryIoe3BnOxBVVY=";
|
||||
stripRoot = true;
|
||||
};
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
buildInputs = [
|
||||
(lib.getLib stdenv.cc.cc)
|
||||
ocl-icd
|
||||
zlib
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
pkg-config
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
find ./lib -type f -exec install -D -m 0755 {} -t $out/lib \;
|
||||
find ./bin -type l -exec install -D -m 0755 {} -t $out/bin \;
|
||||
find ./bin -type f -exec install -D -m 0755 {} -t $out/bin \;
|
||||
find ./doc -type f -exec install -D -m 0644 {} -t $out/doc \;
|
||||
find ./include -type f -exec install -D -m 0644 {} -t $out/include \;
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
isClang = true;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Accelerate Complex C++ Applications on Heterogeneous Compute Systems using Open Standards";
|
||||
homepage = "https://www.codeplay.com/products/computesuite/computecpp";
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = [ ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
@@ -12,6 +12,7 @@
|
||||
curl,
|
||||
gsoap,
|
||||
rapidjson,
|
||||
zlib,
|
||||
enableTools ? true,
|
||||
# Use libcurl instead of libneon
|
||||
# Note that the libneon used is bundled in the project
|
||||
@@ -39,6 +40,7 @@ stdenv.mkDerivation rec {
|
||||
libxml2
|
||||
openssl
|
||||
rapidjson
|
||||
zlib
|
||||
]
|
||||
++ lib.optional (!stdenv.hostPlatform.isDarwin) libuuid
|
||||
++ lib.optional enableThirdPartyCopy gsoap;
|
||||
@@ -74,6 +76,9 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
# Transitive dependency of gsoap (only supports static library builds)
|
||||
env.NIX_LDFLAGS = "-lz";
|
||||
|
||||
meta = {
|
||||
description = "Toolkit for Http-based file management";
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
coreutils,
|
||||
fetchFromGitHub,
|
||||
fetchFromSourcehut,
|
||||
file,
|
||||
libcaca,
|
||||
makeWrapper,
|
||||
@@ -15,13 +15,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gen-oath-safe";
|
||||
version = "0.11.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mcepl";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~mcepl";
|
||||
repo = "gen-oath-safe";
|
||||
rev = version;
|
||||
tag = version;
|
||||
sha256 = "1914z0jgj7lni0nf3hslkjgkv87mhxdr92cmhmbzhpjgjgr23ydp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
dontBuild = true;
|
||||
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
|
||||
--prefix PATH : ${path}
|
||||
'';
|
||||
meta = {
|
||||
homepage = "https://github.com/mcepl/gen-oath-safe";
|
||||
homepage = "https://git.sr.ht/~mcepl/gen-oath-safe";
|
||||
description = "Script for generating HOTP/TOTP keys (and QR code)";
|
||||
platforms = lib.platforms.unix;
|
||||
license = lib.licenses.mit;
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "github-mcp-server";
|
||||
version = "0.20.2";
|
||||
version = "0.25.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "github";
|
||||
repo = "github-mcp-server";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-1xr0AUAfYrxR7koCn9S3VJAw8PaJvFLNyzsblqyGyC0=";
|
||||
hash = "sha256-sl/IEydxi64Z+ArqcApEELfi3lyxJY4MhR2X9g1fUbY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-j0THkLxOcNTyUoyl3WkbjR+8urM4fmsg7Mt74S4wjqU=";
|
||||
vendorHash = "sha256-90hWzVIjDzP7DBVSIYIwJtG5I89saQTQCU50n4HVylY=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -13,16 +13,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "gitlab-ci-local";
|
||||
version = "4.63.0";
|
||||
version = "4.64.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firecow";
|
||||
repo = "gitlab-ci-local";
|
||||
rev = version;
|
||||
hash = "sha256-IqfCEU/ZX28CAAFW9Wx9QFQY4E5iYKC5Ac0m7AuubNk=";
|
||||
hash = "sha256-scZ6KqpO/E3Ycu6Nn5o/4LaEpSAOWim8mOqpByjZlZE=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-0XV9jT1Ps8TPhl4pKN92v6mbMT37EcXdcn+GUo2wprg=";
|
||||
npmDepsHash = "sha256-IoycsUU+7o4A3d+pGQvyBvaIqg7fdvwS8Pay9MmRqM4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeBinaryWrapper
|
||||
|
||||
@@ -3,24 +3,24 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
libsForQt5,
|
||||
qt6,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "glabels-qt";
|
||||
version = "unstable-2021-02-06";
|
||||
version = "unstable-2025-12-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jimevins";
|
||||
repo = "glabels-qt";
|
||||
rev = "glabels-3.99-master564";
|
||||
hash = "sha256-SdNOkjspqf6NuuIBZDsJneY6PNrIiP4HU46wDpBLt9Y=";
|
||||
tag = "3.99-master602";
|
||||
hash = "sha256-7MQufoU1GBvmZd8FRn331/PwmwQMuZeuFKQqViRI754=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
libsForQt5.wrapQtAppsHook
|
||||
libsForQt5.qttools
|
||||
qt6.wrapQtAppsHook
|
||||
qt6.qttools
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -66,7 +66,10 @@ stdenv.mkDerivation rec {
|
||||
# 3. Proprietary commercial software development license (removes GPL
|
||||
# restrictions)
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ bjornfor ];
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [
|
||||
bjornfor
|
||||
veprbl
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
From 69a6ab80cf0908c2a44430c297932ef3659a1655 Mon Sep 17 00:00:00 2001
|
||||
From: Jiajie Chen <c@jia.je>
|
||||
Date: Wed, 22 Jun 2022 16:24:10 +0800
|
||||
Subject: [PATCH 1/2] Fix detection of quartz in gdk-3.0 target
|
||||
|
||||
The GTK+3 built by Nix targets ``broadway quartz`` instead of only `quartz`,
|
||||
thus the target check is wrong. The script is modified to look up `quartz` in a
|
||||
loop. The variable name is renamed to `targets` in `gdk-3.0.pc` as well.
|
||||
|
||||
---
|
||||
configure | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 628a80f..9cb88d5 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -7361,7 +7361,10 @@ $as_echo "yes" >&6; }
|
||||
fi
|
||||
GTK_VER=`$PKG_CONFIG gtk+-3.0 --modversion`
|
||||
|
||||
- _gdk_tgt=`$PKG_CONFIG --variable=target gdk-3.0`
|
||||
+ # gdk-3.0 may have multiple targets e.g. "broadway quartz"
|
||||
+ _gdk_tgts=`$PKG_CONFIG --variable=targets gdk-3.0`
|
||||
+ for _gdk_tgt in $_gdk_tgts;
|
||||
+ do
|
||||
if test "x$_gdk_tgt" = xquartz; then
|
||||
|
||||
pkg_failed=no
|
||||
@@ -7466,6 +7469,7 @@ fi
|
||||
COCOA_GTK_LDFLAGS="-framework Cocoa -framework ApplicationServices"
|
||||
|
||||
fi
|
||||
+ done
|
||||
|
||||
if test x$with_gconf = xyes; then
|
||||
|
||||
--
|
||||
2.36.1
|
||||
|
||||
@@ -1,101 +0,0 @@
|
||||
From 6045177a0d4753bb7a6a6ffc3f1a4a3e96129c6d Mon Sep 17 00:00:00 2001
|
||||
From: Jiajie Chen <c@jia.je>
|
||||
Date: Wed, 22 Jun 2022 17:03:29 +0800
|
||||
Subject: [PATCH 2/2] Check GDK_WINDOWING_X11 macro when using GtkPlug
|
||||
|
||||
---
|
||||
src/main.c | 5 +++++
|
||||
src/twinwave.c | 12 ++++++++++--
|
||||
2 files changed, 15 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/main.c b/src/main.c
|
||||
index 81bf505..b89f629 100644
|
||||
--- a/src/main.c
|
||||
+++ b/src/main.c
|
||||
@@ -2080,10 +2080,15 @@ if(!GLOBALS->socket_xid)
|
||||
#ifdef WAVE_USE_XID
|
||||
else
|
||||
{
|
||||
+#ifdef GDK_WINDOWING_X11
|
||||
GLOBALS->mainwindow = gtk_plug_new(GLOBALS->socket_xid);
|
||||
gtk_widget_show(GLOBALS->mainwindow);
|
||||
|
||||
g_signal_connect(XXX_GTK_OBJECT(GLOBALS->mainwindow), "destroy", /* formerly was "destroy" */G_CALLBACK(plug_destroy),"Plug destroy");
|
||||
+#else
|
||||
+ fprintf(stderr, "GTKWAVE | GtkPlug widget is unavailable\n");
|
||||
+ exit(1);
|
||||
+#endif
|
||||
}
|
||||
#endif
|
||||
}
|
||||
diff --git a/src/twinwave.c b/src/twinwave.c
|
||||
index 590c7f6..d5c60f2 100644
|
||||
--- a/src/twinwave.c
|
||||
+++ b/src/twinwave.c
|
||||
@@ -143,15 +143,19 @@ if(GDK_IS_WAYLAND_DISPLAY(gdk_display_get_default()))
|
||||
use_embedded = 0;
|
||||
}
|
||||
#endif
|
||||
+#if defined(__GTK_SOCKET_H__) && defined(GDK_WINDOWING_X11)
|
||||
{
|
||||
xsocket[0] = gtk_socket_new ();
|
||||
xsocket[1] = gtk_socket_new ();
|
||||
gtk_widget_show (xsocket[0]);
|
||||
gtk_widget_show (xsocket[1]);
|
||||
}
|
||||
+#endif
|
||||
|
||||
+#if defined(__GTK_SOCKET_H__) && defined(GDK_WINDOWING_X11)
|
||||
if(!twinwayland)
|
||||
g_signal_connect(XXX_GTK_OBJECT(xsocket[0]), "plug-removed", G_CALLBACK(plug_removed), NULL);
|
||||
+#endif
|
||||
|
||||
#if GTK_CHECK_VERSION(3,0,0)
|
||||
main_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
|
||||
@@ -208,7 +212,7 @@ if(hMapFile != NULL)
|
||||
memset(&pi, 0, sizeof(PROCESS_INFORMATION));
|
||||
|
||||
sprintf(buf, "0+%08X", shmid);
|
||||
-#ifdef MINGW_USE_XID
|
||||
+#if defined(MINGW_USE_XID) && defined(__GTK_SOCKET_H__) && defined(GDK_WINDOWING_X11)
|
||||
sprintf(buf2, "%x", gtk_socket_get_id (GTK_SOCKET(xsocket[0])));
|
||||
#else
|
||||
sprintf(buf2, "%x", 0);
|
||||
@@ -279,7 +283,7 @@ if(hMapFile != NULL)
|
||||
memset(&pi, 0, sizeof(PROCESS_INFORMATION));
|
||||
|
||||
sprintf(buf, "1+%08X", shmid);
|
||||
-#ifdef MINGW_USE_XID
|
||||
+#if defined(MINGW_USE_XID) && defined(__GTK_SOCKET_H__) && defined(GDK_WINDOWING_X11)
|
||||
sprintf(buf2, "%x", gtk_socket_get_id (GTK_SOCKET(xsocket[1])));
|
||||
#else
|
||||
sprintf(buf2, "%x", 0);
|
||||
@@ -429,10 +433,12 @@ if(shmid >=0)
|
||||
sprintf(buf, "0+%08X", shmid);
|
||||
if(use_embedded)
|
||||
{
|
||||
+#if defined(__GTK_SOCKET_H__) && defined(GDK_WINDOWING_X11)
|
||||
#ifdef MAC_INTEGRATION
|
||||
sprintf(buf2, "%x", gtk_socket_get_id (GTK_SOCKET(xsocket[0])));
|
||||
#else
|
||||
sprintf(buf2, "%lx", (long)gtk_socket_get_id (GTK_SOCKET(xsocket[0])));
|
||||
+#endif
|
||||
#endif
|
||||
}
|
||||
else
|
||||
@@ -467,10 +473,12 @@ if(shmid >=0)
|
||||
sprintf(buf, "1+%08X", shmid);
|
||||
if(use_embedded)
|
||||
{
|
||||
+#if defined(__GTK_SOCKET_H__) && defined(GDK_WINDOWING_X11)
|
||||
#ifdef MAC_INTEGRATION
|
||||
sprintf(buf2, "%x", gtk_socket_get_id (GTK_SOCKET(xsocket[1])));
|
||||
#else
|
||||
sprintf(buf2, "%lx", (long)gtk_socket_get_id (GTK_SOCKET(xsocket[1])));
|
||||
+#endif
|
||||
#endif
|
||||
}
|
||||
else
|
||||
--
|
||||
2.36.1
|
||||
|
||||
@@ -18,11 +18,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gtkwave";
|
||||
version = "3.3.121";
|
||||
version = "3.3.125";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz";
|
||||
sha256 = "sha256-VKpFeI1tUq+2WcOu8zWq/eDvLImQp3cPjqpk5X8ic0Y=";
|
||||
sha256 = "sha256-Musd9N/Vbg3eF+igjeYPIBOK8BeoqK1kUi9pYnVixDc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -44,14 +44,6 @@ stdenv.mkDerivation rec {
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin gtk-mac-integration;
|
||||
|
||||
# fix compilation under Darwin
|
||||
# remove these patches upon next release
|
||||
# https://github.com/gtkwave/gtkwave/pull/136
|
||||
patches = [
|
||||
./0001-Fix-detection-of-quartz-in-gdk-3.0-target.patch
|
||||
./0002-Check-GDK_WINDOWING_X11-macro-when-using-GtkPlug.patch
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--with-tcl=${tcl}/lib"
|
||||
"--with-tk=${tk}/lib"
|
||||
|
||||
@@ -16,6 +16,14 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "15sgkdyijb7vbxpxjavh5qm5nvyii3fqcg9mzvw7fx8s6zmfwczp";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with gcc 15
|
||||
(fetchurl {
|
||||
url = "https://salsa.debian.org/debian/iftop/-/raw/750d49dd3fabc338586a86f5bb0a5b97a5ff5fa2/debian/patches/bug-debian-1096832-ftbfs-with-GCC-15.patch";
|
||||
hash = "sha256-BhjN7AZNCJCqrY2IAutUYYDZkLq+TD2YnKYZxHgVdYg=";
|
||||
})
|
||||
];
|
||||
|
||||
# Explicitly link against libgcc_s, to work around the infamous
|
||||
# "libgcc_s.so.1 must be installed for pthread_cancel to work".
|
||||
LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux "-lgcc_s";
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
faad2,
|
||||
fetchFromGitHub,
|
||||
fftwFloat,
|
||||
gdk-pixbuf,
|
||||
glib,
|
||||
libogg,
|
||||
libopus,
|
||||
@@ -33,19 +34,20 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kew";
|
||||
version = "3.6.4";
|
||||
version = "3.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ravachol";
|
||||
repo = "kew";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-PhNBAy+XS1wpU91GNoRc4jume9razD03xmmUER0p8I0=";
|
||||
hash = "sha256-MCmOd8c2owIjtXkRUso3+4C0Hj/5HoOLa97E9+21FGA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace-fail '$(shell uname -s)' '${uppercaseFirst stdenv.hostPlatform.parsed.kernel.name}' \
|
||||
--replace-fail '$(shell uname -m)' '${stdenv.hostPlatform.parsed.cpu.name}'
|
||||
--replace-fail '$(shell uname -m)' '${stdenv.hostPlatform.parsed.cpu.name}' \
|
||||
--replace-fail 'LANGDIRPREFIX = /usr' 'LANGDIRPREFIX = ${placeholder "out"}'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -59,6 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
fftwFloat.dev
|
||||
chafa
|
||||
curl.dev
|
||||
gdk-pixbuf
|
||||
glib.dev
|
||||
libopus
|
||||
opusfile
|
||||
|
||||
@@ -20,15 +20,15 @@ let
|
||||
fi
|
||||
'';
|
||||
in
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "linux-firmware";
|
||||
version = "20251125";
|
||||
version = "20251125-unstable-2025-12-18";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "kernel-firmware";
|
||||
repo = "linux-firmware";
|
||||
tag = version;
|
||||
hash = "sha256-eNzCgVx6iPWbPccMM1TLBIsFKwiha9/gajmFtobj4SE=";
|
||||
rev = "881c549a82203abd9a88870ba27f3e8ce754b2c4";
|
||||
hash = "sha256-ziKzNbP8pqwFilzQb227FtVMqaUGDcbZ57tc9mAMSxs=";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
|
||||
@@ -39,7 +39,7 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lsp-plugins";
|
||||
version = "1.2.25";
|
||||
version = "1.2.26";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lsp-plugins/lsp-plugins/releases/download/${finalAttrs.version}/lsp-plugins-src-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-qCm3DfRF7LR6wk5TtC/r1GIA2ZI7YrrZTKNHjLDjJnM=";
|
||||
hash = "sha256-RIMqmSJkF90u+nSICZCj3nGrAx1mfUXsPQb3lXicCfM=";
|
||||
};
|
||||
|
||||
# By default, GStreamer plugins are installed right alongside GStreamer itself
|
||||
@@ -178,6 +178,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
- Send
|
||||
- Surge Filter
|
||||
- Trigger
|
||||
|
||||
Matcher plugins:
|
||||
- Matcher
|
||||
- Sidechain Matcher
|
||||
'';
|
||||
homepage = "https://lsp-plug.in";
|
||||
changelog = "https://github.com/lsp-plugins/lsp-plugins/releases/tag/${finalAttrs.version}";
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "manrope";
|
||||
version = "4.505";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sharanda";
|
||||
repo = "manrope";
|
||||
rev = "d79b66b10608610692d59f4107791d249d244416"; # no tags in repo
|
||||
hash = "sha256-dxnCOkPUEG0knSekolx2+SGJR81vRK0wUrbzGH4KGD0=";
|
||||
};
|
||||
|
||||
dontPatch = true;
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
doCheck = false;
|
||||
dontFixup = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm644 fonts/otf/*.otf -t $out/share/fonts/opentype
|
||||
install -Dm644 fonts/ttf/*.ttf fonts/variable/*.ttf -t $out/share/fonts/truetype
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Open-source modern sans-serif font family";
|
||||
homepage = "https://www.gent.media/manrope";
|
||||
license = lib.licenses.ofl;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
+28
-37
@@ -9,14 +9,14 @@ Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com>
|
||||
---
|
||||
mkosi/__init__.py | 17 +++++++----------
|
||||
mkosi/bootloader.py | 3 +--
|
||||
mkosi/run.py | 8 ++++----
|
||||
3 files changed, 12 insertions(+), 16 deletions(-)
|
||||
mkosi/run.py | 6 +++---
|
||||
3 files changed, 11 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/mkosi/__init__.py b/mkosi/__init__.py
|
||||
index 65cac772bf1fc9feabec5740ed89a958ba406125..c0debc09a76f36ae878bd172294eee6637b95bcb 100644
|
||||
index f4766ae71244a21caa5bcbf5b5376f617c706b33..8f85f923b41feaa7716ae409cc2e983a73579ea8 100644
|
||||
--- a/mkosi/__init__.py
|
||||
+++ b/mkosi/__init__.py
|
||||
@@ -570,7 +570,7 @@ def finalize_host_scripts(
|
||||
@@ -613,7 +613,7 @@ def finalize_host_scripts(
|
||||
if context.config.find_binary(binary):
|
||||
scripts[binary] = (binary, "--root", "/buildroot")
|
||||
if ukify := context.config.find_binary("ukify"):
|
||||
@@ -25,7 +25,7 @@ index 65cac772bf1fc9feabec5740ed89a958ba406125..c0debc09a76f36ae878bd172294eee66
|
||||
return finalize_scripts(context.config, scripts | dict(helpers))
|
||||
|
||||
|
||||
@@ -702,7 +702,7 @@ def script_maybe_chroot_sandbox(
|
||||
@@ -755,7 +755,7 @@ def script_maybe_chroot_sandbox(
|
||||
|
||||
helpers = {
|
||||
"mkosi-chroot": [
|
||||
@@ -34,7 +34,7 @@ index 65cac772bf1fc9feabec5740ed89a958ba406125..c0debc09a76f36ae878bd172294eee66
|
||||
"--bind", "/buildroot", "/",
|
||||
"--bind", "/var/tmp", "/var/tmp",
|
||||
*apivfs_options(root=Path("/")),
|
||||
@@ -1593,7 +1593,7 @@ def run_ukify(
|
||||
@@ -1587,7 +1587,7 @@ def run_ukify(
|
||||
sign: bool = True,
|
||||
json_out: bool = False,
|
||||
) -> dict[str, Any]:
|
||||
@@ -43,7 +43,7 @@ index 65cac772bf1fc9feabec5740ed89a958ba406125..c0debc09a76f36ae878bd172294eee66
|
||||
if not ukify:
|
||||
die("Could not find ukify")
|
||||
|
||||
@@ -1605,7 +1605,6 @@ def run_ukify(
|
||||
@@ -1599,7 +1599,6 @@ def run_ukify(
|
||||
(context.workspace / "cmdline").write_text(f"{' '.join(cmdline)}\x00")
|
||||
|
||||
cmd = [
|
||||
@@ -51,7 +51,7 @@ index 65cac772bf1fc9feabec5740ed89a958ba406125..c0debc09a76f36ae878bd172294eee66
|
||||
ukify,
|
||||
"build",
|
||||
*arguments,
|
||||
@@ -1700,7 +1699,7 @@ def build_uki(
|
||||
@@ -1694,7 +1693,7 @@ def build_uki(
|
||||
profiles: Sequence[Path],
|
||||
output: Path,
|
||||
) -> dict[str, Any]:
|
||||
@@ -60,15 +60,15 @@ index 65cac772bf1fc9feabec5740ed89a958ba406125..c0debc09a76f36ae878bd172294eee66
|
||||
die("Could not find ukify")
|
||||
|
||||
json_out = False
|
||||
@@ -1759,7 +1758,6 @@ def build_uki(
|
||||
# TODO: bump version to 258 once it is released
|
||||
@@ -1755,7 +1754,6 @@ def build_uki(
|
||||
|
||||
if (
|
||||
systemd_tool_version(
|
||||
- python_binary(context.config),
|
||||
ukify,
|
||||
sandbox=context.sandbox,
|
||||
)
|
||||
@@ -1819,7 +1817,6 @@ def build_uki(
|
||||
@@ -1815,7 +1813,6 @@ def build_uki(
|
||||
# new .ucode section support?
|
||||
if (
|
||||
systemd_tool_version(
|
||||
@@ -76,16 +76,16 @@ index 65cac772bf1fc9feabec5740ed89a958ba406125..c0debc09a76f36ae878bd172294eee66
|
||||
ukify,
|
||||
sandbox=context.sandbox,
|
||||
)
|
||||
@@ -1887,7 +1884,7 @@ def want_uki(context: Context) -> bool:
|
||||
@@ -1883,7 +1880,7 @@ def want_uki(context: Context) -> bool:
|
||||
or (
|
||||
context.config.unified_kernel_images == ConfigFeature.auto
|
||||
context.config.unified_kernel_images == UnifiedKernelImage.auto
|
||||
and systemd_stub_binary(context).exists()
|
||||
- and context.config.find_binary("ukify", "/usr/lib/systemd/ukify") is not None
|
||||
+ and context.config.find_binary("ukify", "@UKIFY@") is not None
|
||||
)
|
||||
)
|
||||
|
||||
@@ -2769,9 +2766,9 @@ def check_ukify(
|
||||
@@ -2799,9 +2796,9 @@ def check_ukify(
|
||||
reason: str,
|
||||
hint: Optional[str] = None,
|
||||
) -> None:
|
||||
@@ -98,10 +98,10 @@ index 65cac772bf1fc9feabec5740ed89a958ba406125..c0debc09a76f36ae878bd172294eee66
|
||||
die(
|
||||
f"Found '{ukify}' with version {v} but version {version} or newer is required to {reason}.",
|
||||
diff --git a/mkosi/bootloader.py b/mkosi/bootloader.py
|
||||
index 6f112b854f72a8863dc5e7348f0154851d3dda96..28b32b9c8fcaa7c49a7d69e7e303ccf332d47d58 100644
|
||||
index 7d434bb4776980c6fa58ae8f7795f3ffc319baeb..8960a6d17d153b06b029f9072a464a12f5cafe65 100644
|
||||
--- a/mkosi/bootloader.py
|
||||
+++ b/mkosi/bootloader.py
|
||||
@@ -270,8 +270,7 @@ def find_signed_grub_image(context: Context) -> Optional[Path]:
|
||||
@@ -316,8 +316,7 @@ def find_signed_grub_image(context: Context) -> Optional[Path]:
|
||||
def python_binary(config: Config) -> PathString:
|
||||
# If there's no tools tree, prefer the interpreter from MKOSI_INTERPRETER. If there is a tools
|
||||
# tree, just use the default python3 interpreter.
|
||||
@@ -112,10 +112,19 @@ index 6f112b854f72a8863dc5e7348f0154851d3dda96..28b32b9c8fcaa7c49a7d69e7e303ccf3
|
||||
|
||||
def extract_pe_section(context: Context, binary: Path, section: str, output: Path) -> Path:
|
||||
diff --git a/mkosi/run.py b/mkosi/run.py
|
||||
index 422006d889802182d7e2f1734b2c342318583e7b..b9a1490bcd7780fea75d834e3ea4fb9a7033cc51 100644
|
||||
index 159b75c1af1b5d84e409426e566e098571086c8e..7ade34fc6a9d53e010f5f45cce53a9c92407f49d 100644
|
||||
--- a/mkosi/run.py
|
||||
+++ b/mkosi/run.py
|
||||
@@ -277,7 +277,7 @@ def finalize_path(
|
||||
@@ -238,7 +238,7 @@ def spawn(
|
||||
module = stack.enter_context(resource_path(sys.modules[__package__ or __name__]))
|
||||
prefix = [
|
||||
*(["strace", "--detach-on=execve", "--string-limit=256"] if ARG_DEBUG_SANDBOX.get() else []),
|
||||
- sys.executable, "-SI", os.fspath(module / "sandbox.py"),
|
||||
+ @MKOSI_SANDBOX@,
|
||||
*sbx,
|
||||
] # fmt: skip
|
||||
|
||||
@@ -321,7 +321,7 @@ def finalize_path(
|
||||
# Make sure that /usr/bin and /usr/sbin are always in $PATH.
|
||||
path += [s for s in ("/usr/bin", "/usr/sbin") if s not in path]
|
||||
else:
|
||||
@@ -124,16 +133,7 @@ index 422006d889802182d7e2f1734b2c342318583e7b..b9a1490bcd7780fea75d834e3ea4fb9a
|
||||
|
||||
if prefix_usr:
|
||||
path = [os.fspath(root / s.lstrip("/")) if s in ("/usr/bin", "/usr/sbin") else s for s in path]
|
||||
@@ -463,7 +463,7 @@ def sandbox_cmd(
|
||||
cmdline: list[PathString] = [
|
||||
*setup,
|
||||
*(["strace", "--detach-on=execve"] if ARG_DEBUG_SANDBOX.get() else []),
|
||||
- sys.executable, "-SI", module / "sandbox.py",
|
||||
+ @MKOSI_SANDBOX@,
|
||||
"--proc", "/proc",
|
||||
# We mounted a subdirectory of TMPDIR to /var/tmp so we unset TMPDIR so that /tmp or /var/tmp are
|
||||
# used instead.
|
||||
@@ -633,7 +633,7 @@ def chroot_options() -> list[PathString]:
|
||||
@@ -690,7 +690,7 @@ def chroot_options() -> list[PathString]:
|
||||
"--unshare-ipc",
|
||||
"--setenv", "container", "mkosi",
|
||||
"--setenv", "HOME", "/",
|
||||
@@ -142,12 +142,3 @@ index 422006d889802182d7e2f1734b2c342318583e7b..b9a1490bcd7780fea75d834e3ea4fb9a
|
||||
"--setenv", "BUILDROOT", "/",
|
||||
] # fmt: skip
|
||||
|
||||
@@ -647,7 +647,7 @@ def chroot_cmd(
|
||||
) -> Iterator[list[PathString]]:
|
||||
with vartmpdir() as dir, resource_path(sys.modules[__package__ or __name__]) as module:
|
||||
cmdline: list[PathString] = [
|
||||
- sys.executable, "-SI", module / "sandbox.py",
|
||||
+ @MKOSI_SANDBOX@,
|
||||
*root("/"),
|
||||
# We mounted a subdirectory of TMPDIR to /var/tmp so we unset TMPDIR so that /tmp or /var/tmp are
|
||||
# used instead.
|
||||
|
||||
@@ -11,10 +11,10 @@ Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com>
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/mkosi/sandbox.py b/mkosi/sandbox.py
|
||||
index c79b48739f3d7127375274bc0b1ef3463cae9032..1d7ad421f4534e25c6456c3a169ea9189668aefd 100755
|
||||
index 4a41f333a764bc41abbd36302bd9fe86baa45a3f..1ce102597f1935deadcec475ec873eab9ca03c22 100755
|
||||
--- a/mkosi/sandbox.py
|
||||
+++ b/mkosi/sandbox.py
|
||||
@@ -92,7 +92,7 @@ class cap_user_data_t(ctypes.Structure):
|
||||
@@ -124,7 +124,7 @@ class cap_user_data_t(ctypes.Structure):
|
||||
]
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@ index c79b48739f3d7127375274bc0b1ef3463cae9032..1d7ad421f4534e25c6456c3a169ea918
|
||||
|
||||
libc.syscall.restype = ctypes.c_long
|
||||
libc.unshare.argtypes = (ctypes.c_int,)
|
||||
@@ -221,7 +221,7 @@ def seccomp_suppress(*, chown: bool = False, sync: bool = False) -> None:
|
||||
@@ -291,7 +291,7 @@ def seccomp_suppress(*, chown: bool = False, sync: bool = False) -> None:
|
||||
if not chown and not sync:
|
||||
return
|
||||
|
||||
|
||||
@@ -9,10 +9,10 @@ Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com>
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/mkosi/qemu.py b/mkosi/qemu.py
|
||||
index 0c406d818a9fa9dcce3be97d0c89e9df0d2a96fa..c134ab4a8bfba1e3564c831a5069be52d90ee15a 100644
|
||||
index 4d1bec15605ca36d66a05add0744afdfbdc4853d..d10007ed58ebc16271b313b1a846ca2c24d8ae81 100644
|
||||
--- a/mkosi/qemu.py
|
||||
+++ b/mkosi/qemu.py
|
||||
@@ -211,7 +211,7 @@ def find_ovmf_firmware(config: Config, firmware: Firmware) -> Optional[OvmfConfi
|
||||
@@ -189,7 +189,7 @@ def find_ovmf_firmware(config: Config, firmware: Firmware) -> Optional[OvmfConfi
|
||||
if not firmware.is_uefi():
|
||||
return None
|
||||
|
||||
|
||||
@@ -58,7 +58,7 @@ let
|
||||
in
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "mkosi";
|
||||
version = "25.3";
|
||||
version = "26";
|
||||
format = "pyproject";
|
||||
|
||||
outputs = [
|
||||
@@ -69,8 +69,8 @@ python3Packages.buildPythonApplication rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "systemd";
|
||||
repo = "mkosi";
|
||||
rev = "21850673a7f75125d516268ce379dae776dd816a";
|
||||
hash = "sha256-3dhr9lFJpI8aN8HILaMvGuuTbmTVUqdaLAGxSpqciTs=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-6DVIyFsEV2VkQ/kesn6cN+iH9MW+mmAZw5i0R5C4xaU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -13,11 +13,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "monetdb";
|
||||
version = "11.53.15";
|
||||
version = "11.55.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${finalAttrs.version}.tar.bz2";
|
||||
hash = "sha256-Fe1m6JFDUYlB6+0+Zf9ok8lwvPNxONLHAu4GNEjCDAw=";
|
||||
hash = "sha256-Bf0HZcRs0pjAq39iZApUOlrjQjqg15qGEWdz5gHI4Ak=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
version = "1.2";
|
||||
|
||||
src = fetchzip {
|
||||
url = "http://jamiewilson.io/norwester/assets/norwester.zip";
|
||||
url = "https://jamiewilson.github.io/norwester/assets/norwester.zip";
|
||||
stripRoot = false;
|
||||
hash = "sha256-Ak/nobrQE/XYGWs/IhlZlTp74ff+s4adUR6Sht5Yf8g=";
|
||||
};
|
||||
@@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://jamiewilson.io/norwester";
|
||||
homepage = "https://jamiewilson.github.io/norwester/";
|
||||
description = "Condensed geometric sans serif by Jamie Wilson";
|
||||
license = lib.licenses.ofl;
|
||||
platforms = lib.platforms.all;
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "numr";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nasedkinpv";
|
||||
repo = "numr";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Qy0HIG2E7d7QU19XQAAWodJdAglaCSFM+IeDCnvpzww=";
|
||||
hash = "sha256-fa/F1bE/iUdtLe4kgHIQF3lcT/LLyUgdiYSgE9pCCSc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-iXUIf2G00qYgwHZ70Egzu0RginOjKVgidkMhjPwEIT4=";
|
||||
cargoHash = "sha256-onIhdgcB7MDiLCOi4qMysnu3VVpZ138jro9mZXDp9LI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
}:
|
||||
buildNpmPackage rec {
|
||||
pname = "playwright-mcp";
|
||||
version = "0.0.41";
|
||||
version = "0.0.53";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Microsoft";
|
||||
repo = "playwright-mcp";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-OoTAYd1/hedR0k/3b83YOPaOviLWv1Y3pffNoeSf2g4=";
|
||||
hash = "sha256-TuXdvaPa5732NTZ5Fchjr5pXsURYxsnrjf6CS1qlkOA=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-xgOPlCnlRXJZAZRM4xZ7SYSA5lsPglSewXxY19TbD/A=";
|
||||
npmDepsHash = "sha256-Rdtc8rWyBmWmC1qy7TetaAdb1OFG6PdB5/2xQe8MwUg=";
|
||||
|
||||
postInstall = ''
|
||||
rm -r $out/lib/node_modules/@playwright/mcp/node_modules/playwright
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "prow";
|
||||
version = "0-unstable-2025-11-25";
|
||||
rev = "e3ae8cf22a59dce06665a4eec8ed70d14c276c77";
|
||||
version = "0-unstable-2025-12-18";
|
||||
rev = "6bd26c8c553779752ecd8b21d8d32cb7067a8e71";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
|
||||
owner = "kubernetes-sigs";
|
||||
repo = "prow";
|
||||
hash = "sha256-w+EpyhCCUoMGuRRN+dEOpHXzs8kFYEBfk53/okCqeHY=";
|
||||
hash = "sha256-ImjNTj0VdPrH0C0FKfH8AgfUFWGr0VD6GNACeTR2THU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Rgn8fgDUSqYlf2JLlDCfLj5hXzujC5qyTYbJ+54FTD4=";
|
||||
vendorHash = "sha256-/ZAnYxUHHq+tqk0hcJrt6ZrpDDRqyLITWGL/hgW4A6A=";
|
||||
|
||||
# doCheck = false;
|
||||
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "readest";
|
||||
version = "0.9.95";
|
||||
version = "0.9.96";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "readest";
|
||||
repo = "readest";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-0fWxmip7Emu4z4v5VyV0nW9Dj1JvOOLJub1szboawP8=";
|
||||
hash = "sha256-3PCdcSF9ocDqHzK9P/FJQwch5u5zVLQ3eDNSGJQGSKw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -42,12 +42,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_9;
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-hYwkPqePFPEdqZ3w0mNvNEypsVL1PKv29LFk7b11zkg=";
|
||||
hash = "sha256-Ea/J3W3L8vVDlIRY/szaCfcqunjiFU6yL+e8h4c5UHg=";
|
||||
};
|
||||
|
||||
pnpmRoot = "../..";
|
||||
|
||||
cargoHash = "sha256-PbWjDvxbbiiKy1UeJx7cUawGampbL5t/Bhb13tirhGc=";
|
||||
cargoHash = "sha256-AwrA0KXLTSUhLxIJHKU1crVxUxImFOKDRStB48mZfcg=";
|
||||
|
||||
cargoRoot = "../..";
|
||||
|
||||
|
||||
@@ -21,17 +21,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ringboard" + lib.optionalString (displayServer == "wayland") "-wayland";
|
||||
|
||||
# release version needs nightly, so we use a custom tree, see:
|
||||
# https://github.com/SUPERCILEX/clipboard-history/issues/22#issuecomment-3322075172
|
||||
version = "0.12.2-unstable-2025-09-23";
|
||||
# https://github.com/SUPERCILEX/clipboard-history/issues/22#issuecomment-3676256971
|
||||
version = "0.13.2-unstable-2025-12-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SUPERCILEX";
|
||||
repo = "clipboard-history";
|
||||
rev = "228a39dd8a9aece0bb06f68ad44906b297270628";
|
||||
hash = "sha256-qA7wwvWnnZHN9edkmubEo37F+peU0LQGo/Zl8FpywuE=";
|
||||
rev = "08a2a2a77fa38240dfc6a33adabb3a473ce6bcfd";
|
||||
hash = "sha256-iG/pk6xizCv2sUqTA44nb4AnbaOuDsIONuUfJuOWnc8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-MFfuUu/hpb6Uaqe21bvXNKRyJazAL5m+Vw/vAeeDYEk=";
|
||||
cargoHash = "sha256-LuWUf37X/Z0xCbAQmaMY8lle7gGZWoz2bgYhe/uRonU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
@@ -93,7 +93,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
# To reopen the window, a special file can be deleted which wakes the GUI via inotify.
|
||||
# If, instead, a new instance of the GUI is opened, this special file is used to first check for a previously running instance of the GUI and kill it if it exists.
|
||||
# https://alexsaveau.dev/blog/projects/performance/clipboard/ringboard/ringboard#gui-startup-latency-and-long-lived-client-windows
|
||||
sed -i "s|Exec=ringboard-egui|Exec=$(echo /bin/sh -c \"ps -p \`cat /tmp/.ringboard/\$USER.egui-sleep 2\> /dev/null\` \> /dev/null 2\>\\\&1 \\\&\\\& exec rm -f /tmp/.ringboard/\$USER.egui-sleep \\\|\\\| exec $out/bin/ringboard-egui\")|g" $out/share/applications/ringboard-egui.desktop
|
||||
sed -i "s|Exec=ringboard-egui|Exec=$out/bin/ringboard-egui toggle|g" $out/share/applications/ringboard-egui.desktop
|
||||
sed -i "s|Icon=ringboard|Icon=$out/share/icons/hicolor/1024x1024/ringboard.jpeg|g" $out/share/applications/ringboard-egui.desktop
|
||||
'';
|
||||
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "simdutf";
|
||||
version = "7.7.0";
|
||||
version = "7.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simdutf";
|
||||
repo = "simdutf";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-OjQHPxk4lH+h48HfkJmiWY6nnGZd/bhUcZPW7NkF5jg=";
|
||||
hash = "sha256-/sz1GVMkHPlUkQxhbMGpoEg6byFH9WNMjEo6hjGRhE8=";
|
||||
};
|
||||
|
||||
# Fix build on darwin
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "smile";
|
||||
version = "2.10.2";
|
||||
version = "2.11.0";
|
||||
pyproject = false; # Builds with meson
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mijorus";
|
||||
repo = "smile";
|
||||
tag = version;
|
||||
hash = "sha256-J+cCYt5ATR5xm/NsjYGkfQmHpTS5LDugj0XCphHanDc=";
|
||||
hash = "sha256-uggbeFcafCvIpT+qHsnULTZ9oyQkfT7phI5KW00HEXg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,94 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
ffmpeg-headless,
|
||||
flac,
|
||||
lame,
|
||||
mp3val,
|
||||
python3Packages,
|
||||
sox,
|
||||
}:
|
||||
let
|
||||
runtimeDeps = [
|
||||
ffmpeg-headless
|
||||
flac
|
||||
lame
|
||||
mp3val
|
||||
sox
|
||||
];
|
||||
in
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "smoked-salmon";
|
||||
version = "0.9.7.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "smokin-salmon";
|
||||
repo = "smoked-salmon";
|
||||
tag = version;
|
||||
hash = "sha256-JOwqu/Hu7BjYLo3DdL6o+9TI/OQvlgj5Xu8WQ0cujwo=";
|
||||
};
|
||||
|
||||
# Upstream tends to use very narrow version constraints
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
build-system = with python3Packages; [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
aiohttp
|
||||
aiohttp-jinja2
|
||||
beautifulsoup4
|
||||
bitstring
|
||||
click
|
||||
deluge-client
|
||||
ffmpeg-python
|
||||
filetype
|
||||
httpx
|
||||
humanfriendly
|
||||
jinja2
|
||||
msgspec
|
||||
musicbrainzngs
|
||||
mutagen
|
||||
pillow
|
||||
platformdirs
|
||||
pycambia
|
||||
pyoxipng
|
||||
pyperclip
|
||||
qbittorrent-api
|
||||
ratelimit
|
||||
requests
|
||||
rich
|
||||
send2trash
|
||||
setuptools
|
||||
torf
|
||||
tqdm
|
||||
transmission-rpc
|
||||
unidecode
|
||||
wheel
|
||||
];
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--suffix"
|
||||
"PATH"
|
||||
":"
|
||||
(lib.makeBinPath runtimeDeps)
|
||||
];
|
||||
|
||||
passthru = {
|
||||
inherit runtimeDeps;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Toolkit for checking, editing and uploading music to Gazelle-based trackers";
|
||||
homepage = "https://github.com/smokin-salmon/smoked-salmon";
|
||||
license = with lib.licenses; [ asl20 ];
|
||||
mainProgram = "salmon";
|
||||
maintainers = with lib.maintainers; [
|
||||
ambroisie
|
||||
undefined-landmark
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "spaceship-prompt";
|
||||
version = "4.19.1";
|
||||
version = "4.19.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "denysdovhan";
|
||||
repo = "spaceship-prompt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-zMazuPTwvbmtd6BIjD7oDJ3V4TGlUnxJT25Pe1TI3UY=";
|
||||
sha256 = "sha256-2RWU341FFGPOUBz86O+ocAWgER8V8yxXzWc8K1PG1CE=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "taskwarrior-tui";
|
||||
version = "0.26.4";
|
||||
version = "0.26.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kdheepak";
|
||||
repo = "taskwarrior-tui";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Ubl2xSFb5ZJ/5JqNI0In3hX6SxZd4g/AEq+CLdN2FsE=";
|
||||
sha256 = "sha256-mdkGRxe9d92WXBCLhBUWNALS4WwjoeYgZop2frZwNN0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-lq2mqMrhcRX2gX7youx8NrZEKmEOJYuhIsHHixuQmmk=";
|
||||
cargoHash = "sha256-Z9y8LLqTicbw4Q+lFalQo4kZFddU2fVMBl6iR4f6D9g=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vencord";
|
||||
version = "1.13.9";
|
||||
version = "1.13.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Vendicated";
|
||||
repo = "Vencord";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-AvwYAsc/dozSfIGPcsySAqOa47jg6bXvHj53eVsjYiM=";
|
||||
hash = "sha256-PSA1CD5YMDSNrP6JUEfdqSC1fNXXWHKsu5hCXnoXGCA=";
|
||||
};
|
||||
|
||||
patches = [ ./fix-deps.patch ];
|
||||
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-M9yZxBtuZg5KwG2Sli+f6Ionwccq7F7tI8/FnP1iObA=";
|
||||
hash = "sha256-K9rjPsODn56kM2k5KZHxY99n8fKvWbRbxuxFpYVXYks=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -88,7 +88,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://italiangrid.github.io/voms/";
|
||||
changelog = "https://github.com/italiangrid/voms/blob/master/ChangeLog";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.linux; # gsoap is currently Linux-only in Nixpkgs
|
||||
maintainers = with lib.maintainers; [ ShamrockLee ];
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [
|
||||
ShamrockLee
|
||||
veprbl
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-photos-library-api";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "allenporter";
|
||||
repo = "python-google-photos-library-api";
|
||||
tag = version;
|
||||
hash = "sha256-BtVnFQ0MtxQBvT0xff59hBED89rtg8xfuv31T13qL8w=";
|
||||
hash = "sha256-pmAAvwhr783ih9vpqr5DmT462z3Ug1xwHaz9itu/mt4=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
openssl,
|
||||
pkg-config,
|
||||
pytestCheckHook,
|
||||
rustPlatform,
|
||||
}:
|
||||
let
|
||||
cargoLockPatch = (
|
||||
fetchpatch {
|
||||
name = "cargo.lock.patch";
|
||||
url = "https://github.com/KyokoMiki/pycambia/commit/00446e13c20a461c323b119e16f3f57489ba662d.patch";
|
||||
hash = "sha256-N7F67VRxfndoN8NllmGKEePOh3mgbjlNaToUvxh+IrE=";
|
||||
}
|
||||
);
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "pycambia";
|
||||
version = "0.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KyokoMiki";
|
||||
repo = "pycambia";
|
||||
tag = version;
|
||||
hash = "sha256-ZflLy6Qa4tBlPZkTya3ELu463qcnRcMS57a6FfHpSNE=";
|
||||
};
|
||||
|
||||
patches = [ cargoLockPatch ];
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
hash = "sha256-jmdf+Idg9PR4jgZ7bexPsAyGj86vGxLseTWXnhzP7+E=";
|
||||
patches = [ cargoLockPatch ];
|
||||
};
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
rustPlatform.cargoSetupHook
|
||||
rustPlatform.maturinBuildHook
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "cambia" ];
|
||||
|
||||
meta = {
|
||||
description = "Python wrapper for compact disc ripper log checking utility cambia";
|
||||
homepage = "https://github.com/KyokoMiki/pycambia";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ undefined-landmark ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyoxipng";
|
||||
version = "9.1.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nfrasser";
|
||||
repo = "pyoxipng";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-aVya+0+X2p0VaWCZTxVlVUFFlqkqZ7A2lJjhxiXAgrE=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
hash = "sha256-wMCx6cujqM4q96b1mg4eovKjWmsv0FcaDBCxy0OodmA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with rustPlatform; [
|
||||
cargoSetupHook
|
||||
maturinBuildHook
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "oxipng" ];
|
||||
|
||||
meta = {
|
||||
description = "Python wrapper for multithreaded PNG optimizer oxipng";
|
||||
homepage = "https://github.com/nfrasser/pyoxipng";
|
||||
changelog = "https://github.com/nfrasser/pyoxipng/blob/${src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ undefined-landmark ];
|
||||
};
|
||||
}
|
||||
@@ -24,14 +24,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "urllib3-future";
|
||||
version = "2.14.908";
|
||||
version = "2.15.900";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jawah";
|
||||
repo = "urllib3.future";
|
||||
tag = version;
|
||||
hash = "sha256-EPM3LbzNA7gKkwJy4xd/d/Mhs0qhuPRGI4uVkDHiUnI=";
|
||||
hash = "sha256-YSV9Wjwq98VbYeCuTvjP4uxhxtyZtD/Hgh84i6vgFoo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -15,8 +15,8 @@ let
|
||||
hash = "sha256-z4anrXZEBjldQoam0J1zBxFyCsxtk+nc6ax6xNxKKKc=";
|
||||
};
|
||||
"10" = {
|
||||
version = "10.25.0";
|
||||
hash = "sha256-DzcmZUsLXlLlgAkE3haK/Dxmfiq/hL2wbZrBOGEEvZA=";
|
||||
version = "10.26.1";
|
||||
hash = "sha256-6ObkmRKPaAT1ySIjzR8uP2JVcQLAxuJUzJm7KqIpu/k=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -81,12 +81,12 @@ rec {
|
||||
};
|
||||
|
||||
latest = selectHighestVersion production (generic {
|
||||
version = "575.64.05";
|
||||
sha256_64bit = "sha256-hfK1D5EiYcGRegss9+H5dDr/0Aj9wPIJ9NVWP3dNUC0=";
|
||||
sha256_aarch64 = "sha256-GRE9VEEosbY7TL4HPFoyo0Ac5jgBHsZg9sBKJ4BLhsA=";
|
||||
openSha256 = "sha256-mcbMVEyRxNyRrohgwWNylu45vIqF+flKHnmt47R//KU=";
|
||||
settingsSha256 = "sha256-o2zUnYFUQjHOcCrB0w/4L6xI1hVUXLAWgG2Y26BowBE=";
|
||||
persistencedSha256 = "sha256-2g5z7Pu8u2EiAh5givP5Q1Y4zk4Cbb06W37rf768NFU=";
|
||||
version = "590.48.01";
|
||||
sha256_64bit = "sha256-ueL4BpN4FDHMh/TNKRCeEz3Oy1ClDWto1LO/LWlr1ok=";
|
||||
sha256_aarch64 = "sha256-FOz7f6pW1NGM2f74kbP6LbNijxKj5ZtZ08bm0aC+/YA=";
|
||||
openSha256 = "sha256-hECHfguzwduEfPo5pCDjWE/MjtRDhINVr4b1awFdP44=";
|
||||
settingsSha256 = "sha256-NWsqUciPa4f1ZX6f0By3yScz3pqKJV1ei9GvOF8qIEE=";
|
||||
persistencedSha256 = "sha256-wsNeuw7IaY6Qc/i/AzT/4N82lPjkwfrhxidKWUtcwW8=";
|
||||
});
|
||||
|
||||
beta = selectHighestVersion latest (generic {
|
||||
|
||||
@@ -123,7 +123,7 @@ let
|
||||
+
|
||||
lib.optionalString
|
||||
(
|
||||
!stdenv.hostPlatform.isWindows
|
||||
!(stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isCygwin)
|
||||
# build failure
|
||||
&& !stdenv.hostPlatform.isStatic
|
||||
# LTO breaks exception handling on x86-64-darwin.
|
||||
|
||||
@@ -182,6 +182,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
passthru = {
|
||||
inherit (nix-cli) version;
|
||||
inherit nix-cli;
|
||||
src = patchedSrc;
|
||||
|
||||
/**
|
||||
|
||||
@@ -455,6 +455,8 @@ mapAliases {
|
||||
collada2gltf = throw "collada2gltf has been removed from Nixpkgs, as it has been unmaintained upstream for 5 years and does not build with supported GCC versions"; # Addd 2025-08-08
|
||||
colloid-kde = throw "'colloid-kde' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
|
||||
colorstorm = throw "'colorstorm' has been removed because it was unmaintained in nixpkgs and upstream was rewritten."; # Added 2025-06-15
|
||||
computecpp = throw "'computecpp' has been removed because its source has been pulled"; # Added 2025-12-20
|
||||
computecpp-unwrapped = throw "'computecpp-unwrapped' has been removed because its source has been pulled"; # Added 2025-12-20
|
||||
conduwuit = throw "'conduwuit' has been removed as the upstream repository has been deleted. Consider migrating to 'matrix-conduit', 'matrix-continuwuity' or 'matrix-tuwunel' instead."; # Added 2025-08-08
|
||||
cone = throw "cone has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
|
||||
connman-ncurses = throw "'connman-ncurses' has been removed due to lack of maintenance upstream."; # Added 2025-05-27
|
||||
@@ -1043,6 +1045,7 @@ mapAliases {
|
||||
mailnagWithPlugins = throw "mailnagWithPlugins has been removed because mailnag has been marked as broken since 2022."; # Added 2025-10-12
|
||||
makeOverridable = warnAlias "'makeOverridable' has been removed from pkgs, use `lib.makeOverridable` instead" lib.makeOverridable; # Added 2025-10-30
|
||||
manaplus = throw "manaplus has been removed, as it was broken"; # Added 2025-08-25
|
||||
manrope = throw "'manrope' has been removed because its source has been pulled"; # Added 2025-12-20
|
||||
mariadb-client = throw "mariadb-client has been renamed to mariadb.client"; # Converted to throw 2025-10-26
|
||||
marwaita-manjaro = throw "'marwaita-manjaro' has been renamed to/replaced by 'marwaita-teal'"; # Converted to throw 2025-10-27
|
||||
marwaita-peppermint = throw "'marwaita-peppermint' has been renamed to/replaced by 'marwaita-red'"; # Converted to throw 2025-10-27
|
||||
|
||||
@@ -4228,24 +4228,6 @@ with pkgs;
|
||||
|
||||
inherit (coqPackages_9_0) compcert;
|
||||
|
||||
computecpp = wrapCCWith rec {
|
||||
cc = computecpp-unwrapped;
|
||||
extraPackages = [
|
||||
llvmPackages.compiler-rt
|
||||
];
|
||||
extraBuildCommands = ''
|
||||
wrap compute $wrapper $ccPath/compute
|
||||
wrap compute++ $wrapper $ccPath/compute++
|
||||
export named_cc=compute
|
||||
export named_cxx=compute++
|
||||
|
||||
rsrc="$out/resource-root"
|
||||
mkdir -p "$rsrc/lib"
|
||||
ln -s "${cc}/lib" "$rsrc/include"
|
||||
echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
|
||||
'';
|
||||
};
|
||||
|
||||
corretto11 = javaPackages.compiler.corretto11;
|
||||
corretto17 = javaPackages.compiler.corretto17;
|
||||
corretto21 = javaPackages.compiler.corretto21;
|
||||
|
||||
@@ -13023,6 +13023,8 @@ self: super: with self; {
|
||||
|
||||
pycairo = callPackage ../development/python-modules/pycairo { inherit (pkgs.buildPackages) meson; };
|
||||
|
||||
pycambia = callPackage ../development/python-modules/pycambia { };
|
||||
|
||||
pycangjie = callPackage ../development/python-modules/pycangjie {
|
||||
inherit (pkgs.buildPackages) meson;
|
||||
};
|
||||
@@ -14118,6 +14120,8 @@ self: super: with self; {
|
||||
|
||||
pyoxigraph = callPackage ../development/python-modules/pyoxigraph { };
|
||||
|
||||
pyoxipng = callPackage ../development/python-modules/pyoxipng { };
|
||||
|
||||
pypager = callPackage ../development/python-modules/pypager { };
|
||||
|
||||
pypalazzetti = callPackage ../development/python-modules/pypalazzetti { };
|
||||
|
||||
@@ -114,6 +114,7 @@ let
|
||||
|
||||
cygwinCommon = {
|
||||
hello = nativePlatforms;
|
||||
nixVersions.git = nativePlatforms;
|
||||
};
|
||||
|
||||
wasiCommon = {
|
||||
|
||||
Reference in New Issue
Block a user