Merge staging-next into staging

This commit is contained in:
nixpkgs-ci[bot]
2025-08-24 00:19:12 +00:00
committed by GitHub
57 changed files with 1297 additions and 1303 deletions
+2
View File
@@ -35,6 +35,8 @@
- `kbd` package's `outputs` now include a `man` and `scripts` outputs. The `unicode_start` and `unicode_stop` Bash scripts are now part of the `scripts` output, allowing most usages of the `kbd` package to not pull in `bash`.
- `cudaPackages.cudatoolkit-legacy-runfile` has been removed.
- `conduwuit` was removed due to upstream ceasing development and deleting their repository. For existing data, a migration to `matrix-conduit`, `matrix-continuwuity` or `matrix-tuwunel` may be possible.
- `gnome-keyring` no longer ships with an SSH agent anymore because it has been deprecated upstream. You should use `gcr_4` instead, which provides the same features. More information on why this was done can be found on [the relevant GCR upstream PR](https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/67).
+6
View File
@@ -18216,6 +18216,12 @@
githubId = 70602908;
github = "nikolaizombie1";
};
niksingh710 = {
email = "nik.singh710@gmail.com";
name = "Nikhil Singh";
github = "niksingh710";
githubId = 60490474;
};
nikstur = {
email = "nikstur@outlook.com";
name = "nikstur";
+28 -32
View File
@@ -67,7 +67,7 @@ in
...
}:
let
mailserverIP = nodes.mailserver.config.networking.primaryIPAddress;
mailserverIP = nodes.mailserver.networking.primaryIPAddress;
in
{
services.matrix-synapse = {
@@ -169,44 +169,40 @@ in
};
# test mail delivery
mailserver =
args:
let
in
{
security.pki.certificateFiles = [
mailerCerts.ca.cert
];
mailserver = args: {
security.pki.certificateFiles = [
mailerCerts.ca.cert
];
networking.firewall.enable = false;
networking.firewall.enable = false;
services.postfix = {
enable = true;
enableSubmission = true;
services.postfix = {
enable = true;
enableSubmission = true;
# blackhole transport
transport = "example.com discard:silently";
# blackhole transport
transport = "example.com discard:silently";
settings.main = {
myhostname = "${mailerDomain}";
# open relay for subnet
mynetworks_style = "subnet";
debug_peer_level = "10";
smtpd_relay_restrictions = [
"permit_mynetworks"
"reject_unauth_destination"
];
settings.main = {
myhostname = "${mailerDomain}";
# open relay for subnet
mynetworks_style = "subnet";
debug_peer_level = "10";
smtpd_relay_restrictions = [
"permit_mynetworks"
"reject_unauth_destination"
];
# disable obsolete protocols, something old versions of twisted are still using
smtpd_tls_protocols = "TLSv1.3, TLSv1.2, !TLSv1.1, !TLSv1, !SSLv2, !SSLv3";
smtpd_tls_mandatory_protocols = "TLSv1.3, TLSv1.2, !TLSv1.1, !TLSv1, !SSLv2, !SSLv3";
smtpd_tls_chain_files = [
"${mailerCerts.${mailerDomain}.key}"
"${mailerCerts.${mailerDomain}.cert}"
];
};
# disable obsolete protocols, something old versions of twisted are still using
smtpd_tls_protocols = "TLSv1.3, TLSv1.2, !TLSv1.1, !TLSv1, !SSLv2, !SSLv3";
smtpd_tls_mandatory_protocols = "TLSv1.3, TLSv1.2, !TLSv1.1, !TLSv1, !SSLv2, !SSLv3";
smtpd_tls_chain_files = [
"${mailerCerts.${mailerDomain}.key}"
"${mailerCerts.${mailerDomain}.cert}"
];
};
};
};
serversqlite = args: {
services.matrix-synapse = {
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "fbneo";
version = "0-unstable-2025-08-13";
version = "0-unstable-2025-08-19";
src = fetchFromGitHub {
owner = "libretro";
repo = "fbneo";
rev = "525a07bd5abd52481a653dc790b987b8f50d0686";
hash = "sha256-O1QEvQ2ZZ7rU6KObV1hFaYLVWwDZ6Lu30JMbln7Z7DA=";
rev = "7345d0f50079ca989e3685152687f1ee15bad829";
hash = "sha256-MohvlQtLtDq6GGOL3nAbRGUdbJDnc0nTgSQKlUGWDBU=";
};
makefile = "Makefile";
@@ -9,13 +9,13 @@
}:
mkLibretroCore {
core = "mame";
version = "0-unstable-2025-08-03";
version = "0-unstable-2025-08-18";
src = fetchFromGitHub {
owner = "libretro";
repo = "mame";
rev = "9c05f5b1ed748394cc8ef83a77873c6c9ab9a6a5";
hash = "sha256-b/Qwto3draMZOD7a6IHxQwQmaKf11v/r/sOS2oCrGVg=";
rev = "d9f594146b6c43b7b15ee2569d1175e62030f0cb";
hash = "sha256-sQZUuAwCYy4YKaiPPt+0q8lblqb7U7kiGWk2kYK3Kmk=";
fetchSubmodules = true;
};
@@ -1417,6 +1417,15 @@
"spdx": "MPL-2.0",
"vendorHash": null
},
"unifi": {
"hash": "sha256-IqsQRVgAB1PUqYJ0JPig6oq7FKJuS/a2NCgTCxX9+cg=",
"homepage": "https://registry.terraform.io/providers/ubiquiti-community/unifi",
"owner": "ubiquiti-community",
"repo": "terraform-provider-unifi",
"rev": "v0.41.3",
"spdx": "MPL-2.0",
"vendorHash": "sha256-iqwdSzyVZE5CitzXc8rWn2zO3v+VvuDNeS0ll0V6MtU="
},
"utils": {
"hash": "sha256-vCdPG8cZUdFhs1OmqDlgCDqBdyFiL99p6I8JhL8C6lY=",
"homepage": "https://registry.terraform.io/providers/cloudposse/utils",
+6 -3
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "choose-gui";
version = "1.3.1";
version = "1.5.0";
src = fetchFromGitHub {
owner = "chipsenkbeil";
repo = "choose";
rev = version;
hash = "sha256-oR0GgMinKcBHaZWdE7O+mdbiLKKjkweECKbi80bjW+c=";
hash = "sha256-ewXZpP3XmOuV/MA3fK4BwZnNb2jkE727Sse6oAd4HJk=";
};
nativeBuildInputs = [ xcbuild ];
@@ -42,7 +42,10 @@ stdenv.mkDerivation rec {
license = lib.licenses.mit;
platforms = lib.platforms.darwin;
changelog = "https://github.com/chipsenkbeil/choose/blob/${version}/CHANGELOG.md";
maintainers = with lib.maintainers; [ heywoodlh ];
maintainers = with lib.maintainers; [
heywoodlh
niksingh710
];
mainProgram = "choose";
};
}
+106
View File
@@ -0,0 +1,106 @@
{
lib,
organicmaps,
fetchurl,
fetchFromGitea,
boost,
gtest,
glm,
gflags,
imgui,
jansson,
python3,
optipng,
utf8cpp,
nix-update-script,
}:
let
mapRev = 250804;
worldMap = fetchurl {
url = "https://cdn-fi-1.comaps.app/maps/${toString mapRev}/World.mwm";
hash = "sha256-xYMH3y0Y6sSXYUTpy+A5YCyb+n5YChOXhyDvUFqXxZ0=";
};
worldCoasts = fetchurl {
url = "https://cdn-fi-1.comaps.app/maps/${toString mapRev}/WorldCoasts.mwm";
hash = "sha256-2vc4kkNX9bRTqXYlALfwVwOlvr122kvUk7pUyM91vjc=";
};
in
organicmaps.overrideAttrs (oldAttrs: rec {
pname = "comaps";
version = "2025.08.13-8";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "comaps";
repo = "comaps";
tag = "v${version}";
hash = "sha256-kvE3H+siV/8v4WgsG1Ifd4gMMwGLqz28oXf1hB9gQ2Q=";
fetchSubmodules = true;
};
patches = [
./remove-lto.patch
./use-vendored-protobuf.patch
];
postPatch = (oldAttrs.postPatch or "") + ''
rm -f 3party/boost/b2
'';
nativeBuildInputs = (builtins.filter (x: x != python3) oldAttrs.nativeBuildInputs or [ ]) ++ [
(python3.withPackages (
ps: with ps; [
protobuf
]
))
optipng
];
buildInputs = (oldAttrs.buildInputs or [ ]) ++ [
boost
gtest
gflags
glm
imgui
jansson
utf8cpp
];
preConfigure = ''
bash ./configure.sh --skip-map-download
'';
cmakeFlags = [
(lib.cmakeBool "WITH_SYSTEM_PROVIDED_3PARTY" true)
];
env = {
NIX_CFLAGS_COMPILE = toString [
"-I/build/source/3party/fast_double_parser/include"
];
PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python";
};
postInstall = ''
install -Dm644 ${worldMap} $out/share/comaps/data/World.mwm
install -Dm644 ${worldCoasts} $out/share/comaps/data/WorldCoasts.mwm
ln -s $out/bin/CoMaps $out/bin/comaps
'';
passthru.updateScript = nix-update-script {
extraArgs = [
"-vr"
"v(.*)"
];
};
meta = oldAttrs.meta // {
description = "Community-led fork of Organic Maps";
homepage = "https://comaps.app";
changelog = "https://codeberg.org/comaps/comaps/releases/tag/v${version}";
maintainers = [ lib.maintainers.ryand56 ];
mainProgram = "comaps";
};
})
+33
View File
@@ -0,0 +1,33 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c559bf5..42ed617 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,7 +106,7 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
elseif (${CMAKE_BUILD_TYPE} MATCHES "Rel")
add_definitions(-DRELEASE)
if (NOT MSVC)
- add_compile_options(-O3 $<$<CXX_COMPILER_ID:GNU>:-flto=auto>)
+ add_compile_options(-O3)
endif()
else()
message(FATAL_ERROR "Unknown build type: " ${CMAKE_BUILD_TYPE})
@@ -116,19 +116,6 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")
add_compile_options(-fno-omit-frame-pointer)
endif()
-# Linux GCC LTO plugin fix.
-if (PLATFORM_LINUX AND (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND (CMAKE_BUILD_TYPE MATCHES "^Rel"))
- # To force errors if LTO was not enabled.
- add_compile_options(-fno-fat-lto-objects)
- # To fix ar and ranlib "plugin needed to handle lto object".
- string(REGEX MATCH "[0-9]+" GCC_MAJOR_VERSION ${CMAKE_CXX_COMPILER_VERSION})
- file(GLOB_RECURSE plugin /usr/lib/gcc/*/${GCC_MAJOR_VERSION}/liblto_plugin.so)
- set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> --plugin ${plugin} qcs <TARGET> <OBJECTS>")
- set(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> --plugin ${plugin} <TARGET>")
- set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> --plugin ${plugin} qcs <TARGET> <OBJECTS>")
- set(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> --plugin ${plugin} <TARGET>")
-endif()
-
message(STATUS "Build type: " ${CMAKE_BUILD_TYPE})
if (PLATFORM_LINUX OR PLATFORM_ANDROID)
@@ -0,0 +1,24 @@
diff --git a/3party/CMakeLists.txt b/3party/CMakeLists.txt
index 5178ae0..abe103f 100644
--- a/3party/CMakeLists.txt
+++ b/3party/CMakeLists.txt
@@ -41,9 +41,6 @@ if (NOT WITH_SYSTEM_PROVIDED_3PARTY)
# Add pugixml library.
add_subdirectory(pugixml)
- # Add protobuf library.
- add_subdirectory(protobuf)
-
if (NOT PLATFORM_LINUX)
add_subdirectory(freetype)
add_subdirectory(icu)
@@ -55,6 +52,9 @@ if (NOT WITH_SYSTEM_PROVIDED_3PARTY)
target_include_directories(utf8cpp INTERFACE "${OMIM_ROOT}/3party/utfcpp/source")
endif()
+# Add protobuf library.
+add_subdirectory(protobuf)
+
add_subdirectory(agg)
add_subdirectory(bsdiff-courgette)
add_subdirectory(minizip)
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "devspace";
version = "6.3.16";
version = "6.3.17";
src = fetchFromGitHub {
owner = "devspace-sh";
repo = "devspace";
rev = "v${version}";
hash = "sha256-MkH38rzeHnw3kf7HEPFVJIUzm+dcmplD92+tw4dyOyE=";
hash = "sha256-b0eRiPt4g8JEoQPdl3qXsEXuYIy+VvVBU8/cPIqW/20=";
};
vendorHash = null;
+3 -3
View File
@@ -6,14 +6,14 @@
}:
buildGoModule rec {
pname = "ficsit-cli";
version = "0.6.0";
version = "0.6.1";
commit = "5dc8bdbaf6e8d9b1bcd2895e389d9d072d454e15";
src = fetchFromGitHub {
owner = "satisfactorymodding";
repo = "ficsit-cli";
tag = "v${version}";
hash = "sha256-Zwidx0war3hos9NEmk9dEzPBgDGdUtWvZb7FIF5OZMA=";
hash = "sha256-eQbHGxxI7g543XlV5y1Np8QTUsfAJdbG9sPXKbUmluc=";
};
ldflags = [
@@ -23,7 +23,7 @@ buildGoModule rec {
doCheck = false; # Tests make an api call, which always fails in the sandbox.
vendorHash = "sha256-vmA3jvxOLRYj5BmvWMhSEnCTEoe8BLm8lpm2kruIEv4=";
vendorHash = "sha256-3YqOwjCuXF48jsGjwv4mHMoGaiPDgxjzZTcrPAtA7I0=";
meta = {
description = "CLI tool for managing Satisfactory mods";
@@ -16,13 +16,13 @@ let
nodejs = nodejs_20;
buildNpmPackage' = buildNpmPackage.override { inherit nodejs; };
version = "1.20.1";
version = "1.22.0";
src = fetchFromGitHub {
owner = "httptoolkit";
repo = "httptoolkit-server";
rev = "refs/tags/v${version}";
hash = "sha256-iEAYZX7WNk6TvZ44GAOgTqXOcW5oFn4gX+kzixZZbWA=";
tag = "v${version}";
hash = "sha256-4kvpTqajlBWIYveedmlo2yrnbEdN/V+96/Lf54miMuw=";
};
overridesNodeModules = buildNpmPackage' {
@@ -30,7 +30,7 @@ let
inherit version src;
sourceRoot = "${src.name}/overrides/js";
npmDepsHash = "sha256-Uw7XbfwLMX+zbSrzFgvB8lw3hxUyw1eRKazCITrT/28=";
npmDepsHash = "sha256-MtUJY9IxzkGPuoIXHAr9nNNF+NpEf2b/oAYauJPwdaw=";
dontBuild = true;
@@ -47,7 +47,7 @@ let
src = fetchFromGitHub {
owner = "murat-dogan";
repo = "node-datachannel";
rev = "refs/tags/v${nodeDatachannel.version}";
tag = "v${nodeDatachannel.version}";
hash = "sha256-xjYja+e2Z7X5cU4sEuSsJzG0gtmTPl3VrUf+ypd3zdw=";
};
@@ -102,7 +102,7 @@ buildNpmPackage' {
patches = [ ./only-build-for-one-platform.patch ];
npmDepsHash = "sha256-gHXop4CTsQTSMrZ5mBHkMcmpOr2MIjVLrzjLLCfZ3As=";
npmDepsHash = "sha256-J6QmJsnl5UCxeSKIcekdguM+M5Z2HBYRat5nt18zPYU=";
npmFlags = [ "--ignore-scripts" ];
+3 -3
View File
@@ -14,16 +14,16 @@ let
in
buildNpmPackage rec {
pname = "httptoolkit";
version = "1.20.1";
version = "1.22.0";
src = fetchFromGitHub {
owner = "httptoolkit";
repo = "httptoolkit-desktop";
tag = "v${version}";
hash = "sha256-1m4okGTNrboyj+QiMFPT7Z0/+FxZtxrqqAbuAobRgvU=";
hash = "sha256-8zvY/40hcZcoMojARktf5dpCsFFQk6h7P5KwukbEnjw=";
};
npmDepsHash = "sha256-NH6Ppj6SsM0BXAgboMgp1ZPwN43ciLNBaHkz5yq8Ff8=";
npmDepsHash = "sha256-yDXakndCGelLNTHD0atsb5MlWFiG8vINfNvsTTAXRTE=";
makeCacheWritable = true;
+210 -104
View File
@@ -77,33 +77,32 @@
},
{
"name": "doctrine/inflector",
"version": "2.0.10",
"version": "2.1.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/inflector.git",
"reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc"
"reference": "6d6c96277ea252fc1304627204c3d5e6e15faa3b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/inflector/zipball/5817d0659c5b50c9b950feb9af7b9668e2c436bc",
"reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc",
"url": "https://api.github.com/repos/doctrine/inflector/zipball/6d6c96277ea252fc1304627204c3d5e6e15faa3b",
"reference": "6d6c96277ea252fc1304627204c3d5e6e15faa3b",
"shasum": ""
},
"require": {
"php": "^7.2 || ^8.0"
},
"require-dev": {
"doctrine/coding-standard": "^11.0",
"phpstan/phpstan": "^1.8",
"phpstan/phpstan-phpunit": "^1.1",
"phpstan/phpstan-strict-rules": "^1.3",
"phpunit/phpunit": "^8.5 || ^9.5",
"vimeo/psalm": "^4.25 || ^5.4"
"doctrine/coding-standard": "^12.0 || ^13.0",
"phpstan/phpstan": "^1.12 || ^2.0",
"phpstan/phpstan-phpunit": "^1.4 || ^2.0",
"phpstan/phpstan-strict-rules": "^1.6 || ^2.0",
"phpunit/phpunit": "^8.5 || ^12.2"
},
"type": "library",
"autoload": {
"psr-4": {
"Doctrine\\Inflector\\": "lib/Doctrine/Inflector"
"Doctrine\\Inflector\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -148,7 +147,7 @@
],
"support": {
"issues": "https://github.com/doctrine/inflector/issues",
"source": "https://github.com/doctrine/inflector/tree/2.0.10"
"source": "https://github.com/doctrine/inflector/tree/2.1.0"
},
"funding": [
{
@@ -164,27 +163,28 @@
"type": "tidelift"
}
],
"time": "2024-02-18T20:23:39+00:00"
"time": "2025-08-10T19:31:58+00:00"
},
{
"name": "illuminate/collections",
"version": "v12.19.2",
"version": "v12.25.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/collections.git",
"reference": "21a206b2b2297e838c181b482b5f8bbe7ac48f61"
"reference": "d8bdd65850b99ac4f7ebee1a49ad678a6740bec9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/collections/zipball/21a206b2b2297e838c181b482b5f8bbe7ac48f61",
"reference": "21a206b2b2297e838c181b482b5f8bbe7ac48f61",
"url": "https://api.github.com/repos/illuminate/collections/zipball/d8bdd65850b99ac4f7ebee1a49ad678a6740bec9",
"reference": "d8bdd65850b99ac4f7ebee1a49ad678a6740bec9",
"shasum": ""
},
"require": {
"illuminate/conditionable": "^12.0",
"illuminate/contracts": "^12.0",
"illuminate/macroable": "^12.0",
"php": "^8.2"
"php": "^8.2",
"symfony/polyfill-php84": "^1.31"
},
"suggest": {
"illuminate/http": "Required to convert collections to API resources (^12.0).",
@@ -221,11 +221,11 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2025-06-12T14:21:37+00:00"
"time": "2025-08-13T02:18:00+00:00"
},
{
"name": "illuminate/conditionable",
"version": "v12.19.2",
"version": "v12.25.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/conditionable.git",
@@ -271,16 +271,16 @@
},
{
"name": "illuminate/contracts",
"version": "v12.19.2",
"version": "v12.25.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/contracts.git",
"reference": "ad1d16d827927455d3b7e39fabac66b1afb82582"
"reference": "458573a554b927e9594bb35baf9a7897dea03303"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/contracts/zipball/ad1d16d827927455d3b7e39fabac66b1afb82582",
"reference": "ad1d16d827927455d3b7e39fabac66b1afb82582",
"url": "https://api.github.com/repos/illuminate/contracts/zipball/458573a554b927e9594bb35baf9a7897dea03303",
"reference": "458573a554b927e9594bb35baf9a7897dea03303",
"shasum": ""
},
"require": {
@@ -315,20 +315,20 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2025-06-12T15:07:31+00:00"
"time": "2025-08-03T15:27:01+00:00"
},
{
"name": "illuminate/filesystem",
"version": "v12.19.2",
"version": "v12.25.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/filesystem.git",
"reference": "a5ec0cc347d46ff4aa3615c7739f321df3183fb7"
"reference": "d1c5bbb3b84649599def8ddd814c1f9543930055"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/filesystem/zipball/a5ec0cc347d46ff4aa3615c7739f321df3183fb7",
"reference": "a5ec0cc347d46ff4aa3615c7739f321df3183fb7",
"url": "https://api.github.com/repos/illuminate/filesystem/zipball/d1c5bbb3b84649599def8ddd814c1f9543930055",
"reference": "d1c5bbb3b84649599def8ddd814c1f9543930055",
"shasum": ""
},
"require": {
@@ -382,11 +382,11 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2025-06-17T23:40:32+00:00"
"time": "2025-08-04T20:03:30+00:00"
},
{
"name": "illuminate/macroable",
"version": "v12.19.2",
"version": "v12.25.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/macroable.git",
@@ -432,16 +432,16 @@
},
{
"name": "illuminate/support",
"version": "v12.19.2",
"version": "v12.25.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/support.git",
"reference": "4e5d098d1cdbf5cabff09c1903a141bd9747ae75"
"reference": "dffee7182dc82a2b0b384e461059c9cad4272ed8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/support/zipball/4e5d098d1cdbf5cabff09c1903a141bd9747ae75",
"reference": "4e5d098d1cdbf5cabff09c1903a141bd9747ae75",
"url": "https://api.github.com/repos/illuminate/support/zipball/dffee7182dc82a2b0b384e461059c9cad4272ed8",
"reference": "dffee7182dc82a2b0b384e461059c9cad4272ed8",
"shasum": ""
},
"require": {
@@ -455,6 +455,7 @@
"illuminate/macroable": "^12.0",
"nesbot/carbon": "^3.8.4",
"php": "^8.2",
"symfony/polyfill-php83": "^1.31",
"voku/portable-ascii": "^2.0.2"
},
"conflict": {
@@ -505,20 +506,20 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2025-06-12T15:07:56+00:00"
"time": "2025-08-13T21:42:15+00:00"
},
{
"name": "laravel/prompts",
"version": "v0.3.5",
"version": "v0.3.6",
"source": {
"type": "git",
"url": "https://github.com/laravel/prompts.git",
"reference": "57b8f7efe40333cdb925700891c7d7465325d3b1"
"reference": "86a8b692e8661d0fb308cec64f3d176821323077"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/prompts/zipball/57b8f7efe40333cdb925700891c7d7465325d3b1",
"reference": "57b8f7efe40333cdb925700891c7d7465325d3b1",
"url": "https://api.github.com/repos/laravel/prompts/zipball/86a8b692e8661d0fb308cec64f3d176821323077",
"reference": "86a8b692e8661d0fb308cec64f3d176821323077",
"shasum": ""
},
"require": {
@@ -562,22 +563,22 @@
"description": "Add beautiful and user-friendly forms to your command-line applications.",
"support": {
"issues": "https://github.com/laravel/prompts/issues",
"source": "https://github.com/laravel/prompts/tree/v0.3.5"
"source": "https://github.com/laravel/prompts/tree/v0.3.6"
},
"time": "2025-02-11T13:34:40+00:00"
"time": "2025-07-07T14:17:42+00:00"
},
{
"name": "nesbot/carbon",
"version": "3.10.0",
"version": "3.10.2",
"source": {
"type": "git",
"url": "https://github.com/CarbonPHP/carbon.git",
"reference": "c1397390dd0a7e0f11660f0ae20f753d88c1f3d9"
"reference": "76b5c07b8a9d2025ed1610e14cef1f3fd6ad2c24"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/c1397390dd0a7e0f11660f0ae20f753d88c1f3d9",
"reference": "c1397390dd0a7e0f11660f0ae20f753d88c1f3d9",
"url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/76b5c07b8a9d2025ed1610e14cef1f3fd6ad2c24",
"reference": "76b5c07b8a9d2025ed1610e14cef1f3fd6ad2c24",
"shasum": ""
},
"require": {
@@ -669,7 +670,7 @@
"type": "tidelift"
}
],
"time": "2025-06-12T10:24:28+00:00"
"time": "2025-08-02T09:36:06+00:00"
},
{
"name": "psr/clock",
@@ -899,16 +900,16 @@
},
{
"name": "symfony/console",
"version": "v7.3.0",
"version": "v7.3.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "66c1440edf6f339fd82ed6c7caa76cb006211b44"
"reference": "5f360ebc65c55265a74d23d7fe27f957870158a1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/66c1440edf6f339fd82ed6c7caa76cb006211b44",
"reference": "66c1440edf6f339fd82ed6c7caa76cb006211b44",
"url": "https://api.github.com/repos/symfony/console/zipball/5f360ebc65c55265a74d23d7fe27f957870158a1",
"reference": "5f360ebc65c55265a74d23d7fe27f957870158a1",
"shasum": ""
},
"require": {
@@ -973,7 +974,7 @@
"terminal"
],
"support": {
"source": "https://github.com/symfony/console/tree/v7.3.0"
"source": "https://github.com/symfony/console/tree/v7.3.2"
},
"funding": [
{
@@ -984,12 +985,16 @@
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://github.com/nicolas-grekas",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2025-05-24T10:34:04+00:00"
"time": "2025-07-30T17:13:41+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -1060,16 +1065,16 @@
},
{
"name": "symfony/finder",
"version": "v7.3.0",
"version": "v7.3.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "ec2344cf77a48253bbca6939aa3d2477773ea63d"
"reference": "2a6614966ba1074fa93dae0bc804227422df4dfe"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/ec2344cf77a48253bbca6939aa3d2477773ea63d",
"reference": "ec2344cf77a48253bbca6939aa3d2477773ea63d",
"url": "https://api.github.com/repos/symfony/finder/zipball/2a6614966ba1074fa93dae0bc804227422df4dfe",
"reference": "2a6614966ba1074fa93dae0bc804227422df4dfe",
"shasum": ""
},
"require": {
@@ -1104,7 +1109,7 @@
"description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/finder/tree/v7.3.0"
"source": "https://github.com/symfony/finder/tree/v7.3.2"
},
"funding": [
{
@@ -1115,12 +1120,16 @@
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://github.com/nicolas-grekas",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2024-12-30T19:00:26+00:00"
"time": "2025-07-15T13:41:35+00:00"
},
{
"name": "symfony/polyfill-ctype",
@@ -1517,6 +1526,82 @@
],
"time": "2024-09-09T11:45:10+00:00"
},
{
"name": "symfony/polyfill-php84",
"version": "v1.32.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php84.git",
"reference": "000df7860439609837bbe28670b0be15783b7fbf"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/000df7860439609837bbe28670b0be15783b7fbf",
"reference": "000df7860439609837bbe28670b0be15783b7fbf",
"shasum": ""
},
"require": {
"php": ">=7.2"
},
"type": "library",
"extra": {
"thanks": {
"url": "https://github.com/symfony/polyfill",
"name": "symfony/polyfill"
}
},
"autoload": {
"files": [
"bootstrap.php"
],
"psr-4": {
"Symfony\\Polyfill\\Php84\\": ""
},
"classmap": [
"Resources/stubs"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony polyfill backporting some PHP 8.4+ features to lower PHP versions",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
"polyfill",
"portable",
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-php84/tree/v1.32.0"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2025-02-20T12:04:08+00:00"
},
{
"name": "symfony/process",
"version": "v7.3.0",
@@ -1663,16 +1748,16 @@
},
{
"name": "symfony/string",
"version": "v7.3.0",
"version": "v7.3.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
"reference": "f3570b8c61ca887a9e2938e85cb6458515d2b125"
"reference": "42f505aff654e62ac7ac2ce21033818297ca89ca"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/string/zipball/f3570b8c61ca887a9e2938e85cb6458515d2b125",
"reference": "f3570b8c61ca887a9e2938e85cb6458515d2b125",
"url": "https://api.github.com/repos/symfony/string/zipball/42f505aff654e62ac7ac2ce21033818297ca89ca",
"reference": "42f505aff654e62ac7ac2ce21033818297ca89ca",
"shasum": ""
},
"require": {
@@ -1730,7 +1815,7 @@
"utf8"
],
"support": {
"source": "https://github.com/symfony/string/tree/v7.3.0"
"source": "https://github.com/symfony/string/tree/v7.3.2"
},
"funding": [
{
@@ -1741,25 +1826,29 @@
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://github.com/nicolas-grekas",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2025-04-20T20:19:01+00:00"
"time": "2025-07-10T08:47:49+00:00"
},
{
"name": "symfony/translation",
"version": "v7.3.0",
"version": "v7.3.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
"reference": "4aba29076a29a3aa667e09b791e5f868973a8667"
"reference": "81b48f4daa96272efcce9c7a6c4b58e629df3c90"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/4aba29076a29a3aa667e09b791e5f868973a8667",
"reference": "4aba29076a29a3aa667e09b791e5f868973a8667",
"url": "https://api.github.com/repos/symfony/translation/zipball/81b48f4daa96272efcce9c7a6c4b58e629df3c90",
"reference": "81b48f4daa96272efcce9c7a6c4b58e629df3c90",
"shasum": ""
},
"require": {
@@ -1826,7 +1915,7 @@
"description": "Provides tools to internationalize your application",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/translation/tree/v7.3.0"
"source": "https://github.com/symfony/translation/tree/v7.3.2"
},
"funding": [
{
@@ -1837,12 +1926,16 @@
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://github.com/nicolas-grekas",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2025-05-29T07:19:49+00:00"
"time": "2025-07-30T17:31:46+00:00"
},
{
"name": "symfony/translation-contracts",
@@ -2000,16 +2093,16 @@
"packages-dev": [
{
"name": "myclabs/deep-copy",
"version": "1.13.1",
"version": "1.13.4",
"source": {
"type": "git",
"url": "https://github.com/myclabs/DeepCopy.git",
"reference": "1720ddd719e16cf0db4eb1c6eca108031636d46c"
"reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/1720ddd719e16cf0db4eb1c6eca108031636d46c",
"reference": "1720ddd719e16cf0db4eb1c6eca108031636d46c",
"url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/07d290f0c47959fd5eed98c95ee5602db07e0b6a",
"reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a",
"shasum": ""
},
"require": {
@@ -2048,7 +2141,7 @@
],
"support": {
"issues": "https://github.com/myclabs/DeepCopy/issues",
"source": "https://github.com/myclabs/DeepCopy/tree/1.13.1"
"source": "https://github.com/myclabs/DeepCopy/tree/1.13.4"
},
"funding": [
{
@@ -2056,20 +2149,20 @@
"type": "tidelift"
}
],
"time": "2025-04-29T12:36:36+00:00"
"time": "2025-08-01T08:46:24+00:00"
},
{
"name": "nikic/php-parser",
"version": "v5.5.0",
"version": "v5.6.1",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
"reference": "ae59794362fe85e051a58ad36b289443f57be7a9"
"reference": "f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/ae59794362fe85e051a58ad36b289443f57be7a9",
"reference": "ae59794362fe85e051a58ad36b289443f57be7a9",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2",
"reference": "f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2",
"shasum": ""
},
"require": {
@@ -2088,7 +2181,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "5.0-dev"
"dev-master": "5.x-dev"
}
},
"autoload": {
@@ -2112,9 +2205,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
"source": "https://github.com/nikic/PHP-Parser/tree/v5.5.0"
"source": "https://github.com/nikic/PHP-Parser/tree/v5.6.1"
},
"time": "2025-05-31T08:24:38+00:00"
"time": "2025-08-13T20:13:15+00:00"
},
{
"name": "phar-io/manifest",
@@ -2236,16 +2329,16 @@
},
{
"name": "phpstan/phpstan",
"version": "2.1.17",
"version": "2.1.22",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "89b5ef665716fa2a52ecd2633f21007a6a349053"
"reference": "41600c8379eb5aee63e9413fe9e97273e25d57e4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/89b5ef665716fa2a52ecd2633f21007a6a349053",
"reference": "89b5ef665716fa2a52ecd2633f21007a6a349053",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/41600c8379eb5aee63e9413fe9e97273e25d57e4",
"reference": "41600c8379eb5aee63e9413fe9e97273e25d57e4",
"shasum": ""
},
"require": {
@@ -2290,7 +2383,7 @@
"type": "github"
}
],
"time": "2025-05-21T20:55:28+00:00"
"time": "2025-08-04T19:17:37+00:00"
},
{
"name": "phpunit/php-code-coverage",
@@ -2615,16 +2708,16 @@
},
{
"name": "phpunit/phpunit",
"version": "10.5.46",
"version": "10.5.52",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "8080be387a5be380dda48c6f41cee4a13aadab3d"
"reference": "5be558244941fba07788b6bb42dc5fc84429580c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8080be387a5be380dda48c6f41cee4a13aadab3d",
"reference": "8080be387a5be380dda48c6f41cee4a13aadab3d",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/5be558244941fba07788b6bb42dc5fc84429580c",
"reference": "5be558244941fba07788b6bb42dc5fc84429580c",
"shasum": ""
},
"require": {
@@ -2634,7 +2727,7 @@
"ext-mbstring": "*",
"ext-xml": "*",
"ext-xmlwriter": "*",
"myclabs/deep-copy": "^1.13.1",
"myclabs/deep-copy": "^1.13.4",
"phar-io/manifest": "^2.0.4",
"phar-io/version": "^3.2.1",
"php": ">=8.1",
@@ -2651,7 +2744,7 @@
"sebastian/exporter": "^5.1.2",
"sebastian/global-state": "^6.0.2",
"sebastian/object-enumerator": "^5.0.0",
"sebastian/recursion-context": "^5.0.0",
"sebastian/recursion-context": "^5.0.1",
"sebastian/type": "^4.0.0",
"sebastian/version": "^4.0.1"
},
@@ -2696,7 +2789,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
"source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.46"
"source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.52"
},
"funding": [
{
@@ -2720,7 +2813,7 @@
"type": "tidelift"
}
],
"time": "2025-05-02T06:46:24+00:00"
"time": "2025-08-16T05:17:33+00:00"
},
{
"name": "sebastian/cli-parser",
@@ -3468,23 +3561,23 @@
},
{
"name": "sebastian/recursion-context",
"version": "5.0.0",
"version": "5.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/recursion-context.git",
"reference": "05909fb5bc7df4c52992396d0116aed689f93712"
"reference": "47e34210757a2f37a97dcd207d032e1b01e64c7a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/05909fb5bc7df4c52992396d0116aed689f93712",
"reference": "05909fb5bc7df4c52992396d0116aed689f93712",
"url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/47e34210757a2f37a97dcd207d032e1b01e64c7a",
"reference": "47e34210757a2f37a97dcd207d032e1b01e64c7a",
"shasum": ""
},
"require": {
"php": ">=8.1"
},
"require-dev": {
"phpunit/phpunit": "^10.0"
"phpunit/phpunit": "^10.5"
},
"type": "library",
"extra": {
@@ -3519,15 +3612,28 @@
"homepage": "https://github.com/sebastianbergmann/recursion-context",
"support": {
"issues": "https://github.com/sebastianbergmann/recursion-context/issues",
"source": "https://github.com/sebastianbergmann/recursion-context/tree/5.0.0"
"security": "https://github.com/sebastianbergmann/recursion-context/security/policy",
"source": "https://github.com/sebastianbergmann/recursion-context/tree/5.0.1"
},
"funding": [
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
},
{
"url": "https://liberapay.com/sebastianbergmann",
"type": "liberapay"
},
{
"url": "https://thanks.dev/u/gh/sebastianbergmann",
"type": "thanks_dev"
},
{
"url": "https://tidelift.com/funding/github/packagist/sebastian/recursion-context",
"type": "tidelift"
}
],
"time": "2023-02-03T07:05:40+00:00"
"time": "2025-08-10T07:50:56+00:00"
},
{
"name": "sebastian/type",
+3 -3
View File
@@ -7,19 +7,19 @@
}:
php.buildComposerProject2 (finalAttrs: {
pname = "laravel";
version = "5.16.0";
version = "5.17.0";
src = fetchFromGitHub {
owner = "laravel";
repo = "installer";
tag = "v${finalAttrs.version}";
hash = "sha256-A2DUa1TD9xeZ8zyIVOGgPEnY/UrDSzVpC32JNg5OpyU=";
hash = "sha256-SprGPKpXQoks1eB9XLO6ms7q09q/QFutukEk4VfhXOM=";
};
nativeBuildInputs = [ makeWrapper ];
composerLock = ./composer.lock;
vendorHash = "sha256-2mUC6uu9DS0FJaKiiNVCUSZoEW5+bpkUlrWHZV+pzL0=";
vendorHash = "sha256-R1+IUKkmThbTN21rxP6CGilTn9R3E7irGND2YDm3RjI=";
# Adding npm (nodejs) and php composer to path
postInstall = ''
+2 -2
View File
@@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libsupermesh";
version = "2025.3.0";
version = "2025.4";
src = fetchFromGitHub {
owner = "firedrakeproject";
repo = "libsupermesh";
tag = "v${finalAttrs.version}";
hash = "sha256-RKBi89bUhkbRATaSB8629D+/NeYE3YNDIMEGzSK8z04=";
hash = "sha256-VIGfuSVneCBapZyU0GXyi6isUSdhD2Ylm4mCymSvzbo=";
};
strictDeps = true;
+3 -3
View File
@@ -10,7 +10,7 @@
nix-update-script,
}:
let
version = "0.8.1";
version = "0.9.0";
in
rustPlatform.buildRustPackage {
pname = "manga-tui";
@@ -20,10 +20,10 @@ rustPlatform.buildRustPackage {
owner = "josueBarretogit";
repo = "manga-tui";
rev = "v${version}";
hash = "sha256-CAmXTAUlwdc4iGzXonoYPd1okqgA4hWgR9bnsPsuDus=";
hash = "sha256-Q+zTYdAaCztYYtSgHK1X7oE8Q7oHYpf+hAfGAzU4HoA=";
};
cargoHash = "sha256-viiL1LcBbWuKA+jgkAPc9gpI7wQu4UXfO5DSPm26ido=";
cargoHash = "sha256-FW+nrpFsQl38iqmhMyMmSvF/0W0iVy5+/Hyun8bWJP4=";
nativeBuildInputs = [ pkg-config ];
@@ -2,8 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
python3,
python3Packages,
openssl,
libiconv,
cargo,
@@ -13,10 +12,7 @@
nix-update-script,
}:
let
plugins = python3.pkgs.callPackage ./plugins { };
in
python3.pkgs.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.136.0";
format = "pyproject";
@@ -33,29 +29,13 @@ python3.pkgs.buildPythonApplication rec {
hash = "sha256-GX4lVg6aPVlqFgSSGsUg3wi7bne9jVWPTVx8rO5SjL8=";
};
postPatch = ''
# Remove setuptools_rust from runtime dependencies
# https://github.com/element-hq/synapse/blob/v1.69.0/pyproject.toml#L177-L185
sed -i '/^setuptools_rust =/d' pyproject.toml
# Remove version pin on build dependencies. Upstream does this on purpose to
# be extra defensive, but we don't want to deal with updating this
sed -i 's/"poetry-core>=\([0-9.]*\),<=[0-9.]*"/"poetry-core>=\1"/' pyproject.toml
sed -i 's/"setuptools_rust>=\([0-9.]*\),<=[0-9.]*"/"setuptools_rust>=\1"/' pyproject.toml
# Don't force pillow to be 10.0.1 because we already have patched it, and
# we don't use the pillow wheels.
sed -i 's/Pillow = ".*"/Pillow = ">=5.4.0"/' pyproject.toml
# https://github.com/element-hq/synapse/pull/17878#issuecomment-2575412821
substituteInPlace tests/storage/databases/main/test_events_worker.py \
--replace-fail "def test_recovery" "def no_test_recovery"
'';
nativeBuildInputs = with python3.pkgs; [
build-system = with python3Packages; [
poetry-core
rustPlatform.cargoSetupHook
setuptools-rust
];
nativeBuildInputs = [
rustPlatform.cargoSetupHook
cargo
rustc
];
@@ -67,8 +47,10 @@ python3.pkgs.buildPythonApplication rec {
libiconv
];
propagatedBuildInputs =
with python3.pkgs;
pythonRemoveDeps = [ "setuptools_rust" ];
dependencies =
with python3Packages;
[
attrs
bcrypt
@@ -103,7 +85,7 @@ python3.pkgs.buildPythonApplication rec {
]
++ twisted.optional-dependencies.tls;
optional-dependencies = with python3.pkgs; {
optional-dependencies = with python3Packages; {
postgres =
if isPyPy then
[
@@ -143,11 +125,11 @@ python3.pkgs.buildPythonApplication rec {
nativeCheckInputs = [
openssl
]
++ (with python3.pkgs; [
++ (with python3Packages; [
mock
parameterized
])
++ builtins.filter (p: !p.meta.broken) (lib.flatten (lib.attrValues optional-dependencies));
++ lib.filter (pkg: !pkg.meta.broken) (lib.flatten (lib.attrValues optional-dependencies));
doCheck = !stdenv.hostPlatform.isDarwin;
@@ -164,15 +146,15 @@ python3.pkgs.buildPythonApplication rec {
NIX_BUILD_CORES=4
fi
PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial -j $NIX_BUILD_CORES tests
PYTHONPATH=".:$PYTHONPATH" ${python3Packages.python.interpreter} -m twisted.trial -j $NIX_BUILD_CORES tests
runHook postCheck
'';
passthru = {
tests = { inherit (nixosTests) matrix-synapse matrix-synapse-workers; };
inherit plugins;
python = python3;
plugins = python3Packages.callPackage ./plugins { };
inherit (python3Packages) python;
updateScript = nix-update-script { };
};
@@ -183,5 +165,6 @@ python3.pkgs.buildPythonApplication rec {
license = lib.licenses.agpl3Plus;
maintainers = with lib.maintainers; [ sumnerevans ];
teams = [ lib.teams.matrix ];
platforms = lib.platforms.linux;
};
}
+2 -2
View File
@@ -9,14 +9,14 @@
python3Packages.buildPythonApplication rec {
pname = "mbake";
version = "1.3.1";
version = "1.4.1.pre";
pyproject = true;
src = fetchFromGitHub {
owner = "EbodShojaei";
repo = "bake";
tag = "v${version}";
hash = "sha256-gQsie4/iUIe4g6ZH8bL33xW6CNxSg/sh429P4Xv0GjQ=";
hash = "sha256-HbBibwrd73GA0Z3xiYJAu1te7BADqsSkk0d99bMrwPw=";
};
build-system = [
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "mdq";
version = "0.7.2";
version = "0.9.0";
src = fetchFromGitHub {
owner = "yshavit";
repo = "mdq";
tag = "v${finalAttrs.version}";
hash = "sha256-QGva+yuiNwez8z9j4SL8vpcHdUm8nxRFn+6WiZgdWjQ=";
hash = "sha256-Ys5Ol/j4IZ4SNp6TjryfHCIgWoEu3ToNp7ffiTZp5BE=";
};
cargoHash = "sha256-k+St07jA+F+c4md9OzFiDp9idie6zoNI65HEQ2JqynM=";
cargoHash = "sha256-fwFi/OYlTqRuDDE2TKuvf9T7u0hLyrDejhOwjFDYHAk=";
passthru.updateScript = nix-update-script { };
+3 -3
View File
@@ -4,7 +4,7 @@
fetchFromGitHub,
nixosTests,
nix-update-script,
version ? "1.17.1",
version ? "1.18.0",
}:
let
@@ -15,11 +15,11 @@ let
# the meilisearch module accordingly and to remove the meilisearch_1_11
# attribute from all-packages.nix at that point too.
hashes = {
"1.17.1" = "sha256-krl8993p7fm3x7mJTrEDPjifB4sbmXb5gtLqHMYoIc0=";
"1.18.0" = "sha256-43+/pu3iuoaZ8c2x1PWyVsQqQrFd+EFpvEicABpoeqg=";
"1.11.3" = "sha256-CVofke9tOGeDEhRHEt6EYwT52eeAYNqlEd9zPpmXQ2U=";
};
cargoHashes = {
"1.17.1" = "sha256-4g9CpdBAjMv8mQ1dXj02lCyTFaMp62HlcdcsdhIL744=";
"1.18.0" = "sha256-mM5moa1GRPrg6NhmsOHtxAZEvoyaEvoCmm0FMTNmYE4=";
"1.11.3" = "sha256-cEJTokDJQuc9Le5+3ObMDNJmEhWEb+Qh0TV9xZkD9D8=";
};
in
+16 -15
View File
@@ -1,26 +1,26 @@
{
lib,
fetchFromGitHub,
fetchpatch,
pkg-config,
ffmpeg,
rustPlatform,
glib,
installShellFiles,
asciidoc,
versionCheckHook,
}:
rustPlatform.buildRustPackage {
rustPlatform.buildRustPackage (finalAttrs: {
pname = "metadata";
version = "0.1.9";
version = "0.1.10";
src = fetchFromGitHub {
owner = "zmwangx";
repo = "metadata";
rev = "ec9614cfa64ffc95d74e4b19496ebd9b026e692b";
hash = "sha256-ugirYg3l+zIfKAqp2smLgG99mX9tsy9rmGe6lFAwx5o=";
tag = "v${finalAttrs.version}";
hash = "sha256-wZ1wLygPFBFZsSYJGxNzYV+mXtbN68GY3nMYDFHPZHo=";
};
cargoHash = "sha256-CqPRhfhTAEXTXRAJ9T5gQZx5jAQmJXYPbfQmyXkO6Sk=";
cargoHash = "sha256-pWekXsjAhK4wyjf95nZO+Wj9PcH87D8vYsRFAE/w/sw=";
nativeBuildInputs = [
pkg-config
@@ -29,14 +29,6 @@ rustPlatform.buildRustPackage {
rustPlatform.bindgenHook
];
cargoPatches = [
(fetchpatch {
name = "update-crate-ffmpeg-next-version.patch";
url = "https://github.com/myclevorname/metadata/commit/a1bc9f53d9aa0aeb17cbb530a1da1de4fdf85328.diff";
hash = "sha256-LEwOK1UFUwLZhqLnoUor5CSOwz4DDjNFMnMOGq1S1Sc=";
})
];
postBuild = ''
a2x --doctype manpage --format manpage man/metadata.1.adoc
'';
@@ -51,6 +43,15 @@ rustPlatform.buildRustPackage {
env.FFMPEG_DIR = ffmpeg.dev;
checkFlags = [
# "AAC (HE-AAC v2)" is reported as "AAC (LC)" in newer ffmpeg
# https://github.com/zmwangx/metadata/issues/13
"--skip=aac_he_aac"
];
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
meta = {
description = "Media metadata parser and formatter designed for human consumption, powered by FFmpeg";
maintainers = with lib.maintainers; [ ];
@@ -58,4 +59,4 @@ rustPlatform.buildRustPackage {
homepage = "https://github.com/zmwangx/metadata";
mainProgram = "metadata";
};
}
})
@@ -12,13 +12,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "nezha-theme-nazhua";
version = "0.6.6";
version = "0.7.0";
src = fetchFromGitHub {
owner = "hi2shark";
repo = "nazhua";
tag = "v${finalAttrs.version}";
hash = "sha256-Flx0yHhYGDM9qPIsE1ZfjdmuWXbDTodnaiVK7Hee3Z4=";
hash = "sha256-zzdfttj6yURNgB0uS1DtwIREWbd88+oIkgiupjw/8oA=";
};
yarnOfflineCache = fetchYarnDeps {
+4 -4
View File
@@ -20,13 +20,13 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "readest";
version = "0.9.72";
version = "0.9.75";
src = fetchFromGitHub {
owner = "readest";
repo = "readest";
tag = "v${finalAttrs.version}";
hash = "sha256-TaE/u6LmKRe0yHPjaMIXpDOx/QNlBEJv2aw6/ihlkwc=";
hash = "sha256-lmBQl4cl8ujUKTkml8Tt/m2K7mh0U8K/sjSSOpN2gKI=";
fetchSubmodules = true;
};
@@ -40,12 +40,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
pnpmDeps = pnpm_9.fetchDeps {
inherit (finalAttrs) pname version src;
fetcherVersion = 1;
hash = "sha256-EF7HCSxgL/6a45yaKboe812LxCtnvTF2XGVD1AfmoUc=";
hash = "sha256-3H+HEQcXUbmTp+Gu7xz/NpxJgrnw1ubWH79yYKhFTeM=";
};
pnpmRoot = "../..";
cargoHash = "sha256-rt5QeKK7SChvz3Wi+Y2YY1fWak5xs2p3muJgPxcYUrs=";
cargoHash = "sha256-z4S5LqGM92jKnc/bcuPNA3tHfuloH4P6/5hDjJ+Tzs0=";
cargoRoot = "../..";
+2 -2
View File
@@ -22,13 +22,13 @@
stdenv.mkDerivation rec {
pname = "sirikali";
version = "1.8.2";
version = "1.8.3";
src = fetchFromGitHub {
owner = "mhogomchungu";
repo = "sirikali";
rev = version;
hash = "sha256-rfmWtbPYtkaGemeStMWwA6JllOkDiHMftSfmirtAOEQ=";
hash = "sha256-phZvytma4PsH4RZxWDORyall2qjS9rdLzUQId5IU6qY=";
};
buildInputs = [
+2 -6
View File
@@ -29,11 +29,11 @@
stdenv.mkDerivation rec {
pname = "spice";
version = "0.15.2";
version = "0.16.0";
src = fetchurl {
url = "https://www.spice-space.org/download/releases/spice-server/${pname}-${version}.tar.bz2";
sha256 = "sha256-bZ62EX8DkXRxxLwQAEq+z/SKefuF64WhxF8CM3cBW4E=";
sha256 = "sha256-Cm7JUo8FNxJhu7LUb/Nee1xF/4m7l1qZr5Wl8g/0cX0=";
};
patches = [
@@ -46,7 +46,6 @@ stdenv.mkDerivation rec {
ninja
pkg-config
python3
python3.pkgs.six
python3.pkgs.pyparsing
];
@@ -85,9 +84,6 @@ stdenv.mkDerivation rec {
postPatch = ''
patchShebangs build-aux
# Forgotten in 0.15.2 tarball
sed -i /meson.add_dist_script/d meson.build
'';
postInstall = ''
+640 -574
View File
File diff suppressed because it is too large Load Diff
+5 -5
View File
@@ -12,13 +12,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "stirling-pdf";
version = "1.0.2";
version = "1.2.0";
src = fetchFromGitHub {
owner = "Stirling-Tools";
repo = "Stirling-PDF";
rev = "v${finalAttrs.version}";
hash = "sha256-mO1fOmkLDUFz46/d1+TF24pDBRNoteQ+hlrwgIRV8EQ=";
hash = "sha256-g5ugvnnFUXBfYFN1Z5+m9HTVSZ5KS9HGkIte3lKi/sA=";
};
patches = [
@@ -52,9 +52,9 @@ stdenv.mkDerivation (finalAttrs: {
installPhase = ''
runHook preInstall
install -Dm644 ./stirling-pdf/build/libs/stirling-pdf-*.jar $out/share/stirling-pdf/Stirling-PDF.jar
makeWrapper ${jre}/bin/java $out/bin/Stirling-PDF \
--add-flags "-jar $out/share/stirling-pdf/Stirling-PDF.jar"
install -Dm644 ./app/core/build/libs/stirling-pdf-*.jar $out/share/stirling-pdf/Stirling-PDF.jar
makeWrapper ${lib.getExe jre} $out/bin/Stirling-PDF \
--add-flags "-jar $out/share/stirling-pdf/Stirling-PDF.jar"
runHook postInstall
'';
@@ -1,12 +1,12 @@
diff --git a/build.gradle b/build.gradle
index 3dba68da..fde06f16 100644
index 2c151d1..4c03638 100644
--- a/build.gradle
+++ b/build.gradle
@@ -75,6 +75,7 @@ tasks.register('writeVersion') {
def props = new Properties()
props.setProperty("version", version)
props.store(propsFile.newWriter(), null)
+ propsFile.text = propsFile.readLines().tail().join('\n')
}
@@ -69,7 +69,6 @@ allprojects {
tasks.register('writeVersion', WriteProperties) {
outputFile = layout.projectDirectory.file('app/common/src/main/resources/version.properties')
println "Writing version.properties to ${outputFile.path}"
- comment = "${new Date()}"
property 'version', project.provider { project.version.toString() }
}
+14 -4
View File
@@ -7,16 +7,16 @@
}:
buildNpmPackage (finalAttrs: {
pname = "task-master-ai";
version = "0.19.0";
version = "0.25.1";
src = fetchFromGitHub {
owner = "eyaltoledano";
repo = "claude-task-master";
tag = "v${finalAttrs.version}";
hash = "sha256-OxfY1F30MKrv6sv3ksEy6wMRpWAg5d47w62dA6IDul8=";
tag = "task-master-ai@${finalAttrs.version}";
hash = "sha256-7Vs8k8/ym2K+FzX3fAke344S9gEhjPCnzz1z+OlounE=";
};
npmDepsHash = "sha256-GStmiG+ZwRQl4pQD3Q0lonCsnwB2ReoC5b9vEPGZ5+o=";
npmDepsHash = "sha256-6dPIZtbTmLVrJgaSAZE7pT1+xbKVkBS+UF8xfy/micc=";
dontNpmBuild = true;
@@ -24,6 +24,16 @@ buildNpmPackage (finalAttrs: {
passthru.updateScript = nix-update-script { };
postInstall = ''
mkdir -p $out/lib/node_modules/task-master-ai/apps
cp -r apps/extension $out/lib/node_modules/task-master-ai/apps/extension
cp -r apps/docs $out/lib/node_modules/task-master-ai/apps/docs
'';
env = {
PUPPETEER_SKIP_DOWNLOAD = 1;
};
meta = with lib; {
description = "Node.js agentic AI workflow orchestrator";
homepage = "https://task-master.dev";
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "tenv";
version = "4.7.6";
version = "4.7.7";
src = fetchFromGitHub {
owner = "tofuutils";
repo = "tenv";
tag = "v${version}";
hash = "sha256-zgkHE1Vvm2pLBXvpRJyWHHEDL32PDS9Xy8hy48BrO7o=";
hash = "sha256-7cFPlrfbKmYLi02LnERFddYzZqH4/HYt407h8eX6tew=";
};
vendorHash = "sha256-acJNxu7M3YOBcQ3KY9qL9vpBoaYIZRUtIDuvkLgATTc=";
vendorHash = "sha256-kp2/R3zo+Q+ofFBeHwKoSztj7dmLIdaS6NILEFhdG2o=";
excludedPackages = [ "tools" ];
+3 -3
View File
@@ -24,13 +24,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "vcpkg-tool";
version = "2025-05-19";
version = "2025-07-21";
src = fetchFromGitHub {
owner = "microsoft";
repo = "vcpkg-tool";
rev = finalAttrs.version;
hash = "sha256-st9VLiuvKHKkokUToxw4KQ4aekGMqx8rfVBmmeddgVk=";
hash = "sha256-Q2CLqlHItNr4H4xFcuGd0BqootxsInZQ3unTZ7vtz8E=";
};
nativeBuildInputs = [
@@ -176,7 +176,7 @@ stdenv.mkDerivation (finalAttrs: {
install -Dm555 "$vcpkgWrapperPath" "$out/bin/vcpkg"
'';
passthru.tests = {
passthru.tests = lib.optionalAttrs doWrap {
testWrapper = runCommand "vcpkg-tool-test-wrapper" { buildInputs = [ finalAttrs.finalPackage ]; } ''
export NIX_VCPKG_DEBUG_PRINT_ENVVARS=true
export VCPKG_ROOT=.
+2 -2
View File
@@ -9,13 +9,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "vcpkg";
version = "2025.04.09";
version = "2025.07.25";
src = fetchFromGitHub {
owner = "microsoft";
repo = "vcpkg";
tag = finalAttrs.version;
hash = "sha256-ZJu3dFsKc7L2THgGXNtBszXUbEEoM3bnLxtf5x5UPTM=";
hash = "sha256-1v4IaHDsKipmpkuh+Xx52j3Li98MtG6BYL15rhWJC1w=";
leaveDotGit = true;
postFetch = ''
cd "$out"
+3 -3
View File
@@ -13,13 +13,13 @@
stdenv.mkDerivation {
pname = "wdt";
version = "1.27.1612021-unstable-2025-08-06";
version = "1.27.1612021-unstable-2025-08-20";
src = fetchFromGitHub {
owner = "facebook";
repo = "wdt";
rev = "b868ad1fcee52c9686d3101bd46a00c48b68ae53";
sha256 = "sha256-3N81m+T2uhNhZ+JSBS2yxsEfYMG2/ppgStDt53j36dY=";
rev = "a1261138b955b3bf6fdd741ac9b82e0721bb0c84";
sha256 = "sha256-zux6b2XRIqr+VFvB61no30oS6om9GpWOKVczY+cUOOU=";
};
nativeBuildInputs = [ cmake ];
@@ -19,4 +19,10 @@ builtins.mapAttrs mkRenamed {
path = "cudaPackages.cudaMajorMinorVersion";
package = final.cudaMajorMinorVersion;
};
cudatoolkit-legacy-runfile = {
path = "cudaPackages.cudatoolkit";
package = final.cudatoolkit;
};
}
@@ -1,349 +0,0 @@
{
cudaMajorMinorVersion,
cudaAtLeast,
runPatches ? [ ],
autoPatchelfHook,
autoAddDriverRunpath,
addDriverRunpath,
alsa-lib,
curlMinimal,
expat,
fetchurl,
fontconfig,
freetype,
gdk-pixbuf,
glib,
glibc,
gst_all_1,
gtk2,
lib,
libxcrypt-legacy,
libxkbcommon,
libkrb5,
libxml2_13,
krb5,
makeWrapper,
markForCudatoolkitRootHook,
ncurses5,
ncurses6,
numactl,
nss,
patchelf,
perl,
python3, # FIXME: CUDAToolkit 10 may still need python27
python310,
python311,
python312,
pulseaudio,
setupCudaHook,
stdenv,
backendStdenv, # E.g. gcc11Stdenv, set in extension.nix
unixODBC,
wayland,
xorg,
zlib,
libtiff,
qt6Packages,
qt6,
rdma-core,
ucx,
rsync,
libglvnd,
}:
let
# Version info for the classic cudatoolkit packages that contain everything that is in redist.
releases = builtins.import ./releases.nix;
release = releases.${cudaMajorMinorVersion};
in
backendStdenv.mkDerivation {
pname = "cudatoolkit";
inherit (release) version;
inherit runPatches;
dontPatchELF = true;
dontStrip = true;
src = fetchurl { inherit (release) url sha256; };
outputs = [
"out"
"lib"
"doc"
];
nativeBuildInputs = [
perl
makeWrapper
rsync
addDriverRunpath
autoPatchelfHook
autoAddDriverRunpath
markForCudatoolkitRootHook
qt6Packages.wrapQtAppsHook
];
propagatedBuildInputs = [ setupCudaHook ];
buildInputs = [
# To get $GDK_PIXBUF_MODULE_FILE via setup-hook
gdk-pixbuf
# For autoPatchelf
ncurses5
expat
python3
zlib
glibc
xorg.libX11
xorg.libXext
xorg.libXrender
xorg.libXt
xorg.libXtst
xorg.libXi
xorg.libXext
xorg.libXdamage
xorg.libxcb
xorg.xcbutilimage
xorg.xcbutilrenderutil
xorg.xcbutilwm
xorg.xcbutilkeysyms
pulseaudio
libxkbcommon
libkrb5
krb5
gtk2
glib
fontconfig
freetype
numactl
nss
unixODBC
alsa-lib
wayland
libglvnd
(lib.getLib libtiff)
qt6Packages.qtwayland
rdma-core
(ucx.override { enableCuda = false; }) # Avoid infinite recursion
xorg.libxshmfence
xorg.libxkbfile
]
++ map lib.getLib (
[
# Used by `/target-linux-x64/CollectX/clx` and `/target-linux-x64/CollectX/libclx_api.so` for:
# - `libcurl.so.4`
curlMinimal
# Used by `/host-linux-x64/Scripts/WebRTCContainer/setup/neko/server/bin/neko`
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
]
++ (with qt6; [
qtmultimedia
qttools
qtpositioning
qtscxml
qtsvg
qtwebchannel
qtwebengine
])
)
++ [
# libcrypt.so.1
libxcrypt-legacy
ncurses6
python310
python311
]
++ lib.optionals (cudaAtLeast "12.9") [
libxml2_13
python312
];
# Prepended to runpaths by autoPatchelf.
# The order inherited from older rpath preFixup code
runtimeDependencies = [
(placeholder "lib")
(placeholder "out")
"${placeholder "out"}/nvvm"
# NOTE: use the same libstdc++ as the rest of nixpkgs, not from backendStdenv
"${lib.getLib stdenv.cc.cc}/lib64"
"${placeholder "out"}/jre/lib/amd64/jli"
"${placeholder "out"}/lib64"
"${placeholder "out"}/nvvm/lib64"
];
autoPatchelfIgnoreMissingDeps = [
# This is the hardware-dependent userspace driver that comes from
# nvidia_x11 package. It must be deployed at runtime in
# /run/opengl-driver/lib or pointed at by LD_LIBRARY_PATH variable, rather
# than pinned in runpath
"libcuda.so.1"
# Similar to libcuda.so.1, this is part of the driver package.
"libnvidia-ml.so.1"
# The krb5 expression ships libcom_err.so.3 but cudatoolkit asks for the
# older
# This dependency is asked for by target-linux-x64/CollectX/RedHat/x86_64/libssl.so.10
# - do we even want to use nvidia-shipped libssl?
"libcom_err.so.2"
];
preFixup = ''
${lib.getExe' patchelf "patchelf"} $out/lib64/libnvrtc.so --add-needed libnvrtc-builtins.so
'';
unpackPhase = ''
sh $src --keep --noexec
'';
installPhase = ''
runHook preInstall
mkdir $out
mkdir -p $out/bin $out/lib64 $out/include $doc
for dir in pkg/builds/* pkg/builds/cuda_nvcc/nvvm pkg/builds/cuda_cupti/extras/CUPTI; do
if [ -d $dir/bin ]; then
mv $dir/bin/* $out/bin
fi
if [ -d $dir/doc ]; then
(cd $dir/doc && find . -type d -exec mkdir -p $doc/\{} \;)
(cd $dir/doc && find . \( -type f -o -type l \) -exec mv \{} $doc/\{} \;)
fi
if [ -L $dir/include ] || [ -d $dir/include ]; then
(cd $dir/include && find . -type d -exec mkdir -p $out/include/\{} \;)
(cd $dir/include && find . \( -type f -o -type l \) -exec mv \{} $out/include/\{} \;)
fi
if [ -L $dir/lib64 ] || [ -d $dir/lib64 ]; then
(cd $dir/lib64 && find . -type d -exec mkdir -p $out/lib64/\{} \;)
(cd $dir/lib64 && find . \( -type f -o -type l \) -exec mv \{} $out/lib64/\{} \;)
fi
done
mv pkg/builds/cuda_nvcc/nvvm $out/nvvm
mv pkg/builds/cuda_sanitizer_api $out/cuda_sanitizer_api
ln -s $out/cuda_sanitizer_api/compute-sanitizer/compute-sanitizer $out/bin/compute-sanitizer
mv pkg/builds/nsight_systems/target-linux-x64 $out/target-linux-x64
mv pkg/builds/nsight_systems/host-linux-x64 $out/host-linux-x64
rm $out/host-linux-x64/libstdc++.so*
''
# Use Qt plugins built by Nix.
+ ''
for qtlib in $out/host-linux-x64/Plugins/*/libq*.so; do
qtdir=$(basename $(dirname $qtlib))
filename=$(basename $qtlib)
for qtpkgdir in ${
lib.concatMapStringsSep " " (x: qt6Packages.${x}) [
"qtbase"
"qtimageformats"
"qtsvg"
"qtwayland"
]
}; do
if [ -e $qtpkgdir/lib/qt-6/plugins/$qtdir/$filename ]; then
ln -snf $qtpkgdir/lib/qt-6/plugins/$qtdir/$filename $qtlib
fi
done
done
rm -f $out/tools/CUDA_Occupancy_Calculator.xls # FIXME: why?
rm $out/host-linux-x64/libQt6*
# Fixup path to samples (needed for cuda 6.5 or else nsight will not find them)
if [ -d "$out"/cuda-samples ]; then
mv "$out"/cuda-samples "$out"/samples
fi
# Change the #error on GCC > 4.9 to a #warning.
sed -i $out/include/host_config.h -e 's/#error\(.*unsupported GNU version\)/#warning\1/'
# Fix builds with newer glibc version
sed -i "1 i#define _BITS_FLOATN_H" "$out/include/host_defines.h"
''
+
# Point NVCC at a compatible compiler
# CUDA_TOOLKIT_ROOT_DIR is legacy,
# Cf. https://cmake.org/cmake/help/latest/module/FindCUDA.html#input-variables
''
mkdir -p $out/nix-support
cat <<EOF >> $out/nix-support/setup-hook
cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out'
EOF
# Move some libraries to the lib output so that programs that
# depend on them don't pull in this entire monstrosity.
mkdir -p $lib/lib
mv -v $out/lib64/libcudart* $lib/lib/
# Remove OpenCL libraries as they are provided by ocl-icd and driver.
rm -f $out/lib64/libOpenCL*
# nvprof do not find any program to profile if LD_LIBRARY_PATH is not set
wrapProgram $out/bin/nvprof \
--prefix LD_LIBRARY_PATH : $out/lib
''
# 12.9 includes a broken symlink, include/include, pointing to targets/x86_64-linux/include
# and another, lib64/lib64, pointing to lib/targets/x86_64-linux/lib
+ lib.optionalString (cudaMajorMinorVersion == "12.9") ''
rm $out/include/include
rm $out/lib64/lib64
''
# Python 3.8 and 3.9 are not in nixpkgs anymore, delete Python 3.{8,9} cuda-gdb support
# to avoid autopatchelf failing to find libpython3.{8,9}.so.
+ ''
find $out -name '*python3.8*' -delete
find $out -name '*python3.9*' -delete
''
+ ''
runHook postInstall
'';
postInstall = ''
for b in nvvp; do
wrapProgram "$out/bin/$b" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
done
''
# Check we don't have any lurking vendored qt libraries that weren't
# replaced during installPhase
+ ''
qtlibfiles=$(find $out -name "libq*.so" -type f)
if [ ! -z "$qtlibfiles" ]; then
echo "Found unexpected vendored Qt library files in $out" >&2
echo $qtlibfiles >&2
echo "These should be replaced with symlinks in installPhase" >&2
exit 1
fi
'';
# cuda-gdb doesn't run correctly when not using sandboxing, so
# temporarily disabling the install check. This should be set to true
# when we figure out how to get `cuda-gdb --version` to run correctly
# when not using sandboxing.
doInstallCheck = false;
postInstallCheck = ''
# Smoke test binaries
pushd $out/bin
for f in *; do
case $f in
crt) continue;;
nvcc.profile) continue;;
nsight_ee_plugins_manage.sh) continue;;
uninstall_cuda_toolkit_6.5.pl) continue;;
computeprof|nvvp|nsight) continue;; # GUIs don't feature "--version"
*) echo "Executing '$f --version':"; ./$f --version;;
esac
done
popd
'';
meta = with lib; {
description = "Deprecated runfile-based CUDAToolkit installation (a compiler for NVIDIA GPUs, math libraries, and tools)";
homepage = "https://developer.nvidia.com/cuda-toolkit";
platforms = [ "x86_64-linux" ];
license = licenses.nvidiaCuda;
teams = [ teams.cuda ];
};
}
@@ -1,72 +0,0 @@
# Type Aliases
# CudaVersion = String (two-component version, e.g. "10.0")
# Release = {
# version: String
# - The version of CUDA.
# url: String
# - The URL to download the CUDA installer from.
# sha256: String
# - The SHA256 checksum of the CUDA installer.
# }
# Releases = AttrSet CudaVersion Release
{
"11.8" = {
version = "11.8.0";
url = "https://developer.download.nvidia.com/compute/cuda/11.8.0/local_installers/cuda_11.8.0_520.61.05_linux.run";
sha256 = "sha256-kiPErzrr5Ke77Zq9mxY7A6GzS4VfvCtKDRtwasCaWhY=";
};
"12.0" = {
version = "12.0.1";
url = "https://developer.download.nvidia.com/compute/cuda/12.0.1/local_installers/cuda_12.0.1_525.85.12_linux.run";
sha256 = "sha256-GyBaBicvFGP0dydv2rkD8/ZmkXwGjlIHOAAeacehh1s=";
};
"12.1" = {
version = "12.1.1";
url = "https://developer.download.nvidia.com/compute/cuda/12.1.1/local_installers/cuda_12.1.1_530.30.02_linux.run";
sha256 = "sha256-10Ai1B2AEFMZ36Ib7qObd6W5kZU5wEh6BcqvJEbWpw4=";
};
"12.2" = {
version = "12.2.2";
url = "https://developer.download.nvidia.com/compute/cuda/12.2.2/local_installers/cuda_12.2.2_535.104.05_linux.run";
sha256 = "sha256-Kzmq4+dhjZ9Zo8j6HxvGHynAsODfdfsFB2uts1KVLvI=";
};
"12.3" = {
version = "12.3.2";
url = "https://developer.download.nvidia.com/compute/cuda/12.3.2/local_installers/cuda_12.3.2_545.23.08_linux.run";
sha256 = "sha256-JLKvyfdw2M9D1vp63C6/1HxAhNsBvdoc484KTUk7pls=";
};
"12.4" = {
version = "12.4.1";
url = "https://developer.download.nvidia.com/compute/cuda/12.4.1/local_installers/cuda_12.4.1_550.54.15_linux.run";
sha256 = "sha256-Nn0imbOkWIq0h6bScnbKXZ6tbjlJBPGLzLnhJDO5xPs=";
};
"12.5" = {
version = "12.5.1";
url = "https://developer.download.nvidia.com/compute/cuda/12.5.1/local_installers/cuda_12.5.1_555.42.06_linux.run";
sha256 = "sha256-teCneeCJyGYQBRFBxM9Ji+70MYWOxjOYEHORcn7L2wQ=";
};
"12.6" = {
version = "12.6.3";
url = "https://developer.download.nvidia.com/compute/cuda/12.6.3/local_installers/cuda_12.6.3_560.35.05_linux.run";
sha256 = "sha256-gdYOSARHlteIOqigSa/mUBuEPyxFY5s3A7I3jeMNVdM=";
};
"12.8" = {
version = "12.8.1";
url = "https://developer.download.nvidia.com/compute/cuda/12.8.1/local_installers/cuda_12.8.1_570.124.06_linux.run";
sha256 = "sha256-Io9ryvW3YY0DKTn0MZFPyS0OXtOevjcJiiRQLyahl5c=";
};
"12.9" = {
version = "12.9.1";
url = "https://developer.download.nvidia.com/compute/cuda/12.9.1/local_installers/cuda_12.9.1_575.57.08_linux.run";
sha256 = "sha256-D22Abd2HIw0q2+imAGqdIBRP29qd4tasxnfapdA2QXo=";
};
}
@@ -39,11 +39,11 @@ let
in
stdenv.mkDerivation (final: {
pname = "quarto";
version = "1.7.32";
version = "1.7.33";
src = fetchurl {
url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${final.version}/quarto-${final.version}-linux-amd64.tar.gz";
hash = "sha256-JiUF49JkWcZOZu/v1LkkDrdV6iDdb+h21qpkx6exPSc=";
hash = "sha256-ODO8pp940pZtP53HEM8R9JPfjAKxShVvyABjcHdrlew=";
};
patches = [
@@ -8,6 +8,7 @@
newScope,
stdenv,
fetchurl,
fetchFromGitHub,
cmake,
pkg-config,
@@ -46,6 +47,7 @@
libgeotiff,
laszip_2,
gdal,
gdcm,
pdal,
alembic,
imath,
@@ -136,6 +138,19 @@ stdenv.mkDerivation (finalAttrs: {
hash = sourceSha256;
};
postPatch =
let
vtk-dicom = fetchFromGitHub {
owner = "dgobbi";
repo = "vtk-dicom";
tag = "v0.8.17";
hash = "sha256-1lI2qsV4gymWqjeouEHZ5FRlmlh9vimH7J5rzA+eOds=";
};
in
''
cp --no-preserve=mode -r ${vtk-dicom} ./Remote/vtkDICOM
'';
nativeBuildInputs = [
cmake
pkg-config # required for finding MySQl
@@ -153,6 +168,7 @@ stdenv.mkDerivation (finalAttrs: {
libgeotiff
laszip_2
gdal
(gdcm.override { enableVTK = false; })
pdal
alembic
imath
@@ -289,6 +305,9 @@ stdenv.mkDerivation (finalAttrs: {
# mpiSupport
(lib.cmakeBool "VTK_USE_MPI" mpiSupport)
(vtkBool "VTK_GROUP_ENABLE_MPI" mpiSupport)
# Remote module options
(lib.cmakeBool "USE_GDCM" true) # for vtkDicom
];
pythonImportsCheck = [ "vtk" ];
@@ -6,13 +6,13 @@
buildDunePackage rec {
pname = "miou";
version = "0.3.1";
version = "0.4.0";
minimalOCamlVersion = "5.0.0";
src = fetchurl {
url = "https://github.com/robur-coop/miou/releases/download/v${version}/miou-${version}.tbz";
hash = "sha256-K3otUuwFmRVrbnxYYZDMmd2WTYQHmXY/byQHu4PjlHE=";
hash = "sha256-2a5SET2SPyQloTdcWU9KzPYRcXgK8e8hHbu6OP9R2s8=";
};
meta = {
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "ancp-bids";
version = "0.3.0";
version = "0.3.1";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "ANCPLabOldenburg";
repo = "ancp-bids";
tag = version;
hash = "sha256-n8QfQ2PGdAO6kTfkbFpj3f2gYa3vwuYg+vPpZlGNpb0=";
hash = "sha256-brkhXz2b1nR/tjkZQZY5S+P0+GbESvJsANQcVWRCa9k=";
};
build-system = [ setuptools ];
@@ -3,16 +3,14 @@
stdenv,
buildPythonPackage,
fetchFromGitHub,
cython_0,
cython,
fastrlock,
numpy,
wheel,
pytestCheckHook,
mock,
setuptools,
cudaPackages,
addDriverRunpath,
pythonOlder,
symlinkJoin,
}:
@@ -58,10 +56,8 @@ let
in
buildPythonPackage rec {
pname = "cupy";
version = "13.5.1";
format = "setuptools";
disabled = pythonOlder "3.7";
version = "13.6.0";
pyproject = true;
stdenv = cudaPackages.backendStdenv;
@@ -69,7 +65,7 @@ buildPythonPackage rec {
owner = "cupy";
repo = "cupy";
tag = "v${version}";
hash = "sha256-8RgyvsU3lnt6nO0J1tiLBOdYsX0jJkjPH/SpKQz4o7s=";
hash = "sha256-nU3VL0MSCN+mI5m7C5sKAjBSL6ybM6YAk5lJiIDY0ck=";
fetchSubmodules = true;
};
@@ -83,11 +79,14 @@ buildPythonPackage rec {
export CUPY_NUM_NVCC_THREADS="$NIX_BUILD_CORES"
'';
nativeBuildInputs = [
build-system = [
cython
fastrlock
setuptools
wheel
];
nativeBuildInputs = [
addDriverRunpath
cython_0
cudaPackages.cuda_nvcc
];
@@ -101,7 +100,7 @@ buildPythonPackage rec {
NVCC = "${lib.getExe cudaPackages.cuda_nvcc}"; # FIXME: splicing/buildPackages
CUDA_PATH = "${cudatoolkit-joined}";
propagatedBuildInputs = [
dependencies = [
fastrlock
numpy
];
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "django-registration";
version = "5.1.0";
version = "5.2.1";
pyproject = true;
src = fetchFromGitHub {
owner = "ubernostrum";
repo = "django-registration";
tag = version;
hash = "sha256-02kAZXxzTdLBvgff+WNUww2k/yGqxIG5gv8gXy9z7KE=";
hash = "sha256-k7r4g+iCdAwAUNQdbtxzS5kqgAavEBAJERSWgXvbXqg=";
};
build-system = [ pdm-backend ];
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "djangocms-alias";
version = "2.0.4";
version = "2.0.5";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "django-cms";
repo = "djangocms-alias";
tag = version;
hash = "sha256-0lIhPgI+HbAKX9wEpZ/v40OHvN6WWK9ehFxIcpzdcq8=";
hash = "sha256-sMMqX4+R4VZveIEV779WqYnZYH/fqZihyxFDAKwlWn0=";
};
build-system = [ setuptools ];
@@ -36,14 +36,14 @@
buildPythonPackage rec {
pname = "keras";
version = "3.11.2";
version = "3.11.3";
pyproject = true;
src = fetchFromGitHub {
owner = "keras-team";
repo = "keras";
tag = "v${version}";
hash = "sha256-VRza7ElCPjdMeo4LH0WSBD8WdzxojJStGXlf1pbP3b0=";
hash = "sha256-J/NPLR9ShKhvHDU0/NpUNp95RViS2KygqvnuDHdwiP0=";
};
build-system = [
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "knx-frontend";
version = "2025.8.9.63154";
version = "2025.8.21.181525";
pyproject = true;
# TODO: source build, uses yarn.lock
src = fetchPypi {
pname = "knx_frontend";
inherit version;
hash = "sha256-Sphetc0ox0Oh70vNdkHorX0jpvC8bckm1TBKk2QSGPo=";
hash = "sha256-LWLkQBUpICLeRxyCNerDJTcOCLMGFDL/9Bap/8mbLVM=";
};
build-system = [ setuptools ];
@@ -4,6 +4,7 @@
gcc13Stdenv,
buildPythonPackage,
fetchFromGitHub,
fetchpatch,
# nativeBuildInputs
cmake,
@@ -39,18 +40,29 @@ let
in
buildPythonPackage rec {
pname = "llama-cpp-python";
version = "0.3.15";
version = "0.3.16";
pyproject = true;
src = fetchFromGitHub {
owner = "abetlen";
repo = "llama-cpp-python";
tag = "v${version}";
hash = "sha256-tovyBWknHI3SleGwvdzu2KNK4QXdpwWa2lxt5sxoy+o=";
hash = "sha256-EUDtCv86J4bznsTqNsdgj1IYkAu83cf+RydFTUb2NEE=";
fetchSubmodules = true;
};
# src = /home/gaetan/llama-cpp-python;
patches = [
# Fix test failure on a machine with no metal devices (e.g. nix-community darwin builder)
# https://github.com/ggml-org/llama.cpp/pull/15531
(fetchpatch {
url = "https://github.com/ggml-org/llama.cpp/pull/15531/commits/63a83ffefe4d478ebadff89300a0a3c5d660f56a.patch";
stripLen = 1;
extraPrefix = "vendor/llama.cpp/";
hash = "sha256-9LGnzviBgYYOOww8lhiLXf7xgd/EtxRXGQMredOO4qM=";
})
];
dontUseCmakeConfigure = true;
cmakeFlags = [
# Set GGML_NATIVE=off. Otherwise, cmake attempts to build with
@@ -15,14 +15,14 @@
}:
buildPythonPackage rec {
pname = "llm-gemini";
version = "0.24";
version = "0.25";
pyproject = true;
src = fetchFromGitHub {
owner = "simonw";
repo = "llm-gemini";
tag = version;
hash = "sha256-pMPAfRhcvKoxvtbkmtT3L7EvBg9WsNVOP6wFjbyqncw=";
hash = "sha256-jnPFlLUQ+NSTDUStocUldqT7Z+bjrtzGSOJHfMFCScU=";
};
build-system = [ setuptools ];
@@ -0,0 +1,34 @@
{
lib,
buildPythonPackage,
fetchPypi,
requests,
setuptools,
}:
buildPythonPackage rec {
pname = "python-ripple-api";
version = "0.0.3";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-hlgc7swcCimpQueyxuy/zvr6WdBHWnjnqHTS/cUghss=";
};
build-system = [ setuptools ];
dependencies = [ requests ];
# No tests in the package
doCheck = false;
pythonImportsCheck = [ "pyripple" ];
meta = {
description = "Python API for interacting with ripple.com";
homepage = "https://github.com/nkgilley/python-ripple-api";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.jamiemagee ];
};
}
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "session-info2";
version = "0.2";
version = "0.2.1";
pyproject = true;
src = fetchFromGitHub {
owner = "scverse";
repo = "session-info2";
tag = "v${version}";
hash = "sha256-DsI2mFM7xZgSm24yVzF6B+2aruKsjkTKZAmJPg7mWgg=";
hash = "sha256-d56aIKKBiktOepN/SXwuSaFjSelJ9QiTcbO0OvbkNW4=";
};
build-system = [
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "templateflow";
version = "25.0.1";
version = "25.0.3";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "templateflow";
repo = "python-client";
tag = version;
hash = "sha256-d4la1xjW74oCxUsEzc3LG0xiyLBbTYbomsUWMD0Wyp8=";
hash = "sha256-5LGAuDaJzc2asM5EPOVuOxZwpV0LQNBhMhYKHJlXHmE=";
};
build-system = [
@@ -8,7 +8,7 @@
buildPythonPackage {
pname = "textual-slider";
version = "0.1.2";
version = "0.2.0";
src = fetchFromGitHub {
owner = "TomJGooding";
@@ -245,11 +245,13 @@ lib.makeOverridable (
rust-bindgen-unwrapped
];
RUST_LIB_SRC = lib.optionalString withRust rustPlatform.rustLibSrc;
env = {
RUST_LIB_SRC = lib.optionalString withRust rustPlatform.rustLibSrc;
# avoid leaking Rust source file names into the final binary, which adds
# a false dependency on rust-lib-src on targets with uncompressed kernels
KRUSTFLAGS = lib.optionalString withRust "--remap-path-prefix ${rustPlatform.rustLibSrc}=/";
# avoid leaking Rust source file names into the final binary, which adds
# a false dependency on rust-lib-src on targets with uncompressed kernels
KRUSTFLAGS = lib.optionalString withRust "--remap-path-prefix ${rustPlatform.rustLibSrc}=/";
};
patches =
# kernelPatches can contain config changes and no actual patch
@@ -4986,7 +4986,8 @@
];
"ripple" =
ps: with ps; [
]; # missing inputs: python-ripple-api
python-ripple-api
];
"risco" =
ps: with ps; [
pyrisco
+1 -2
View File
@@ -117,13 +117,12 @@ let
};
# Loose packages
# Barring packages which share a home (e.g., cudatoolkit and cudatoolkit-legacy-runfile), new packages
# Barring packages which share a home (e.g., cudatoolkit), new packages
# should be added to ../development/cuda-modules/packages in "by-name" style, where they will be automatically
# discovered and added to the package set.
# TODO: Move to aliases.nix once all Nixpkgs has migrated to the splayed CUDA packages
cudatoolkit = final.callPackage ../development/cuda-modules/cudatoolkit/redist-wrapper.nix { };
cudatoolkit-legacy-runfile = final.callPackage ../development/cuda-modules/cudatoolkit { };
tests =
let
+2
View File
@@ -14897,6 +14897,8 @@ self: super: with self; {
python-registry = callPackage ../development/python-modules/python-registry { };
python-ripple-api = callPackage ../development/python-modules/python-ripple-api { };
python-roborock = callPackage ../development/python-modules/python-roborock { };
python-rtmidi = callPackage ../development/python-modules/python-rtmidi { };