Merge remote-tracking branch 'origin/master' into staging-next

This commit is contained in:
Grimmauld
2025-11-04 13:54:45 +01:00
73 changed files with 794 additions and 368 deletions
+2 -2
View File
@@ -430,7 +430,7 @@ gitGraph
Here's an overview of the different branches:
| branch | `master` | `staging-next` | `staging` | [`staging-nixos`](#test-driver-rebuild) |
| branch | `master` | `staging-next` | `staging` | [`staging-nixos`][test-driver-rebuild] |
| --- | --- | --- | --- | --- |
| Used for development | ✔️ | ❌ | ✔️ | ✔️ |
| Built by Hydra | ✔️ | ✔️ | ❌ | ❌ |
@@ -501,7 +501,7 @@ Please note that changes to the Linux kernel are an exception to this rule.
These PRs go to `staging-nixos`, see [the next section for more context](#changes-rebuilding-all-tests).
### Changes rebuilding all NixOS tests
[test-driver-rebuild]: #changes-rebuilding-all-tests
[test-driver-rebuild]: #changes-rebuilding-all-nixos-tests
Changes causing a rebuild of all NixOS tests get a special [`10.rebuild-nixos-tests`](https://github.com/NixOS/nixpkgs/issues?q=state%3Aopen%20label%3A10.rebuild-nixos-tests) label.
These changes pose a significant impact on the build infrastructure.
+6 -6
View File
@@ -12915,6 +12915,12 @@
github = "jthulhu";
githubId = 23179762;
};
jtliang24 = {
name = "Jiatao Liang";
email = "jtliang24@gmail.com";
github = "jtliang24";
githubId = 170479425;
};
jtobin = {
email = "jared@jtobin.io";
github = "jtobin";
@@ -25844,12 +25850,6 @@
github = "thegu5";
githubId = 58223632;
};
thehans255 = {
name = "Hans Jorgensen";
email = "foss-contact@thehans255.com";
github = "thehans255";
githubId = 15896573;
};
thekostins = {
name = "Konstantin";
email = "anisimovkosta19@gmail.com";
+14 -2
View File
@@ -3,6 +3,7 @@
lib,
options,
pkgs,
utils,
...
}:
@@ -1297,6 +1298,15 @@ in
'';
};
extraArgs = mkOption {
type = types.listOf types.str;
default = [ ];
example = [ "--no-secrets-in-config" ];
description = ''
Extra command lines argument that are passed to synapse and workers.
'';
};
extraConfigFiles = mkOption {
type = types.listOf types.path;
default = [ ];
@@ -1541,7 +1551,8 @@ in
]
++ cfg.extraConfigFiles
)}
--keys-directory ${cfg.dataDir}
--keys-directory ${cfg.dataDir} \
${utils.escapeSystemdExecArgs cfg.extraArgs}
'';
};
}
@@ -1574,7 +1585,8 @@ in
${concatMapStringsSep "\n " (x: "--config-path ${x} \\") (
[ configFile ] ++ cfg.extraConfigFiles
)}
--keys-directory ${cfg.dataDir}
--keys-directory ${cfg.dataDir} \
${utils.escapeSystemdExecArgs cfg.extraArgs}
'';
};
}
@@ -12,12 +12,12 @@
pkgs,
}:
let
version = "0.0.27-unstable-2025-10-22";
version = "0.0.27-unstable-2025-10-31";
src = fetchFromGitHub {
owner = "yetone";
repo = "avante.nvim";
rev = "164a86db6e5da78bc42310691a26b22d0763ceca";
hash = "sha256-hNKkb0PdKPC2m1a0stgCkAxk2P4uL8WiqiGpOY79Efo=";
rev = "7f48770e66684e9a7d4d5b9c47505a23e0167a6e";
hash = "sha256-U8RnTBGW+dR26JATQ10JbM8R03qX/ovPjvelHw2J7fc=";
};
avante-nvim-lib = rustPlatform.buildRustPackage {
pname = "avante-nvim-lib";
@@ -27,11 +27,11 @@
"vendorHash": null
},
"aiven_aiven": {
"hash": "sha256-WRG+mbvwP95jwW/lMHiTp6WPzk0dYqYLdcz3CXGjcFY=",
"hash": "sha256-+51Roeyn0+vNo3dCLMD8kyiOXf6ATVAQlEZ4O7B7zCw=",
"homepage": "https://registry.terraform.io/providers/aiven/aiven",
"owner": "aiven",
"repo": "terraform-provider-aiven",
"rev": "v4.46.0",
"rev": "v4.46.1",
"spdx": "MIT",
"vendorHash": "sha256-8cChWCS8yV69djpoeElLgaorpbHY2Jg04WKY3e+pvsg="
},
@@ -570,22 +570,22 @@
"vendorHash": "sha256-kSFeWcuoym3FJP/E/diWuafEv1sffYinAzCjZ6z7B84="
},
"hashicorp_google-beta": {
"hash": "sha256-ejjyVzNQY8w1kvZyvuIMGSDhu5jea1/6TFiIG5bvrSw=",
"hash": "sha256-j8CDyKV43rmxA6wyF1luO95AJCY5jpz9suUVLKWUVQo=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
"owner": "hashicorp",
"repo": "terraform-provider-google-beta",
"rev": "v7.8.0",
"rev": "v7.9.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-tc7PInjXPEAI/sYtrYZsQxQV3Gk04ov/4SBQ1fHqkIQ="
},
"hashicorp_helm": {
"hash": "sha256-i4ceWiEXJYL1x9DmqAfcUidiW5+x/sRCxevDz4MnzHs=",
"hash": "sha256-XU5AxXYvZtHnxGotOvGOojybcusVX9DRK2sazfytkAw=",
"homepage": "https://registry.terraform.io/providers/hashicorp/helm",
"owner": "hashicorp",
"repo": "terraform-provider-helm",
"rev": "v3.0.2",
"rev": "v3.1.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-sPvX69R2BmlY/KhXZgxCunzseoOkz1h2b8yqekBBn0k="
"vendorHash": "sha256-qzwm0R51jvElo+T8ypkHrlQy/MH8c/o+NWIS+YrQ4uw="
},
"hashicorp_http": {
"hash": "sha256-IXqKZ9RQP0kZVxc9OfaWglF8GeycSAl5DATdqc8n35g=",
+3 -3
View File
@@ -82,13 +82,13 @@ let
in
stdenv.mkDerivation {
pname = "ansel";
version = "0-unstable-2025-10-23";
version = "0-unstable-2025-10-25";
src = fetchFromGitHub {
owner = "aurelienpierreeng";
repo = "ansel";
rev = "9658941ac8e644f0bdc96700a59f822cccf8f44b";
hash = "sha256-fQnWSIRH7pJglBBpafwKy40J91RivTH7TTQIyQCiuow=";
rev = "0b268719d9a83c2296b5ce9fcc02bec9ad0f83f9";
hash = "sha256-LEVXZ9VUMAqDG39Kaew+JYedEqdlfxb5RdyG1X8PVpI=";
fetchSubmodules = true;
};
@@ -0,0 +1,35 @@
{
appimageTools,
stdenv,
fetchurl,
lib,
}:
let
pname = "artix-games-launcher";
version = "2.20";
src = fetchurl {
url = "https://web.archive.org/web/20250924101414/https://launch.artix.com/latest/Artix_Games_Launcher-x86_64.AppImage";
hash = "sha256-8eVXOm5g92wErWa6lbTXrCL04MWYlObjonHJk+oUI3E=";
};
appimageContents = appimageTools.extract {
inherit pname version src;
};
in
appimageTools.wrapType2 {
inherit pname version src;
extraInstallCommands = ''
mkdir -p $out/share/applications
install -m 444 -D ${appimageContents}/ArtixGamesLauncher.desktop $out/share/applications/ArtixGamesLauncher.desktop
install -m 444 -D ${appimageContents}/ArtixLogo.png $out/share/icons/ArtixLogo.png
'';
meta = {
description = "Launcher for games by Artix Entertainment";
homepage = "https://www.artix.com/downloads/artixlauncher";
license = lib.licenses.unfree;
mainProgram = "artix-game-launcher";
maintainers = with lib.maintainers; [ jtliang24 ];
platforms = [ "x86_64-linux" ];
};
}
@@ -7,13 +7,13 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "bash-pinyin-completion-rs";
version = "1.0.0";
version = "1.0.1";
src = fetchFromGitHub {
owner = "AOSC-Dev";
repo = "bash-pinyin-completion-rs";
tag = "v${finalAttrs.version}";
hash = "sha256-VXIIG+ZGb4fS3LSIkGW744ui4AKTdQCjrNlObH/YZVY=";
hash = "sha256-XmxJYzDnA/7v/U3fFzNd2BQu43q6zYGSk/tJ0I6aKBo=";
};
strictDeps = true;
+5
View File
@@ -120,6 +120,11 @@ python.pkgs.buildPythonApplication rec {
"test_get_keys_dir"
"test_get_security_dir"
"test_get_config_dir"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# Tests create files with append-only flags that cause cleanup issues on macOS
"test_extract_restores_append_flag"
"test_file_status_excluded"
];
preCheck = ''
+2 -2
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "c-periphery";
version = "2.4.3";
version = "2.5.0";
src = fetchFromGitHub {
owner = "vsergeev";
repo = "c-periphery";
tag = "v${finalAttrs.version}";
hash = "sha256-azqGw7KW6/UrQ4eUPkeH8d6l6sSbotNMAAbn5pNMOB8=";
hash = "sha256-lGBDf10kolwPrURwUEtiSCJYdyxZqJN/B1SnY08Ytns=";
};
outputs = [
+88
View File
@@ -0,0 +1,88 @@
{
lib,
stdenvNoCC,
fetchFromGitHub,
patsh,
bashNonInteractive,
pkg-config,
gcc,
gsl,
targetPackages,
cc ? targetPackages.stdenv.cc,
nix-update-script,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "c99sh";
version = "1.1.1";
src = fetchFromGitHub {
owner = "RhysU";
repo = "c99sh";
tag = "v${finalAttrs.version}";
hash = "sha256-nLq6J1PRROTOSvScyyXUqwtj10MEfQCHC8YYNd+JxkA=";
};
strictDeps = true;
nativeBuildInputs = [ patsh ];
# Used by `patsh`
buildInputs = [
bashNonInteractive
pkg-config
];
postPatch = ''
patsh c99sh \
--force --store-dir ${builtins.storeDir} --path "$HOST_PATH"
patchShebangs .
substituteInPlace c99sh \
--replace-fail -cc -${lib.getExe' cc "cc"} \
--replace-fail -c++ -${lib.getExe' cc "c++"}
'';
# FIXME: `patchShebangs` doesn't function in cross-builds
doCheck = !stdenvNoCC.hostPlatform.isDarwin;
nativeCheckInputs = [
pkg-config
gcc
];
checkInputs = [ gsl ];
checkPhase = ''
runHook preCheck
./tests
runHook postCheck
'';
installPhase = ''
runHook preInstall
mkdir --parents $out/bin
cp --no-dereference c*sh $out/bin # c11sh and cxxsh
runHook postInstall
'';
passthru.updateScript = nix-update-script { };
meta = {
description = "Shebang-friendly script for \"interpreting\" C files";
longDescription = ''
Shebang-friendly script for \"interpreting\" single C99, C11,
and C++ files, including rcfile support
'';
homepage = "https://github.com/RhysU/c99sh";
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [ yiyu ];
mainProgram = "c99sh";
platforms = lib.platforms.all;
};
})
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "@anthropic-ai/claude-code",
"version": "2.0.31",
"version": "2.0.32",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@anthropic-ai/claude-code",
"version": "2.0.31",
"version": "2.0.32",
"license": "SEE LICENSE IN README.md",
"bin": {
"claude": "cli.js"
+3 -3
View File
@@ -7,14 +7,14 @@
}:
buildNpmPackage (finalAttrs: {
pname = "claude-code";
version = "2.0.31";
version = "2.0.32";
src = fetchzip {
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
hash = "sha256-KQRc9h2DG1bwWvMR1EnMWi9qygPF0Fsr97+TyKef3NI=";
hash = "sha256-w8auh/tivUF4ZxbZ5BRJcym0wPYDaYhCP33mHbjPo/c=";
};
npmDepsHash = "sha256-lv596UikbuAuiJ1Wl5xMJvSNITfGOnDvI1dLtaJagCY=";
npmDepsHash = "sha256-Nw/TnZ7ZaxXaQolT/e7XuF1c41E848TW3n+1Y+U9Be8=";
postPatch = ''
cp ${./package-lock.json} package-lock.json
+3 -3
View File
@@ -6,18 +6,18 @@
buildGoModule rec {
pname = "cnspec";
version = "12.7.0";
version = "12.7.1";
src = fetchFromGitHub {
owner = "mondoohq";
repo = "cnspec";
tag = "v${version}";
hash = "sha256-IQ+DwgWEVrMnkgAgHjFg/NDn2mkHggnlT3xgbSvN/pU=";
hash = "sha256-IriF6vr2Kw7h44zFd7hMhybseqtlYepjfQl+Z54fdbQ=";
};
proxyVendor = true;
vendorHash = "sha256-0VoGgBBgloUG6NppX1muNqAyZdzyrc9Tcs3wNaLRdVY=";
vendorHash = "sha256-P0spAsBp3jv0Nn4gVYTd+5WbWQgGZ83fyzxT3i0ncHs=";
subPackages = [ "apps/cnspec" ];
@@ -0,0 +1,10 @@
{
lib,
cocoapods,
}:
lib.lowPrio (
cocoapods.override {
beta = true;
}
)
+36
View File
@@ -0,0 +1,36 @@
{
lib,
buildGoModule,
fetchFromGitHub,
nix-update-script,
}:
buildGoModule (finalAttrs: {
pname = "cocoon";
version = "0.5.0";
src = fetchFromGitHub {
owner = "haileyok";
repo = "cocoon";
tag = finalAttrs.version;
hash = "sha256-9gJj+edTGkQsHH72F2f7A6EWDet+k38+8UZ1KN2UGT0=";
};
ldflags = [
"-s"
"-w"
"-X main.Version=${finalAttrs.version}"
];
vendorHash = "sha256-5WnME+AVrXfvHX2yPbFoL6QgZoCMAJmBj47OM7miOfc=";
passthru.updateScript = nix-update-script { };
meta = {
description = "ATProtocol Personal Data Server written in Go with a SQLite block and blob store";
changelog = "https://github.com/haileyok/cocoon/releases/${finalAttrs.version}";
homepage = "https://github.com/haileyok/cocoon";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ isabelroses ];
mainProgram = "cocoon";
};
})
+2 -4
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "coin";
version = "4.0.5";
version = "4.0.6";
src = fetchFromGitHub {
owner = "coin3d";
repo = "coin";
rev = "v${finalAttrs.version}";
hash = "sha256-2lfy33Qx0AjKDfwwRn7hjaz7mPQsr7MRB9v75qshGjM=";
hash = "sha256-XBkb8CbfAXBwOO9JkExpsy8HxtbZo3/fnU6cReuSETI=";
};
nativeBuildInputs = [ cmake ];
@@ -29,8 +29,6 @@ stdenv.mkDerivation (finalAttrs: {
]
++ lib.optional stdenv.hostPlatform.isLinux libX11;
cmakeFlags = [ "-DCOIN_USE_CPACK=OFF" ];
meta = with lib; {
homepage = "https://github.com/coin3d/coin";
description = "High-level, retained-mode toolkit for effective 3D graphics development";
+2 -2
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "cpufetch";
version = "1.06";
version = "1.07";
src = fetchFromGitHub {
owner = "Dr-Noob";
repo = "cpufetch";
rev = "v${version}";
sha256 = "sha256-sE3i2rw8W362BExFEImjw/t17qX8D4/0Ty8jG63bjbk=";
sha256 = "sha256-qmT7WBWKtSWGIK/dEd3/bF1bBjqSjfkP99htfnlFLCw=";
};
nativeBuildInputs = [
+5 -5
View File
@@ -8,25 +8,25 @@
let
pname = "dbgate";
version = "6.6.5";
version = "6.6.9";
src =
fetchurl
{
aarch64-linux = {
url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_arm64.AppImage";
hash = "sha256-DIlFERRnNdh6VzApYNDoiUb78lESfE2RTgmEsffJ5EI=";
hash = "sha256-RS7fFP1ek59VvUv8Q7kjHSVUlH3r+ir3csotWHvyXaM=";
};
x86_64-linux = {
url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_x86_64.AppImage";
hash = "sha256-xn6KhD08K57T9kWy7AHvIar22zGXV+6/geK3dGIxKhk=";
hash = "sha256-S+OSTa0g8//ORhRrsfrdRcIkk8EavTKjw4sYOdGXvfE=";
};
x86_64-darwin = {
url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_x64.dmg";
hash = "sha256-ycThFJ+f6NOWI97KyqgMES2Y2ZZ1aBkggBe6Z50Vhjs=";
hash = "sha256-qu2We2ejeRP51DcG8CsMQ2GpfZZoA073dNUaBcStI90=";
};
aarch64-darwin = {
url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_universal.dmg";
hash = "sha256-bE16GScBk9a32k49P9WuT4fymscdY2AyP9k29UsN8HY=";
hash = "sha256-fW2Cz2u9LM2KMhGjbhq7EI0Oc8ACkTxddE2hOxR8TNU=";
};
}
.${stdenv.hostPlatform.system} or (throw "dbgate: ${stdenv.hostPlatform.system} is unsupported.");
+11
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
cmake,
ncurses,
zlib,
@@ -18,6 +19,16 @@ stdenv.mkDerivation rec {
sha256 = "sha256-2y1ncPg9OKxqImBN5O5kXrTsuwZ/Cg/8exS7lWyZY1c=";
};
patches = [
# cmake-4 support:
# https://github.com/baruch/diskscan/pull/77
(fetchpatch {
name = "cmake-4.patch";
url = "https://github.com/baruch/diskscan/commit/6e342469dcab32be7a33109a4d394141d5c905b5.patch";
hash = "sha256-05ctYPmGWTJRUc4aN35fvb0ITwIZlQdIweH7tSQ0RjA=";
})
];
buildInputs = [
ncurses
zlib
+74 -167
View File
@@ -1,187 +1,94 @@
{
stdenv,
cmake,
fetchFromGitHub,
fetchpatch,
lib,
alsa-lib,
libGL,
libX11,
libXinerama,
libXi,
zlib,
rtaudio,
rapidjson,
ilmbase,
glm,
glfw3,
libpng,
opencolorio_1,
stdenv,
fetchFromGitHub,
cmake,
pkg-config,
bzip2,
feather-tk,
ffmpeg,
freetype,
glfw,
imath,
libGL,
libjpeg,
libtiff,
libpng,
lunasvg,
minizip-ng,
nativefiledialog-extended,
nlohmann_json,
opencolorio,
openexr,
openssl,
opentimelineio,
plutovg,
SDL2,
tlrender,
xz,
zlib,
zstd,
}:
let
stdenv.mkDerivation (finalAttrs: {
pname = "djv";
version = "3.1.1";
# The way third-party dependencies are packaged has changed
# significantly from the 2.0.8 release. This means any packaging
# effort for the 2.0.8 release would have to be redone for the next
# release. Hence we package the git version for now and can easily
# jump onto the next release once it's available.
djvVersion = "2.0.8-unstable-2021-07-31";
djvSrc = fetchFromGitHub {
src = fetchFromGitHub {
owner = "darbyjohnston";
repo = "djv";
rev = "ae31712c4f2802a874217ac194bde26287993934";
sha256 = "1qgia6vqb6fhyfj8w925xl6k6zidrp2gj5f32bpi94lwwhi6p9pd";
tag = finalAttrs.version;
hash = "sha256-/SakJ23mi/dz8eUt2UtcgfLtFZiCHy1ME+jWdNS8+Fw=";
};
# DJV's build system tries to automatically pull in FSeq, another
# library by the DJV author.
#
# When updating, check the following file in the DJV source:
# etc/SuperBuild/cmake/Modules/BuildFSeq.cmake
#
# If there is revision or tag specified, DJV wants to use the most
# recent master version
fseqSrc = fetchFromGitHub {
owner = "darbyjohnston";
repo = "fseq";
rev = "545fac6018100f7fca474b8ee4f1efa7cbf6bf45";
sha256 = "0qfhbrzji05hh5kwgd1wvq2lbf81ylbi7v7aqk28aws27f8d2hk0";
};
djv-deps = stdenv.mkDerivation rec {
pname = "djv-dependencies";
version = djvVersion;
src = djvSrc;
sourceRoot = "${src.name}/etc/SuperBuild";
nativeBuildInputs = [ cmake ];
buildInputs = [
libGL
];
postPatch = ''
chmod -R +w .
sed -i 's,GIT_REPOSITORY https://github.com/darbyjohnston/FSeq.git,SOURCE_DIR ${fseqSrc},' \
cmake/Modules/BuildFSeq.cmake
# We pull these projects in as normal Nix dependencies. No need
# to build them again here.
sed -i CMakeLists.txt \
-e '/list(APPEND DJV_THIRD_PARTY_DEPS RapidJSON)/d' \
-e '/list(APPEND DJV_THIRD_PARTY_DEPS RtAudio)/d' \
-e '/list(APPEND DJV_THIRD_PARTY_DEPS IlmBase)/d' \
-e '/list(APPEND DJV_THIRD_PARTY_DEPS GLM)/d' \
-e '/list(APPEND DJV_THIRD_PARTY_DEPS GLFW)/d' \
-e '/list(APPEND DJV_THIRD_PARTY_DEPS ZLIB)/d' \
-e '/list(APPEND DJV_THIRD_PARTY_DEPS PNG)/d' \
-e '/list(APPEND DJV_THIRD_PARTY_DEPS FreeType)/d' \
-e '/list(APPEND DJV_THIRD_PARTY_DEPS OCIO)/d'
# The "SuperBuild" wants to build DJV right here. This is
# inconvenient, because then the `make install` target is not generated
# by CMake. We build DJV in its own derivation below. This also makes
# the build a bit more modular.
sed -i '/include(BuildDJV)/d' \
CMakeLists.txt
'';
cmakeFlags = [
"-DDJV_THIRD_PARTY_OpenEXR:BOOL=False"
"-DDJV_THIRD_PARTY_JPEG:BOOL=False"
"-DDJV_THIRD_PARTY_TIFF:BOOL=False"
];
dontInstall = true;
doCheck = true;
};
in
stdenv.mkDerivation {
pname = "djv";
version = djvVersion;
src = djvSrc;
patches = [
# Pull fix ending upstream inclusion for gcc-12+ support:
# https://github.com/darbyjohnston/DJV/pull/477
(fetchpatch {
name = "gcc-13-cstdint-include.patch";
url = "https://github.com/darbyjohnston/DJV/commit/be0dd90c256f30c0305ff7b180fd932a311e66e5.patch";
hash = "sha256-x8GAfakhgjBiCKHbfgCukT5iFNad+zqURDJkQr092uk=";
})
(fetchpatch {
name = "gcc-11-limits.patch";
url = "https://github.com/darbyjohnston/DJV/commit/0544ffa1a263a6b8e8518b47277de7601b21b4f4.patch";
hash = "sha256-x6ye0xMwTlKyNW4cVFb64RvAayvo71kuOooPj3ROn0g=";
})
(fetchpatch {
name = "gcc-11-IO.patch";
url = "https://github.com/darbyjohnston/DJV/commit/ce79f2d2cb35d03322648323858834bff942c792.patch";
hash = "sha256-oPbXOnN5Y5QL+bs/bL5eJALu45YHnyTBLQcC8XcJi0c=";
})
(fetchpatch {
name = "gcc-11-sleep_for.patch";
url = "https://github.com/darbyjohnston/DJV/commit/6989f43db27f66a7691f6048a2eb3299ef43a92e.patch";
hash = "sha256-1kiF3VrZiO+FSoR7NHCbduQ8tMq/Uuu6Z+sQII4xBAw=";
})
];
nativeBuildInputs = [ cmake ];
buildInputs = [
alsa-lib
libGL
libX11
libXinerama
libXi
rapidjson
rtaudio
ilmbase
glm
glfw3
zlib
libpng
freetype
opencolorio_1
djv-deps
openexr
];
postPatch = ''
chmod -R +w .
# When linking opencolorio statically this results in failing to
# pull in opencolorio's dependencies (tixml and yaml libraries). Avoid
# this by linking it statically instead.
sed -i cmake/Modules/FindOCIO.cmake \
-e 's/PATH_SUFFIXES static//' \
-e '/OpenColorIO_STATIC/d'
# When searching for OpenEXR this looks for Iex.h, which exists in ilmbase,
# since it's a secondary inport, to find the correct OpenEXR lib, we search
# for something specifically in OpenEXR.
sed -i cmake/Modules/FindOpenEXR.cmake \
-e 's/find_path(OpenEXR_INCLUDE_DIR NAMES Iex.h PATH_SUFFIXES OpenEXR)/find_path(OpenEXR_INCLUDE_DIR NAMES ImfImage.h PATH_SUFFIXES OpenEXR)/'
substituteInPlace cmake/Modules/djvPackage.cmake \
--replace-fail \
' ''${CMAKE_INSTALL_PREFIX}/etc/tlRender/LICENSE_' \
" ${tlrender}/etc/tlRender/LICENSE_"
'';
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
bzip2
feather-tk
ffmpeg
freetype
glfw
imath
tlrender
libjpeg
libGL
libpng
libtiff
lunasvg
minizip-ng
nativefiledialog-extended
nlohmann_json
opencolorio
openexr
openssl
opentimelineio
plutovg
SDL2
xz
zlib
zstd
];
# GLFW requires a working X11 session.
doCheck = false;
meta = with lib; {
meta = {
description = "Professional review software for VFX, animation, and film production";
homepage = "https://darbyjohnston.github.io/DJV/";
platforms = platforms.linux;
maintainers = [ maintainers.blitz ];
license = licenses.bsd3;
platforms = with lib.platforms; linux ++ darwin;
maintainers = with lib.maintainers; [ blitz ];
license = lib.licenses.bsd3;
mainProgram = "djv";
};
}
})
+10 -5
View File
@@ -11,16 +11,17 @@
libGL,
libpng,
lunasvg,
nativefiledialog-extended,
nlohmann_json,
plutovg,
xorg,
zlib,
nativeFileDialog ? null,
python3Packages ? null,
enableNFD ? false,
enableNFD ? true,
enablePython ? false,
enableTests ? false,
enableExamples ? false,
enableShared ? !stdenv.hostPlatform.isStatic,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -31,7 +32,6 @@ stdenv.mkDerivation (finalAttrs: {
owner = "darbyjohnston";
repo = "feather-tk";
tag = finalAttrs.version;
fetchSubmodules = true;
hash = "sha256-hcV99y14o3YFUtKDLEKaR7MxBB3pBdd3sferrYvtvYw=";
};
@@ -51,8 +51,8 @@ stdenv.mkDerivation (finalAttrs: {
zlib
libGL
]
++ lib.optionals (enableNFD && nativeFileDialog != null) [
nativeFileDialog
++ lib.optionals enableNFD [
nativefiledialog-extended
]
++ lib.optionals (enableNFD && stdenv.isLinux) [
gtk3
@@ -63,6 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
cmakeFlags = [
(lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release")
(lib.cmakeBool "BUILD_SHARED_LIBS" enableShared)
(lib.cmakeBool "feather_tk_UI_LIB" true)
(lib.cmakeFeature "feather_tk_API" "GL_4_1")
(lib.cmakeBool "feather_tk_nfd" enableNFD)
@@ -93,5 +94,9 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ liberodark ];
platforms = lib.platforms.linux ++ lib.platforms.darwin;
badPlatforms = [
# Broken on darwin with latest SDK, see https://github.com/darbyjohnston/feather-tk/issues/1
lib.systems.inspect.patterns.isDarwin
];
};
})
-7
View File
@@ -1,7 +0,0 @@
This package supports the following parameters:
- withWayland (default: true): when false, set QT_QPA_PLATFORM to xcb
- spaceNavSupport (enabled by default on Linux): whether to enable
[spacenavd support](https://spacenav.sourceforge.net/)
- ifcSupport (default: false): whether to enable ifc support through
ifcopenshell
+2 -2
View File
@@ -3,7 +3,7 @@
buildEnv,
makeWrapper,
lib,
python311,
python,
writeShellScript,
}:
let
@@ -36,7 +36,7 @@ let
if builtins.isString pyt then
pyt
else if builtins.isFunction pyt then
"${(python311.withPackages pyt)}/lib/python3.11/site-packages"
"${(python.withPackages pyt)}/${python.sitePackages}"
else
throw "Expected string or function as python paths for freecad"
);
+6 -27
View File
@@ -8,7 +8,6 @@
fetchFromGitHub,
fetchpatch,
fmt,
gfortran,
gts,
hdf5,
libGLU,
@@ -19,13 +18,11 @@
ninja,
ode,
opencascade-occt,
microsoft-gsl,
pkg-config,
python3Packages,
spaceNavSupport ? stdenv.hostPlatform.isLinux,
stdenv,
swig,
vtk,
wrapGAppsHook3,
xercesc,
yaml-cpp,
zlib,
@@ -50,9 +47,10 @@ let
pyyaml # (at least for) PyrateWorkbench
scipy
shiboken6
vtk
];
freecad-utils = callPackage ./freecad-utils.nix { };
freecad-utils = callPackage ./freecad-utils.nix { inherit (python3Packages) python; };
in
freecad-utils.makeCustomizable (
stdenv.mkDerivation (finalAttrs: {
@@ -71,10 +69,8 @@ freecad-utils.makeCustomizable (
cmake
ninja
pkg-config
gfortran
swig
doxygen
wrapGAppsHook3
qt6.wrapQtAppsHook
];
@@ -86,21 +82,21 @@ freecad-utils.makeCustomizable (
hdf5
libGLU
libXmu
libspnav
medfile
ode
vtk
xercesc
yaml-cpp
zlib
opencascade-occt
microsoft-gsl
qt6.qtbase
qt6.qtsvg
qt6.qttools
qt6.qtwayland
qt6.qtwebengine
]
++ pythonDeps
++ lib.optionals spaceNavSupport [ libspnav ];
++ pythonDeps;
patches = [
./0001-NIXOS-don-t-ignore-PYTHONPATH.patch
@@ -133,24 +129,8 @@ freecad-utils.makeCustomizable (
"-DFREECAD_USE_PYBIND11=ON"
"-DBUILD_QT5=OFF"
"-DBUILD_QT6=ON"
"-DSHIBOKEN_INCLUDE_DIR=${python3Packages.shiboken6}/include"
"-DSHIBOKEN_LIBRARY=Shiboken6::libshiboken"
(
"-DPYSIDE_INCLUDE_DIR=${python3Packages.pyside6}/include"
+ ";${python3Packages.pyside6}/include/PySide6/QtCore"
+ ";${python3Packages.pyside6}/include/PySide6/QtWidgets"
+ ";${python3Packages.pyside6}/include/PySide6/QtGui"
)
"-DPYSIDE_LIBRARY=PySide6::pyside6"
];
# This should work on both x86_64, and i686 linux
preBuild = ''
export NIX_LDFLAGS="-L${gfortran.cc.lib}/lib64 -L${gfortran.cc.lib}/lib $NIX_LDFLAGS";
'';
dontWrapGApps = true;
qtWrapperArgs =
let
binPath = lib.makeBinPath [
@@ -162,7 +142,6 @@ freecad-utils.makeCustomizable (
"--set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1"
"--prefix PATH : ${binPath}"
"--prefix PYTHONPATH : ${python3Packages.makePythonPath pythonDeps}"
"\${gappsWrapperArgs[@]}"
];
postFixup = ''
+5 -5
View File
@@ -10,26 +10,26 @@ let
systemToPlatform = {
"x86_64-linux" = {
name = "linux-amd64";
hash = "sha256-bDAhFU18dliKlKY5WQVsVSMVyF4YeTaKO9pwheMcdcg=";
hash = "sha256-WVb32g9eqoeQgvPUGOQ7r3oD+PerKYQWEh/PoZwVqkI=";
};
"aarch64-linux" = {
name = "linux-arm64";
hash = "sha256-uddWn2RxQyB9s7kx6FI/oH9L/7l/fMD/7HQXWDqvuyQ=";
hash = "sha256-nZg7u0BUIHOdu3dg28fydgm6ctr4jOOIZOA5ms3/E64=";
};
"x86_64-darwin" = {
name = "darwin-amd64";
hash = "sha256-L+lCmI1ciYInCt5aTcSVRDW0IwecGZ2BZNKrpeEE4jo=";
hash = "sha256-A+FQ7AgjqS1/7LExhyKwXlCAwCveSgeyhbCNAjqQ770=";
};
"aarch64-darwin" = {
name = "darwin-arm64";
hash = "sha256-9ldVRUhHM2OD+BaOCqVmaE+HFP5jj+hrfyB6wobjS+E=";
hash = "sha256-+Q1H9h1j1kusEu1HW3zHWQ8ReR50kwjj4kGC3g6Jzqc=";
};
};
platform = systemToPlatform.${system} or throwSystem;
in
stdenv.mkDerivation (finalAttrs: {
pname = "gh-copilot";
version = "1.1.1";
version = "1.2.0";
src = fetchurl {
name = "gh-copilot";
@@ -4,11 +4,15 @@
libX11,
libglut,
glew,
libXNVCtrl,
libXext,
linuxPackages,
lib,
}:
let
inherit (linuxPackages.nvidia_x11.settings) libXNVCtrl;
in
stdenv.mkDerivation {
pname = "gl-gsync-demo";
version = "unstable-2020-12-27";
@@ -17,7 +21,7 @@ stdenv.mkDerivation {
owner = "dahenry";
repo = "gl-gsync-demo";
rev = "4fd963a8ad880dc2d846394c8c80b2091a119591";
sha256 = "1innsmpsd9n9ih80v16rhj2ijrl28jd7x6a4jmxdirba7mjibm8d";
hash = "sha256-DdUVZT1q5dh6lUSZfppEgmYZhYTZhA0QjMmmpm/V1sY=";
};
buildInputs = [
@@ -36,10 +40,10 @@ stdenv.mkDerivation {
runHook postInstall
'';
meta = with lib; {
license = with licenses; mit;
platforms = platforms.linux;
maintainers = with maintainers; [ atemu ];
meta = {
license = lib.licenses.mit;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ atemu ];
description = "Very basic OpenGL demo for testing NVIDIA's G-SYNC technology on Linux";
mainProgram = "gl-gsync-demo";
longDescription = ''
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "jack-link";
version = "0.2.4";
version = "0.2.5";
src = fetchFromGitHub {
owner = "rncbc";
repo = "jack_link";
tag = "v${finalAttrs.version}";
hash = "sha256-bIB3lxKKaI8DLtmnkRTTHXDopCZ3FAv15cAYcyJcBYA=";
hash = "sha256-UYyVGc9/NOLzFD/31zB9lhUJW8G/PGt7VkSBjntpymw=";
fetchSubmodules = true;
};
+10 -14
View File
@@ -4,10 +4,10 @@
lib,
versionCheckHook,
writeShellScript,
lua,
cmake,
}:
let
version = "0.7.1";
version = "0.8.0";
in
rustPlatform.buildRustPackage {
pname = "lovely-injector";
@@ -16,26 +16,22 @@ rustPlatform.buildRustPackage {
owner = "ethangreen-dev";
repo = "lovely-injector";
tag = "v${version}";
hash = "sha256-j03/DOnLFfFYTwGGh+7BalS779jyg+p0UqtcTTyHgv4=";
hash = "sha256-leTe7j4RTqc6BkiS7W5e0viK8FEwJpPLNoyf4GLOI3E=";
fetchSubmodules = true;
};
cargoHash = "sha256-hHq26kSKcqEldxUb6bn1laTpKGFplP9/2uogsal8T5A=";
cargoHash = "sha256-MnXB2ho48VPYtFSnGHGkuSv1eprOhmj4wMG2YmFSGec=";
cargoBuildFlags = [
"--package"
"lovely-unix"
];
# no tests
doCheck = false;
# lovely-injector depends on nightly rust features
env.RUSTC_BOOTSTRAP = 1;
nativeBuildInputs = [
lua
cmake
];
nativeInstallCheckInputs = [
versionCheckHook
];
doInstallCheck = true;
versionCheckProgramArg = [ "${placeholder "out"}" ];
versionCheckProgram = writeShellScript "lovely-version-check" ''
export LD_PRELOAD="$1/lib/liblovely.so"
exec ${lua}/bin/lua < /dev/null
'';
meta = {
description = "Runtime lua injector for games built with LÖVE";
+7 -8
View File
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
yarnOfflineCache = fetchYarnDeps {
yarnLock = "${src}/frontend/yarn.lock";
hash = "sha256-e+3LCoOzfjSG4CjzOLXTcXGkmzNwFTLCrN0l5odOBMs=";
hash = "sha256-vw7OtXRrASOac4J5j6X/U2kxZa9I9thecUUl6XOYz5w=";
};
nativeBuildInputs = [
@@ -28,6 +28,7 @@ stdenv.mkDerivation {
nodejs
(yarn.override { inherit nodejs; })
writableTmpDirAsHomeHook
dart-sass
];
configurePhase = ''
@@ -37,11 +38,11 @@ stdenv.mkDerivation {
yarn config --offline set yarn-offline-mirror "$yarnOfflineCache"
fixup-yarn-lock yarn.lock
yarn install --frozen-lockfile --offline --no-progress --non-interactive
patchShebangs node_modules/
yarn install --frozen-lockfile --offline --no-progress --non-interactive --ignore-scripts
patchShebangs node_modules
mkdir -p node_modules/sass-embedded/dist/lib/src/vendor/dart-sass
ln -s ${dart-sass}/bin/dart-sass node_modules/sass-embedded/dist/lib/src/vendor/dart-sass/sass
substituteInPlace node_modules/sass-embedded/dist/lib/src/compiler-path.js \
--replace-fail 'compilerCommand = (() => {' 'compilerCommand = (() => { return ["dart-sass"];'
runHook postConfigure
'';
@@ -50,9 +51,7 @@ stdenv.mkDerivation {
runHook preBuild
export NUXT_TELEMETRY_DISABLED=1
yarn --offline build
yarn --offline generate
yarn --offline generate --env production
runHook postBuild
'';
+2 -2
View File
@@ -11,12 +11,12 @@
}:
let
version = "3.2.1";
version = "3.3.2";
src = fetchFromGitHub {
owner = "mealie-recipes";
repo = "mealie";
tag = "v${version}";
hash = "sha256-LIWubw+iO17giSvGCl5LzI429725sisp5u4Z4usJOGA=";
hash = "sha256-iaddAIsrUH6g4KXuSTIulNVWOfy/IWg0Czs9JgDxXUk=";
};
frontend = callPackage (import ./mealie-frontend.nix src version) { };
+2 -2
View File
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "moosefs";
version = "4.58.1";
version = "4.58.2";
src = fetchFromGitHub {
owner = "moosefs";
repo = "moosefs";
rev = "v${version}";
sha256 = "sha256-l3tF3y41nRy5AB/+9p/XJK5NKmPlod9td2n0RSRnYAQ=";
sha256 = "sha256-eywJ7MmCrwxqlbTDYEEPs6ego9Ivn+ziXCBNhcDfcmY=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -13,13 +13,13 @@ assert blas.isILP64 == lapack.isILP64;
stdenv.mkDerivation rec {
pname = "mopac";
version = "23.2.1";
version = "23.2.2";
src = fetchFromGitHub {
owner = "openmopac";
repo = "mopac";
rev = "v${version}";
hash = "sha256-2+6mIxawYOqgsKRWDBLXMhP53VJTTGFN4AKunq4YD4o=";
hash = "sha256-VBbW0N67ZbTymYfLrT625rkWeeYbFrEdTxPOCanFT0c=";
};
nativeBuildInputs = [
@@ -0,0 +1,75 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
pkg-config,
SDL2,
SDL2_ttf,
gtk3,
testers,
enableShared ? !stdenv.hostPlatform.isStatic,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "nativefiledialog-extended";
version = "1.2.1";
src = fetchFromGitHub {
owner = "btzy";
repo = "nativefiledialog-extended";
tag = "v${finalAttrs.version}";
hash = "sha256-GwT42lMZAAKSJpUJE6MYOpSLKUD5o9nSe9lcsoeXgJY=";
};
outputs = [
"out"
"dev"
];
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
SDL2
SDL2_ttf
]
++ lib.optionals stdenv.hostPlatform.isLinux [
gtk3
];
cmakeFlags = [
(lib.cmakeBool "BUILD_SHARED_LIBS" enableShared)
(lib.cmakeBool "nfd_ROOT_PROJECT" true)
(lib.cmakeBool "NFD_BUILD_TESTS" true)
(lib.cmakeBool "NFD_BUILD_SDL2_TESTS" true)
(lib.cmakeBool "NFD_INSTALL" true)
];
# NOTE: Although the tests have been compiled, they still require GUI
# interactions. Let's disable running them for now.
doCheck = false;
passthru.tests = {
cmake-config = testers.hasCmakeConfigModules {
package = finalAttrs.finalPackage;
moduleNames = [ "nfd" ];
};
};
meta = {
homepage = "https://github.com/btzy/nativefiledialog-extended";
description = "Cross platform native file dialog library with C and C++ bindings";
longDescription = ''
A small C library with that portably invokes native file open, folder
select and file save dialogs. Write dialog code once and have it pop up
native dialogs on all supported platforms. Avoid linking large
dependencies like wxWidgets and Qt.
'';
license = lib.licenses.zlib;
maintainers = with lib.maintainers; [ yzx9 ];
platforms = with lib.platforms; linux ++ darwin;
};
})
@@ -25,13 +25,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "nextcloud-talk-desktop";
version = "2.0.2";
version = "2.0.3";
# Building from source would require building also building Server and Talk components
# See https://github.com/nextcloud/talk-desktop?tab=readme-ov-file#%EF%B8%8F-prerequisites
src = fetchzip {
url = "https://github.com/nextcloud-releases/talk-desktop/releases/download/v${finalAttrs.version}/Nextcloud.Talk-linux-x64.zip";
hash = "sha256-r/1YTGBv6fqd95TIRqLLssk30KeWkHlMY51cp7YQp9o=";
hash = "sha256-QKbg5vHLuxLpngrHom/odWw9RK43jhZsEg7Df5c7db0=";
stripRoot = false;
};
+2 -2
View File
@@ -20,13 +20,13 @@
stdenvNoCC.mkDerivation rec {
pname = "noto-fonts${suffix}";
version = "2025.10.01";
version = "2025.11.01";
src = fetchFromGitHub {
owner = "notofonts";
repo = "notofonts.github.io";
rev = "noto-monthly-release-${version}";
hash = "sha256-SIF6G84sUvFSVatmZdF1zQve3pOYtlawJIXYFSW2srI=";
hash = "sha256-T7F8SUCbEEuJfgUYWk+/lDGuXn/df2DaGc+3hCuYhS0=";
};
outputs = [
+6 -5
View File
@@ -13,7 +13,7 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "opencode";
version = "1.0.10";
version = "1.0.20";
src =
finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system}
@@ -29,6 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
dontConfigure = true;
dontBuild = true;
dontStrip = true;
installPhase = ''
runHook preInstall
@@ -42,19 +43,19 @@ stdenvNoCC.mkDerivation (finalAttrs: {
sources = {
"aarch64-darwin" = fetchurl {
url = "https://github.com/sst/opencode/releases/download/v${finalAttrs.version}/opencode-darwin-arm64.zip";
hash = "sha256-D34OcJgIXVkqDOf5Vyce30v5/avDKKYbOAcMWD8HmXM=";
hash = "sha256-F4LHy3jtseebBx3bRZy+YM8J18M63QXdHbp7LcuZ9Wg=";
};
"aarch64-linux" = fetchurl {
url = "https://github.com/sst/opencode/releases/download/v${finalAttrs.version}/opencode-linux-arm64.zip";
hash = "sha256-v3j0oL2WL4DezOxdEKgOq4f8BkdR01zlYHUzbUUjgtE=";
hash = "sha256-pL5NtpeNFz0iBmbTSWYFYdcvHrPWEGpjEo0uF41UkTo=";
};
"x86_64-darwin" = fetchurl {
url = "https://github.com/sst/opencode/releases/download/v${finalAttrs.version}/opencode-darwin-x64.zip";
hash = "sha256-+kycX2mbCy7p6VOKO9HequCoJi/5nT8Pf09obZEuj1E=";
hash = "sha256-ah/tzVobv/IgIOajU5onSoSmm/cfzS+b7rLirRCB5Tk=";
};
"x86_64-linux" = fetchurl {
url = "https://github.com/sst/opencode/releases/download/v${finalAttrs.version}/opencode-linux-x64.zip";
hash = "sha256-MO8IeCnrTUyNroY7T7XY4WCXP8wgI3r4PxhfGwprh9I=";
hash = "sha256-4DIcSzKSGAWt52m6LmOJhYCDhztVhRE6Ui/Fqs1CcO4=";
};
};
tests.version = testers.testVersion {
@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "plasma-panel-spacer-extended";
version = "1.11.2";
version = "1.11.3";
src = fetchFromGitHub {
owner = "luisbocanegra";
repo = "plasma-panel-spacer-extended";
tag = "v${finalAttrs.version}";
hash = "sha256-sSor6ZjYgjVzrC0leqpj+GZuj8ybpPb4lcBPhcXG+Nc=";
hash = "sha256-FJbRKL/jALKxS97uVftyKwjSUhADtHv/hgOJA5VvGNQ=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "probe-rs-tools";
version = "0.29.1";
version = "0.30.0";
src = fetchFromGitHub {
owner = "probe-rs";
repo = "probe-rs";
tag = "v${version}";
hash = "sha256-/gP9abygktYSzg/054o1PEcQywiPFTtKNdUdI3hCYyc=";
hash = "sha256-3tVCsMXrNTFhTQit4PNTXtHOXq8GSEWdLBJ9iqtgWyQ=";
};
cargoHash = "sha256-txHl0+HDCVdmbZppGsFqPjsEbPBCJVEB3XZWZJBBoOk=";
cargoHash = "sha256-CL+aTPllQqa22ENU2FWhBMSe0Mf1MAfemytIiqf0bHk=";
buildAndTestSubdir = pname;
+3
View File
@@ -4,6 +4,7 @@
fetchFromGitHub,
versionCheckHook,
nix-update-script,
rust-jemalloc-sys,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "pyrefly";
@@ -19,6 +20,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
buildAndTestSubdir = "pyrefly";
cargoHash = "sha256-46kcoBG/PWwf8VdlvLNzEhfYRTmmKi/uTjwFkl7Wozg=";
buildInputs = [ rust-jemalloc-sys ];
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
+2 -2
View File
@@ -6,10 +6,10 @@
}:
let
pname = "remnote";
version = "1.21.9";
version = "1.21.24";
src = fetchurl {
url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage";
hash = "sha256-ywVNcB15Qp150gdhnweNMjYyI8w80tNxVXNDvv01Dpg=";
hash = "sha256-jJ7I5Xgq6RHZ4pT8VTMikX1f38C9FqLtJaSSgc2rWHA=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };
in
-1
View File
@@ -97,7 +97,6 @@ stdenv.mkDerivation (finalAttrs: {
license = licenses.gpl2Plus;
maintainers = with maintainers; [
donovanglover
thehans255
iedame
];
mainProgram = "ringracers";
+3 -3
View File
@@ -27,13 +27,13 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "ruffle";
version = "0.2.0-nightly-2025-10-24";
version = "0.2.0-nightly-2025-11-03";
src = fetchFromGitHub {
owner = "ruffle-rs";
repo = "ruffle";
tag = lib.strings.removePrefix "0.2.0-" finalAttrs.version;
hash = "sha256-zp+2kILsWkRVDX5q7rCI294VCOz8C3PleDPgED3n+LM=";
hash = "sha256-CthzW6yJLQPqzLotDD8jy46nvQKSUbK5I3z18y/CyyU=";
};
postPatch =
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
"OpenH264Version(${major}, ${minor}, ${patch})"
'';
cargoHash = "sha256-Eo9wLL/Xj/mWto3cRSxAv5dMf+jLOUUk5wCd8voQEeQ=";
cargoHash = "sha256-i0qyi3hBEmc5LuKaBpKPFwk24BQNj2AT26Erz2P5ENk=";
cargoBuildFlags = lib.optional withRuffleTools "--workspace";
env =
+1 -1
View File
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/rust-motd/rust-motd";
changelog = "https://github.com/rust-motd/rust-motd/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = [ ];
maintainers = with lib.maintainers; [ liberodark ];
mainProgram = "rust-motd";
};
}
@@ -13,8 +13,8 @@
libxkbcommon,
vulkan-loader,
wayland,
xorg,
}:
rustPlatform.buildRustPackage rec {
pname = "rusty-path-of-building";
version = "0.2.7";
@@ -66,6 +66,9 @@ rustPlatform.buildRustPackage rec {
libxkbcommon
vulkan-loader
wayland
xorg.libX11
xorg.libXcursor
xorg.libXi
]
}
@@ -88,6 +88,11 @@ stdenv.mkDerivation {
"-DNGSCOPECLIENT_VERSION=${version}"
];
env.NIX_CFLAGS_COMPILE = toString [
# error: variable 'empty_string' is uninitialized when passed as a const pointer argument here [-Werror,-Wuninitialized-const-pointer]
"-Wno-error=uninitialized"
];
patches = [
./remove-git-derived-version.patch
]
+2 -2
View File
@@ -6,13 +6,13 @@
stdenvNoCC.mkDerivation rec {
pname = "spaceship-prompt";
version = "4.19.0";
version = "4.19.1";
src = fetchFromGitHub {
owner = "denysdovhan";
repo = "spaceship-prompt";
rev = "v${version}";
sha256 = "sha256-g0hiUyGVaUA9Jg5UHFEyf1ioUnMb2cp7tOrtTFLMtvc=";
sha256 = "sha256-zMazuPTwvbmtd6BIjD7oDJ3V4TGlUnxJT25Pe1TI3UY=";
};
strictDeps = true;
@@ -9,13 +9,13 @@
stdenvNoCC.mkDerivation {
pname = "steam-devices-udev-rules";
version = "1.0.0.61-unstable-2025-09-26";
version = "1.0.0.61-unstable-2025-10-18";
src = fetchFromGitHub {
owner = "ValveSoftware";
repo = "steam-devices";
rev = "d3f7cd6a955d2191800f01d6d2efb2ee196127c5";
hash = "sha256-IMrKU6zyR+oTc4Wqca8JBvxoslKUuz8peHMudfwewf0=";
rev = "4d7e6c1d8c54ec10fdb29daca679307ac5194825";
hash = "sha256-KzDzZ03g1xil4G6yw67KGEHnWIWg6VZIkMy8n/kSgMs=";
};
nativeBuildInputs = [
+15 -8
View File
@@ -2,6 +2,8 @@
lib,
rustPlatform,
fetchFromGitHub,
nix-update-script,
testers,
# lua54 implies lua52/lua53
features ? [
"lua54"
@@ -10,18 +12,18 @@
],
}:
rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage (finalAttrs: {
pname = "stylua";
version = "2.3.0";
version = "2.3.1";
src = fetchFromGitHub {
owner = "johnnymorganz";
repo = "stylua";
rev = "v${version}";
sha256 = "sha256-iyZ30Gc32TQsQyMLwArfIRtM0NkbXkqmca46nI0526M=";
rev = "v${finalAttrs.version}";
sha256 = "sha256-wpFp6K5O1Vb/yHq+Lm0235nbeOdOgBK0NrlVAthz12A=";
};
cargoHash = "sha256-H50/e/XyFvXHhwrKUbKZFZwSHfwAkAtddEvFiOr5220=";
cargoHash = "sha256-+llL9WoKnrXJjlaPNqdN4jGPjSHz2EuI2V44fghF5aM=";
# remove cargo config so it can find the linker on aarch64-unknown-linux-gnu
postPatch = ''
@@ -30,12 +32,17 @@ rustPlatform.buildRustPackage rec {
buildFeatures = features;
passthru = {
tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
updateScript = nix-update-script { };
};
meta = {
description = "Opinionated Lua code formatter";
homepage = "https://github.com/johnnymorganz/stylua";
changelog = "https://github.com/johnnymorganz/stylua/blob/v${version}/CHANGELOG.md";
changelog = "https://github.com/johnnymorganz/stylua/blob/v${finalAttrs.version}/CHANGELOG.md";
license = lib.licenses.mpl20;
maintainers = [ ];
maintainers = [ lib.maintainers.LunNova ];
mainProgram = "stylua";
};
}
})
+1
View File
@@ -57,6 +57,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
mainProgram = "sx";
maintainers = with lib.maintainers; [
thiagokokada
liberodark
];
platforms = lib.platforms.linux;
};
@@ -0,0 +1,95 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 95a03bbd..9ce32264 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -123,7 +123,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
find_package(Imath REQUIRED)
find_package(nlohmann_json REQUIRED)
find_package(ZLIB REQUIRED)
-find_package(minizip REQUIRED)
+find_package(minizip-ng REQUIRED)
find_package(OpenTimelineIO REQUIRED)
# OpenColorIO dependencies
diff --git a/etc/SuperBuild/tests/OpenColorIOTest/CMakeLists.txt b/etc/SuperBuild/tests/OpenColorIOTest/CMakeLists.txt
index 513e7351..2db48491 100644
--- a/etc/SuperBuild/tests/OpenColorIOTest/CMakeLists.txt
+++ b/etc/SuperBuild/tests/OpenColorIOTest/CMakeLists.txt
@@ -1,10 +1,10 @@
find_package(ZLIB REQUIRED)
-find_package(minizip REQUIRED)
+find_package(minizip-ng REQUIRED)
find_package(OpenColorIO REQUIRED)
set(source main.cpp)
add_executable(OpenColorIOTest ${header} ${source})
-target_link_libraries(OpenColorIOTest OpenColorIO::OpenColorIO MINIZIP::minizip ZLIB::ZLIB)
+target_link_libraries(OpenColorIOTest OpenColorIO::OpenColorIO MINIZIP::minizip-ng ZLIB::ZLIB)
add_test(OpenColorIOTest OpenColorIOTest)
diff --git a/lib/tlCore/CMakeLists.txt b/lib/tlCore/CMakeLists.txt
index d02fa96a..877c8462 100644
--- a/lib/tlCore/CMakeLists.txt
+++ b/lib/tlCore/CMakeLists.txt
@@ -40,7 +40,7 @@ else()
endif()
set(LIBRARIES tlResource feather-tk::feather-tk-core OTIO::opentimelineio Imath::Imath nlohmann_json::nlohmann_json)
-set(LIBRARIES_PRIVATE Freetype::Freetype MINIZIP::minizip ZLIB::ZLIB)
+set(LIBRARIES_PRIVATE Freetype::Freetype MINIZIP::minizip-ng ZLIB::ZLIB)
if(TLRENDER_OCIO)
list(APPEND LIBRARIES OpenColorIO::OpenColorIO)
endif()
diff --git a/lib/tlTimeline/CMakeLists.txt b/lib/tlTimeline/CMakeLists.txt
index ad384749..82a6aacb 100644
--- a/lib/tlTimeline/CMakeLists.txt
+++ b/lib/tlTimeline/CMakeLists.txt
@@ -49,7 +49,7 @@ set(SOURCE
Video.cpp)
add_library(tlTimeline ${HEADERS} ${PRIVATE_HEADERS} ${SOURCE})
-target_link_libraries(tlTimeline tlIO)
+target_link_libraries(tlTimeline tlIO MINIZIP::minizip-ng)
set_target_properties(tlTimeline PROPERTIES FOLDER lib)
set_target_properties(tlTimeline PROPERTIES PUBLIC_HEADER "${HEADERS}")
diff --git a/lib/tlTimeline/TimelineCreate.cpp b/lib/tlTimeline/TimelineCreate.cpp
index 9596ab21..c8884435 100644
--- a/lib/tlTimeline/TimelineCreate.cpp
+++ b/lib/tlTimeline/TimelineCreate.cpp
@@ -99,7 +99,7 @@ namespace tl
public:
ZipReader(const std::string& fileName)
{
- mz_zip_reader_create(&reader);
+ reader = mz_zip_reader_create();
if (!reader)
{
throw std::runtime_error(feather_tk::Format(
diff --git a/lib/tlTimeline/Util.cpp b/lib/tlTimeline/Util.cpp
index 611f02ad..338df840 100644
--- a/lib/tlTimeline/Util.cpp
+++ b/lib/tlTimeline/Util.cpp
@@ -662,7 +662,7 @@ namespace tl
}
// Open the output file.
- mz_zip_writer_create(&_writer);
+ _writer = mz_zip_writer_create();
if (!_writer)
{
throw std::runtime_error(feather_tk::Format("Cannot create writer: \"{0}\"").arg(fileName));
diff --git a/tlRenderConfig.cmake.in b/tlRenderConfig.cmake.in
index 11312d32..e6ec1184 100644
--- a/tlRenderConfig.cmake.in
+++ b/tlRenderConfig.cmake.in
@@ -9,7 +9,7 @@ include(CMakeFindDependencyMacro)
find_package(Imath REQUIRED)
find_package(nlohmann_json REQUIRED)
find_package(ZLIB REQUIRED)
-find_package(minizip REQUIRED)
+find_package(minizip-ng REQUIRED)
find_package(OpenTimelineIO REQUIRED)
# OpenColorIO dependencies
+155
View File
@@ -0,0 +1,155 @@
{
lib,
stdenv,
cmake,
fetchFromGitHub,
pkg-config,
bzip2,
feather-tk,
ffmpeg,
freetype,
glfw,
imath,
libGL,
libjpeg,
libtiff,
libpng,
lunasvg,
minizip-ng,
nasm,
nativefiledialog-extended,
nlohmann_json,
opencolorio,
openexr,
openssl,
opentimelineio,
openusd,
plutovg,
SDL2,
sdl3,
xz,
zlib,
zstd,
# optional dependencies
enableNet ? false,
enableOcio ? true,
enableSdl2 ? true,
enableSdl3 ? false,
enableJpeg ? true,
enableTiff ? true,
enableStb ? true,
enablePng ? true,
enableOpenexr ? true,
enableFfmpeg ? true,
enableUsd ? false,
# build options
enableShared ? !stdenv.hostPlatform.isStatic,
enableProgram ? true,
enableExamples ? false,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "tlrender";
version = "0.10.0";
src = fetchFromGitHub {
owner = "darbyjohnston";
repo = "tlRender";
tag = finalAttrs.version;
hash = "sha256-TxiDZtMvNmrV1FKXZnekCZHnr/eCWZlsP6VJRnaoWg4=";
};
patches = [
# Minizip-ng 4 support: https://github.com/darbyjohnston/tlRender/pull/145
./minizip-ng-4.patch
];
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-fail "include(Package)" ""
substituteInPlace lib/tlCore/CMakeLists.txt \
--replace-fail "SDL2::SDL2-static" "SDL2::SDL2" \
--replace-fail "SDL3::SDL3-static" "SDL3::SDL3" \
substituteInPlace lib/tlIO/CMakeLists.txt \
--replace-fail \
"list(APPEND LIBRARIES_PRIVATE libjpeg-turbo::turbojpeg-static)" \
"list(APPEND LIBRARIES_PRIVATE libjpeg-turbo::jpeg libjpeg-turbo::turbojpeg)"
'';
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
bzip2 # required by minizip-ng
feather-tk
freetype # required by feather-tk
glfw
libGL
lunasvg # required by feather-tk
imath
minizip-ng
nativefiledialog-extended
nlohmann_json
openssl # required by minizip-ng
opentimelineio
plutovg # required by feather-tk -> lunasvg
xz # libLZMA, required by minizip-ng
zlib # required by minizip-ng
zstd # required by minizip-ng
]
++ lib.optionals enableNet [ nasm ]
++ lib.optionals enableOcio [ opencolorio ]
++ lib.optionals enableSdl2 [ SDL2 ]
++ lib.optionals enableSdl3 [ sdl3 ]
++ lib.optionals enableJpeg [ libjpeg ]
++ lib.optionals enableTiff [ libtiff ]
++ lib.optionals enablePng [ libpng ]
++ lib.optionals enableOpenexr [ openexr ]
++ lib.optionals enableFfmpeg [ ffmpeg ]
++ lib.optionals enableUsd [ openusd ];
cmakeFlags = [
(lib.cmakeBool "TLRENDER_NET" enableNet)
(lib.cmakeBool "TLRENDER_OCIO" enableOcio)
(lib.cmakeBool "TLRENDER_SDL2" enableSdl2)
(lib.cmakeBool "TLRENDER_SDL3" enableSdl3)
(lib.cmakeBool "TLRENDER_JPEG" enableJpeg)
(lib.cmakeBool "TLRENDER_TIFF" enableTiff)
(lib.cmakeBool "TLRENDER_STB" enableStb)
(lib.cmakeBool "TLRENDER_PNG" enablePng)
(lib.cmakeBool "TLRENDER_EXR" enableOpenexr)
(lib.cmakeBool "TLRENDER_FFMPEG" enableFfmpeg)
(lib.cmakeBool "TLRENDER_USD" enableUsd)
(lib.cmakeBool "BUILD_SHARED_LIBS" enableShared)
(lib.cmakeBool "TLRENDER_PROGRAMS" enableProgram)
(lib.cmakeBool "TLRENDER_EXAMPLES" enableExamples)
(lib.cmakeBool "TLRENDER_TESTS" finalAttrs.finalPackage.doCheck)
];
# GLFW requires a working X11 session.
doCheck = false;
meta = {
description = "Open source library for building playback and review applications";
longDescription = ''
An open source library for building playback and review applications for
visual effects, film, and animation.
The library can render and playback timelines with multiple video clips,
image sequences, audio clips, and transitions. Examples are provided for
integrating the library with Qt and OpenGL applications.
'';
homepage = "https://github.com/darbyjohnston/tlRender";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ yzx9 ];
platforms = with lib.platforms; linux ++ darwin;
};
})
+2 -2
View File
@@ -30,14 +30,14 @@ let
# https://dldir1.qq.com/weixin/mac/mac-release.xml
any-darwin =
let
version = "4.1.2.16-30516";
version = "4.1.4.12-31227";
version' = lib.replaceString "-" "_" version;
in
{
inherit version;
src = fetchurl {
url = "https://dldir1v6.qq.com/weixin/Universal/Mac/xWeChatMac_universal_${version'}.dmg";
hash = "sha256-aMInN9sEOfEKXrRYTcHu69hzN9iO3hJ5jLvK9D0QKwU=";
hash = "sha256-xVWEABH3dzQkQpmhJ3gKXJd9lQ4fqN7ptkWLTpJ4vaY=";
};
};
in
@@ -17,13 +17,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "qodeassist-plugin";
version = "0.7.1";
version = "0.8.0";
src = fetchFromGitHub {
owner = "Palm1r";
repo = "QodeAssist";
tag = "v${finalAttrs.version}";
hash = "sha256-QDs9li8WH27aITe48cxRWaqd0mFCmZcBeb34LadeGmk=";
hash = "sha256-7wsRgZEAOd8mGnTCGJM7LTde2ITKW7ibIB7ZGy25s+E=";
};
dontWrapQtApps = true;
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "qtpbfimageplugin";
version = "5.1";
version = "5.2";
src = fetchFromGitHub {
owner = "tumic0";
repo = "QtPBFImagePlugin";
tag = version;
hash = "sha256-3Tfh92ozitvL9EiGJy8Q20C8zDx5eNNJFa7KDXDuS6Y=";
hash = "sha256-IU9sA8yipGsqD9HadGlQce4ud0RyfMMh83cdVuSTGjs=";
};
nativeBuildInputs = [
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "dronecan";
version = "1.0.26";
version = "1.0.27";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-D2odxa9ADswrg6rgKLTyQulHpGec1r0lWRUZDV5YvyE=";
hash = "sha256-m6xfk/2pKfzbr0fu2GUjJnRcicoZDWzhrGJ6DDs2rBw=";
};
nativeCheckInputs = [ pytestCheckHook ];
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "owslib";
version = "0.34.1";
version = "0.35.0";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "geopython";
repo = "OWSLib";
tag = version;
hash = "sha256-eLSODYal9rcualQrM03/hwLBngty+9fIlPIJh1EZduA=";
hash = "sha256-/5FJai6ad4ZQAK/IhiIuGv4yiBcT/iXFYcbZ+jeCoyI=";
};
postPatch = ''
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "rns";
version = "1.0.0";
version = "1.0.1";
pyproject = true;
src = fetchFromGitHub {
owner = "markqvist";
repo = "Reticulum";
tag = version;
hash = "sha256-d227mAVJKcm3Dx2HS7CvVsyWyLl7GoPSA/YrWjs7jm0=";
hash = "sha256-fbUoZSJtg5RFyZOC4I0d7wbPNcZ1RwmrD/1lHUoNos8=";
};
patches = [
@@ -41,14 +41,14 @@
buildPythonPackage rec {
pname = "sagemaker";
version = "2.253.1";
version = "2.254.1";
pyproject = true;
src = fetchFromGitHub {
owner = "aws";
repo = "sagemaker-python-sdk";
tag = "v${version}";
hash = "sha256-1zN+gj1t0eYpa2mZFSAMs9oInF2XxKNhK8399e6xb68=";
hash = "sha256-tE8AD/nVrlP96ihVjzpos1IUGPR2T47HAMczCGP3S9M=";
};
build-system = [
@@ -6,7 +6,7 @@
python3,
flex,
bison,
qt5,
qt6,
libiconv,
spdlog,
fmt,
@@ -51,9 +51,10 @@ stdenv.mkDerivation (finalAttrs: {
fmt
sqlite
]
++ lib.optionals (qt5 != null) [
qt5.qtbase
qt5.wrapQtAppsHook
++ lib.optionals (qt6 != null) [
qt6.qtbase
qt6.wrapQtAppsHook
qt6.qtsvg
];
cmakeFlags = [
@@ -61,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
"-Duse_sys_fmt=ON"
"-Duse_sys_sqlite3=ON"
]
++ lib.optional (qt5 != null) "-Dbuild_wizard=YES";
++ lib.optional (qt6 != null) "-Dbuild_wizard=YES";
# put examples in an output so people/tools can test against them
outputs = [
@@ -88,6 +89,6 @@ stdenv.mkDerivation (finalAttrs: {
off-line reference manual (in LaTeX) from a set of documented source
files.
'';
platforms = if qt5 != null then lib.platforms.linux else lib.platforms.unix;
platforms = if qt6 != null then lib.platforms.linux else lib.platforms.unix;
};
})
+13 -2
View File
@@ -98,8 +98,19 @@ let
hardeningDisable = [ "all" ];
dontStrip = true;
# breaks secondary CPU bringup on at least RK3588, maybe others
env.NIX_CFLAGS_COMPILE = "-fomit-frame-pointer";
env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [
# breaks secondary CPU bringup on at least RK3588, maybe others
"-fomit-frame-pointer"
# Breaks compilation of armTrustedFirmwareRK3399:
# /nix/store/hash-arm-none-eabi-binutils-2.44/bin/arm-none-eabi-ld: /build/source/build/rk3399/release/m0/rk3399m0.elf: error: PHDR segment not covered by LOAD segment
#
# This was caused by ccc56d1a79ff2a0f528cecf5e36eb76beaacc8c0 adding the flag `--enable-default-pie`.
# According to https://trustedfirmware-a.readthedocs.io/en/v2.2/getting_started/user-guide.html,
# Trusted Firmware-A has an option called ENABLE_PIE, which is turned off by default.
# Someone with more knowledge of the implications can try using that option instead.
"-no-pie"
];
meta =
with lib;
+2 -2
View File
@@ -34,10 +34,10 @@
}@pkgs:
let
defaultVersion = "2025.07";
defaultVersion = "2025.10";
defaultSrc = fetchurl {
url = "https://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2";
hash = "sha256-D5M/bFpCaJW/MG6T5qxTxghw5LVM2lbZUhG+yZ5jvsc=";
hash = "sha256-tPAyhI5WzI8hOtWfkTLAhNu7YyvCkXbQJOWCIODv30o=";
};
# Dependencies for the tools need to be included as either native or cross,
@@ -9,13 +9,13 @@
buildHomeAssistantComponent rec {
owner = "AlexxIT";
domain = "xiaomi_gateway3";
version = "4.1.3";
version = "4.1.4";
src = fetchFromGitHub {
owner = "AlexxIT";
repo = "XiaomiGateway3";
rev = "v${version}";
hash = "sha256-CcJoXD60z91Gahv5pVrWaIpUNhetW0BN1Nd4DAVRPJs=";
hash = "sha256-pa9B2c1QeQ3DR2qjttP0c/44pERGtune+4nlnzPBSYo=";
};
dependencies = [ zigpy ];
+2 -2
View File
@@ -219,7 +219,7 @@ stdenv.mkDerivation rec {
(fetchpatch {
name = "23_prerequisite_1_key_protector_add_key_protectors_framework.patch";
url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=5d260302da672258444b01239803c8f4d753e3f3";
hash = "sha256-9WnFN6xMiv+1XMhNHgVEegkhwzp9KpRZI6MIZY/Ih3Q=";
hash = "sha256-5aFHzc5qXBNLEc6yzI17AH6J7EYogcXdLxk//1QgumY=";
})
(fetchpatch {
name = "23_prerequisite_2_disk_cryptodisk_allow_user_to_retry_failed_passphrase.patch";
@@ -249,7 +249,7 @@ stdenv.mkDerivation rec {
(fetchpatch {
name = "23_CVE-2024-49504.patch";
url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=13febd78db3cd85dcba67d8ad03ad4d42815f11e";
hash = "sha256-U7lNUb4iVAyQ1yEg5ECHCQGE51tKvY13T9Ji09Q1W9Y=";
hash = "sha256-GejDL9IKbmbSUmp8F1NuvBcFAp2/W04jxmOatI5dKn8=";
})
(fetchpatch {
name = "24_disk_loopback_reference_tracking_for_the_loopback.patch";
+2 -10
View File
@@ -2487,10 +2487,6 @@ with pkgs;
cmdpack = callPackages ../tools/misc/cmdpack { };
cocoapods = callPackage ../development/tools/cocoapods { };
cocoapods-beta = lowPrio (callPackage ../development/tools/cocoapods { beta = true; });
comet-gog_heroic = callPackage ../by-name/co/comet-gog/package.nix { comet-gog_kind = "heroic"; };
compass = callPackage ../development/tools/compass { };
@@ -6499,10 +6495,10 @@ with pkgs;
dot2tex = with python3.pkgs; toPythonApplication dot2tex;
doxygen = callPackage ../development/tools/documentation/doxygen {
qt5 = null;
qt6 = null;
};
doxygen_gui = lowPrio (doxygen.override { inherit qt5; });
doxygen_gui = lowPrio (doxygen.override { inherit qt6; });
drake = callPackage ../development/tools/build-managers/drake { };
@@ -13109,10 +13105,6 @@ with pkgs;
freeciv_gtk = freeciv;
gl-gsync-demo = callPackage ../games/gl-gsync-demo {
libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
};
gscrabble = python3Packages.callPackage ../games/gscrabble { };
ibmcloud-cli = callPackage ../tools/admin/ibmcloud-cli { stdenv = stdenvNoCC; };