Merge staging-next into staging
This commit is contained in:
@@ -265,6 +265,8 @@
|
||||
|
||||
- The `services.siproxd` module has been removed as `siproxd` is unmaintained and broken with libosip 5.x.
|
||||
|
||||
- The `services.postfixadmin` module has been removed due to a lack of active maintainers.
|
||||
|
||||
- `services.tor.torsocks.enable` no longer defaults to true if Tor and Tor client functionality is enabled.
|
||||
|
||||
- `netbox-manage` script created by the `netbox` module no longer uses `sudo -u netbox` internally. It can be run as root and will change it's user to `netbox` using `runuser`
|
||||
|
||||
@@ -7,6 +7,10 @@
|
||||
with lib;
|
||||
let
|
||||
cfg = config.services.handheld-daemon;
|
||||
hhdPackage = cfg.package.override {
|
||||
withAdjustor = cfg.adjustor.enable;
|
||||
adjustor = cfg.adjustor.package;
|
||||
};
|
||||
in
|
||||
{
|
||||
options.services.handheld-daemon = {
|
||||
@@ -18,6 +22,18 @@ in
|
||||
package = mkPackageOption pkgs "handheld-daemon-ui" { };
|
||||
};
|
||||
|
||||
adjustor = {
|
||||
enable = mkEnableOption "Handheld Daemon TDP control plugin";
|
||||
package = mkPackageOption pkgs "adjustor" { };
|
||||
loadAcpiCallModule = mkOption {
|
||||
type = types.bool;
|
||||
description = ''
|
||||
Whether to load the acpi_call kernel module.
|
||||
Required for TDP control by adjustor on most devices.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
user = mkOption {
|
||||
type = types.str;
|
||||
description = ''
|
||||
@@ -28,13 +44,19 @@ in
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.handheld-daemon.ui.enable = mkDefault true;
|
||||
services.handheld-daemon.adjustor.loadAcpiCallModule = mkDefault cfg.adjustor.enable;
|
||||
environment.systemPackages = [
|
||||
cfg.package
|
||||
hhdPackage
|
||||
]
|
||||
++ lib.optional cfg.ui.enable cfg.ui.package;
|
||||
services.udev.packages = [ cfg.package ];
|
||||
systemd.packages = [ cfg.package ];
|
||||
|
||||
boot.kernelModules = mkIf cfg.adjustor.loadAcpiCallModule [ "acpi_call" ];
|
||||
boot.extraModulePackages = mkIf cfg.adjustor.loadAcpiCallModule [
|
||||
config.boot.kernelPackages.acpi_call
|
||||
];
|
||||
|
||||
systemd.services.handheld-daemon = {
|
||||
description = "Handheld Daemon";
|
||||
|
||||
@@ -48,7 +70,7 @@ in
|
||||
];
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = "${lib.getExe cfg.package} --user ${cfg.user}";
|
||||
ExecStart = "${lib.getExe hhdPackage} --user ${cfg.user}";
|
||||
Nice = "-12";
|
||||
Restart = "on-failure";
|
||||
RestartSec = "10";
|
||||
@@ -56,5 +78,5 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = [ maintainers.appsforartists ];
|
||||
meta.maintainers = [ maintainers.toast ];
|
||||
}
|
||||
|
||||
@@ -11,8 +11,8 @@ in
|
||||
name = "nominatim";
|
||||
meta = {
|
||||
maintainers = with lib.teams; [
|
||||
geospatial
|
||||
ngi
|
||||
geospatial.members
|
||||
ngi.members
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
@@ -11,10 +11,10 @@
|
||||
"clion": {
|
||||
"update-channel": "CLion RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz",
|
||||
"version": "2025.2.3",
|
||||
"sha256": "364502648a5f1480bd06a00ee410968d224f96b263c78f5148614063f7bc3961",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2025.2.3.tar.gz",
|
||||
"build_number": "252.26830.83"
|
||||
"version": "2025.2.4",
|
||||
"sha256": "72c89e91f6636aa53930288fe02466e5e09a50a3c8b6ed5ad2f69b35ec9bacc5",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2025.2.4.tar.gz",
|
||||
"build_number": "252.27397.114"
|
||||
},
|
||||
"datagrip": {
|
||||
"update-channel": "DataGrip RELEASE",
|
||||
@@ -100,10 +100,10 @@
|
||||
"rider": {
|
||||
"update-channel": "Rider RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz",
|
||||
"version": "2025.2.3",
|
||||
"sha256": "1cfc4e756007c5a8b749c0848e4c050303aeeaabc0917f19732d908201b69446",
|
||||
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.2.3.tar.gz",
|
||||
"build_number": "252.26830.109"
|
||||
"version": "2025.2.4",
|
||||
"sha256": "cd428f7d6db5055cd2594c3d1ef91241843d263cb6301369d3121a847ffb6589",
|
||||
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.2.4.tar.gz",
|
||||
"build_number": "252.27397.121"
|
||||
},
|
||||
"ruby-mine": {
|
||||
"update-channel": "RubyMine RELEASE",
|
||||
@@ -116,10 +116,10 @@
|
||||
"rust-rover": {
|
||||
"update-channel": "RustRover RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz",
|
||||
"version": "2025.2.3",
|
||||
"sha256": "b96846e7257d14ef38154017cdbe9c63c66d19b59e94ad096db2c9ae2380103b",
|
||||
"url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.3.tar.gz",
|
||||
"build_number": "252.26830.136"
|
||||
"version": "2025.2.4",
|
||||
"sha256": "3da078b5e68bac2283c0dd60fe3ff17d6025d92d6237bc6fab74f1f35ff6fbe5",
|
||||
"url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.4.tar.gz",
|
||||
"build_number": "252.27397.120"
|
||||
},
|
||||
"webstorm": {
|
||||
"update-channel": "WebStorm RELEASE",
|
||||
@@ -150,10 +150,10 @@
|
||||
"clion": {
|
||||
"update-channel": "CLion RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz",
|
||||
"version": "2025.2.3",
|
||||
"sha256": "e4cc668cb1e0cf5b976ab8eb3997388f1e7cc673e51af3f3c6afa3666a9c47b6",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2025.2.3-aarch64.tar.gz",
|
||||
"build_number": "252.26830.83"
|
||||
"version": "2025.2.4",
|
||||
"sha256": "b89010db5272eb6490a0084bd3247c9de657ffd0d12a827147f2c77a406f85b5",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2025.2.4-aarch64.tar.gz",
|
||||
"build_number": "252.27397.114"
|
||||
},
|
||||
"datagrip": {
|
||||
"update-channel": "DataGrip RELEASE",
|
||||
@@ -239,10 +239,10 @@
|
||||
"rider": {
|
||||
"update-channel": "Rider RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz",
|
||||
"version": "2025.2.3",
|
||||
"sha256": "bd03e42b3a04cc1e1b234333285873746bd4d04bf3746fb62b171334a168e976",
|
||||
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.2.3-aarch64.tar.gz",
|
||||
"build_number": "252.26830.109"
|
||||
"version": "2025.2.4",
|
||||
"sha256": "75c38a2bd94e31200fc4e3a6cfad83b35c65d36c9d61b9a7b208e3ec82f8c81a",
|
||||
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.2.4-aarch64.tar.gz",
|
||||
"build_number": "252.27397.121"
|
||||
},
|
||||
"ruby-mine": {
|
||||
"update-channel": "RubyMine RELEASE",
|
||||
@@ -255,10 +255,10 @@
|
||||
"rust-rover": {
|
||||
"update-channel": "RustRover RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz",
|
||||
"version": "2025.2.3",
|
||||
"sha256": "5ffdff2a6617fcc75b68a145bc9dce14a71d0d9dc31a1adde5c8630d954a370d",
|
||||
"url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.3-aarch64.tar.gz",
|
||||
"build_number": "252.26830.136"
|
||||
"version": "2025.2.4",
|
||||
"sha256": "03052ead61bd13eaa616d1126add5b6b6fa9dbc6ef591109b358005d5b630606",
|
||||
"url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.4-aarch64.tar.gz",
|
||||
"build_number": "252.27397.120"
|
||||
},
|
||||
"webstorm": {
|
||||
"update-channel": "WebStorm RELEASE",
|
||||
@@ -289,10 +289,10 @@
|
||||
"clion": {
|
||||
"update-channel": "CLion RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg",
|
||||
"version": "2025.2.3",
|
||||
"sha256": "4763233873139a0adf8c5cb285ace830eb0be363bb132de2f7ac4b4c1a58b2f2",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2025.2.3.dmg",
|
||||
"build_number": "252.26830.83"
|
||||
"version": "2025.2.4",
|
||||
"sha256": "04383caba9ba670841dd336e546f2027b28286d23ea30298e66f422fbc081272",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2025.2.4.dmg",
|
||||
"build_number": "252.27397.114"
|
||||
},
|
||||
"datagrip": {
|
||||
"update-channel": "DataGrip RELEASE",
|
||||
@@ -378,10 +378,10 @@
|
||||
"rider": {
|
||||
"update-channel": "Rider RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg",
|
||||
"version": "2025.2.3",
|
||||
"sha256": "09717e33d640052143492fe7e4485c93218c04c9efc1615e8f0d5dbdb4fe5526",
|
||||
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.2.3.dmg",
|
||||
"build_number": "252.26830.109"
|
||||
"version": "2025.2.4",
|
||||
"sha256": "f8cabc370393b6be2bd244413fd5692714c02e11cf24eb9c32438367d2895750",
|
||||
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.2.4.dmg",
|
||||
"build_number": "252.27397.121"
|
||||
},
|
||||
"ruby-mine": {
|
||||
"update-channel": "RubyMine RELEASE",
|
||||
@@ -394,10 +394,10 @@
|
||||
"rust-rover": {
|
||||
"update-channel": "RustRover RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg",
|
||||
"version": "2025.2.3",
|
||||
"sha256": "7c9e08ded178f233cabc8b0bebdda8504ef10a6afaf1856b33da582d69ca378d",
|
||||
"url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.3.dmg",
|
||||
"build_number": "252.26830.136"
|
||||
"version": "2025.2.4",
|
||||
"sha256": "71f0735c546b659d4d1ed9ce58411848146ac0216b4b971583ce682311e9e075",
|
||||
"url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.4.dmg",
|
||||
"build_number": "252.27397.120"
|
||||
},
|
||||
"webstorm": {
|
||||
"update-channel": "WebStorm RELEASE",
|
||||
@@ -428,10 +428,10 @@
|
||||
"clion": {
|
||||
"update-channel": "CLion RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg",
|
||||
"version": "2025.2.3",
|
||||
"sha256": "87d1b9d0188ee540ce26572d648a4a7ef1b2b2d90c18227932a28d9d263b58df",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2025.2.3-aarch64.dmg",
|
||||
"build_number": "252.26830.83"
|
||||
"version": "2025.2.4",
|
||||
"sha256": "7bdef6d73e0edfbc5ef02b7e74e5508e5b18a9c21afb5ba82488527d837e2a94",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2025.2.4-aarch64.dmg",
|
||||
"build_number": "252.27397.114"
|
||||
},
|
||||
"datagrip": {
|
||||
"update-channel": "DataGrip RELEASE",
|
||||
@@ -517,10 +517,10 @@
|
||||
"rider": {
|
||||
"update-channel": "Rider RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg",
|
||||
"version": "2025.2.3",
|
||||
"sha256": "67c9c8f73844d9705c8e64f03afc659ef3146caccc079f183a758b0d7666a468",
|
||||
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.2.3-aarch64.dmg",
|
||||
"build_number": "252.26830.109"
|
||||
"version": "2025.2.4",
|
||||
"sha256": "e6bd0a07f5922c05c73d9170bbaa2219534fa8e5350b99f37c6a4bc9eb7c0870",
|
||||
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.2.4-aarch64.dmg",
|
||||
"build_number": "252.27397.121"
|
||||
},
|
||||
"ruby-mine": {
|
||||
"update-channel": "RubyMine RELEASE",
|
||||
@@ -533,10 +533,10 @@
|
||||
"rust-rover": {
|
||||
"update-channel": "RustRover RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg",
|
||||
"version": "2025.2.3",
|
||||
"sha256": "3ebf05feabd5858df21b0215dec39142427b4df50d929c0d94751425478d295d",
|
||||
"url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.3-aarch64.dmg",
|
||||
"build_number": "252.26830.136"
|
||||
"version": "2025.2.4",
|
||||
"sha256": "8bad55d714d388c115c0d35c297eb5bdb140bc024b2bf602efc8d07a3327cad9",
|
||||
"url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.4-aarch64.dmg",
|
||||
"build_number": "252.27397.120"
|
||||
},
|
||||
"webstorm": {
|
||||
"update-channel": "WebStorm RELEASE",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -886,13 +886,13 @@
|
||||
"vendorHash": "sha256-I8yMdS+yOk5doWGU9VPdl5ITGNrPhs5tGwluwXSrnI0="
|
||||
},
|
||||
"metio_migadu": {
|
||||
"hash": "sha256-FDZOBxxoY9fZ9g24onNoFn4e0xtBMYLCoqdYcdhIj4E=",
|
||||
"hash": "sha256-Itfy/EZiBI6j4GU9I3pQGpsMkykN8FVZ4FPhcUre8a0=",
|
||||
"homepage": "https://registry.terraform.io/providers/metio/migadu",
|
||||
"owner": "metio",
|
||||
"repo": "terraform-provider-migadu",
|
||||
"rev": "2025.10.16",
|
||||
"rev": "2025.10.30",
|
||||
"spdx": "0BSD",
|
||||
"vendorHash": "sha256-bxq4AB9qvhZPxtG4lmfVXQL3mil7UaJ46EWU1iD0ymE="
|
||||
"vendorHash": "sha256-LMCFXZYZ9qwuu0/hA8mRNktCwwC4DRaqveW2dAJWQTQ="
|
||||
},
|
||||
"mongey_kafka": {
|
||||
"hash": "sha256-rTa6c7jAMH027V7h/yUGVGz6TS0PDdObilxU0Vpr6FI=",
|
||||
@@ -1129,13 +1129,13 @@
|
||||
"vendorHash": "sha256-M2lJKmIR66lQKFkInjizn68ax2Gq4sim5Y3vZKyDhZ8="
|
||||
},
|
||||
"rootlyhq_rootly": {
|
||||
"hash": "sha256-4YjmP7DMaqsDADi0+B39Wn0CA2M3MEhV3VKA+M/gHMg=",
|
||||
"hash": "sha256-215PagKhONN483SGvYsLWQfKnSWmUKL1vCM4mr2xuGo=",
|
||||
"homepage": "https://registry.terraform.io/providers/rootlyhq/rootly",
|
||||
"owner": "rootlyhq",
|
||||
"repo": "terraform-provider-rootly",
|
||||
"rev": "v4.3.3",
|
||||
"rev": "v4.3.5",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-auyQLDDQ+tfMQCqICDR5tfvaYrO89Eani7lAsfoPwwU="
|
||||
"vendorHash": "sha256-MNddgnKFdrOCfpj84McqW/8lmU/t36x2Whsl9xkmrhM="
|
||||
},
|
||||
"rundeck_rundeck": {
|
||||
"hash": "sha256-g8unbz8+UGLiAOJju6E2bLkygvZgHkv173PdMDefmrc=",
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
python3Packages,
|
||||
# Dependencies
|
||||
kmod,
|
||||
util-linux,
|
||||
}:
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "adjustor";
|
||||
version = "3.11.8";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hhd-dev";
|
||||
repo = "adjustor";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-BS0zV8nan61fTUs3v6nmGBuqPEDjATxBG792ZrrreAI=";
|
||||
};
|
||||
|
||||
# This package relies on several programs expected to be on the user's PATH.
|
||||
# We take a more reproducible approach by patching the absolute path to each of these required
|
||||
# binaries.
|
||||
postPatch = ''
|
||||
substituteInPlace src/adjustor/core/acpi.py \
|
||||
--replace-fail '"modprobe"' '"${lib.getExe' kmod "modprobe"}"'
|
||||
substituteInPlace src/adjustor/fuse/utils.py \
|
||||
--replace-fail 'f"mount' 'f"${lib.getExe' util-linux "mount"}'
|
||||
'';
|
||||
|
||||
build-system = with python3Packages; [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
rich
|
||||
pyroute2
|
||||
fuse
|
||||
pygobject3
|
||||
dbus-python
|
||||
kmod
|
||||
];
|
||||
|
||||
# This package doesn't have upstream tests.
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/hhd-dev/adjustor/";
|
||||
description = "Adjustor TDP plugin for Handheld Daemon";
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = [ lib.maintainers.toast ];
|
||||
mainProgram = "hhd";
|
||||
};
|
||||
}
|
||||
@@ -56,13 +56,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bambu-studio";
|
||||
version = "02.02.02.56";
|
||||
version = "02.03.01.51";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bambulab";
|
||||
repo = "BambuStudio";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-vg+sEIztFBfzROl2surRd4l/afZ+tGMtG65m3kDIPAY=";
|
||||
hash = "sha256-SnWOTFymTVHzYqraMzohOrpM0UuLW+PRfZBqkFASEWs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -117,6 +117,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
./patches/dont-link-opencv-world-bambu.patch
|
||||
# Don't link osmesa
|
||||
./patches/no-osmesa.patch
|
||||
# Don't link cereal
|
||||
./patches/no-cereal.patch
|
||||
# Cmake 4 support
|
||||
./patches/cmake.patch
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@@ -0,0 +1,200 @@
|
||||
diff --git a/cmake/modules/FindOpenVDB.cmake b/cmake/modules/FindOpenVDB.cmake
|
||||
index 76ddb0d2f..4d30f6865 100644
|
||||
--- a/cmake/modules/FindOpenVDB.cmake
|
||||
+++ b/cmake/modules/FindOpenVDB.cmake
|
||||
@@ -123,7 +123,7 @@ if (OPENVDB_FIND_MODULE_PATH)
|
||||
endif ()
|
||||
# ###########################################################################
|
||||
|
||||
-cmake_minimum_required(VERSION 3.3)
|
||||
+cmake_minimum_required(VERSION 3.3...3.10)
|
||||
# Monitoring <PackageName>_ROOT variables
|
||||
if(POLICY CMP0074)
|
||||
cmake_policy(SET CMP0074 NEW)
|
||||
diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
|
||||
index 54b9a2497..3b4a32829 100644
|
||||
--- a/deps/CMakeLists.txt
|
||||
+++ b/deps/CMakeLists.txt
|
||||
@@ -21,7 +21,7 @@
|
||||
#
|
||||
|
||||
project(BambuStudio-deps)
|
||||
-cmake_minimum_required(VERSION 3.2)
|
||||
+cmake_minimum_required(VERSION 3.2...3.10)
|
||||
|
||||
include(ExternalProject)
|
||||
include(ProcessorCount)
|
||||
diff --git a/deps/EXPAT/expat/CMakeLists.txt b/deps/EXPAT/expat/CMakeLists.txt
|
||||
index 585a678b8..77d3c13d8 100644
|
||||
--- a/deps/EXPAT/expat/CMakeLists.txt
|
||||
+++ b/deps/EXPAT/expat/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 3.0)
|
||||
+cmake_minimum_required(VERSION 3.0...3.10)
|
||||
|
||||
project(EXPAT)
|
||||
|
||||
diff --git a/deps/GLEW/glew/CMakeLists.txt b/deps/GLEW/glew/CMakeLists.txt
|
||||
index 513ee4ebb..e262f65e8 100644
|
||||
--- a/deps/GLEW/glew/CMakeLists.txt
|
||||
+++ b/deps/GLEW/glew/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 3.0)
|
||||
+cmake_minimum_required(VERSION 3.0...3.10)
|
||||
project(GLEW)
|
||||
|
||||
find_package(OpenGL REQUIRED)
|
||||
diff --git a/sandboxes/opencsg/CMakeLists.txt b/sandboxes/opencsg/CMakeLists.txt
|
||||
index ace8f4d53..304ff4e01 100644
|
||||
--- a/sandboxes/opencsg/CMakeLists.txt
|
||||
+++ b/sandboxes/opencsg/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 3.0)
|
||||
+cmake_minimum_required(VERSION 3.0...3.10)
|
||||
|
||||
project(OpenCSG-example)
|
||||
|
||||
diff --git a/src/Shiny/CMakeLists.txt b/src/Shiny/CMakeLists.txt
|
||||
index abdb96a72..7e6f16500 100644
|
||||
--- a/src/Shiny/CMakeLists.txt
|
||||
+++ b/src/Shiny/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 2.8.12)
|
||||
+cmake_minimum_required(VERSION 2.8.12...3.10)
|
||||
project(Shiny)
|
||||
|
||||
add_library(Shiny STATIC
|
||||
diff --git a/src/admesh/CMakeLists.txt b/src/admesh/CMakeLists.txt
|
||||
index 217976318..6450abc87 100644
|
||||
--- a/src/admesh/CMakeLists.txt
|
||||
+++ b/src/admesh/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 2.8.12)
|
||||
+cmake_minimum_required(VERSION 2.8.12...3.10)
|
||||
project(admesh)
|
||||
|
||||
add_library(admesh STATIC
|
||||
diff --git a/src/boost/CMakeLists.txt b/src/boost/CMakeLists.txt
|
||||
index e8c9e11ce..3c62ccf7e 100644
|
||||
--- a/src/boost/CMakeLists.txt
|
||||
+++ b/src/boost/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 2.8.12)
|
||||
+cmake_minimum_required(VERSION 2.8.12...3.10)
|
||||
project(nowide)
|
||||
|
||||
add_library(nowide STATIC
|
||||
diff --git a/src/clipper/CMakeLists.txt b/src/clipper/CMakeLists.txt
|
||||
index f62508820..44aa59f23 100644
|
||||
--- a/src/clipper/CMakeLists.txt
|
||||
+++ b/src/clipper/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 2.8.12)
|
||||
+cmake_minimum_required(VERSION 2.8.12...3.10)
|
||||
project(clipper)
|
||||
|
||||
add_library(clipper STATIC
|
||||
diff --git a/src/earcut/CMakeLists.txt b/src/earcut/CMakeLists.txt
|
||||
index 08c7bb1be..cb10fea7b 100644
|
||||
--- a/src/earcut/CMakeLists.txt
|
||||
+++ b/src/earcut/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 3.2)
|
||||
+cmake_minimum_required(VERSION 3.2...3.10)
|
||||
project(earcut_hpp LANGUAGES CXX C)
|
||||
|
||||
option(EARCUT_BUILD_TESTS "Build the earcut test program" ON)
|
||||
diff --git a/src/glu-libtess/CMakeLists.txt b/src/glu-libtess/CMakeLists.txt
|
||||
index 8fca992a3..662b5593e 100644
|
||||
--- a/src/glu-libtess/CMakeLists.txt
|
||||
+++ b/src/glu-libtess/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 2.8.12)
|
||||
+cmake_minimum_required(VERSION 2.8.12...3.10)
|
||||
project(glu-libtess)
|
||||
|
||||
add_library(glu-libtess STATIC
|
||||
diff --git a/src/imgui/CMakeLists.txt b/src/imgui/CMakeLists.txt
|
||||
index 592e78c8e..718a05439 100644
|
||||
--- a/src/imgui/CMakeLists.txt
|
||||
+++ b/src/imgui/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 2.8.12)
|
||||
+cmake_minimum_required(VERSION 2.8.12...3.10)
|
||||
project(imgui)
|
||||
|
||||
add_library(imgui STATIC
|
||||
diff --git a/src/imguizmo/CMakeLists.txt b/src/imguizmo/CMakeLists.txt
|
||||
index fec443180..461d4f684 100644
|
||||
--- a/src/imguizmo/CMakeLists.txt
|
||||
+++ b/src/imguizmo/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 2.8.12)
|
||||
+cmake_minimum_required(VERSION 2.8.12...3.10)
|
||||
project(imguizmo)
|
||||
|
||||
add_library(imguizmo STATIC
|
||||
diff --git a/src/libigl/CMakeLists.txt b/src/libigl/CMakeLists.txt
|
||||
index f023826a5..449a3cbef 100644
|
||||
--- a/src/libigl/CMakeLists.txt
|
||||
+++ b/src/libigl/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 3.0)
|
||||
+cmake_minimum_required(VERSION 3.0...3.10)
|
||||
project(libigl)
|
||||
|
||||
add_library(libigl INTERFACE)
|
||||
diff --git a/src/minilzo/CMakeLists.txt b/src/minilzo/CMakeLists.txt
|
||||
index c5122ccf0..97e749e04 100644
|
||||
--- a/src/minilzo/CMakeLists.txt
|
||||
+++ b/src/minilzo/CMakeLists.txt
|
||||
@@ -1,5 +1,5 @@
|
||||
project(minilzo)
|
||||
-cmake_minimum_required(VERSION 2.6)
|
||||
+cmake_minimum_required(VERSION 2.6...3.10)
|
||||
|
||||
add_library(minilzo INTERFACE)
|
||||
|
||||
diff --git a/src/miniz/CMakeLists.txt b/src/miniz/CMakeLists.txt
|
||||
index 04d562b76..e3d6fbc6f 100644
|
||||
--- a/src/miniz/CMakeLists.txt
|
||||
+++ b/src/miniz/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 2.8.12)
|
||||
+cmake_minimum_required(VERSION 2.8.12...3.10)
|
||||
project(miniz)
|
||||
|
||||
add_library(miniz INTERFACE)
|
||||
diff --git a/src/qhull/CMakeLists.txt b/src/qhull/CMakeLists.txt
|
||||
index ab9aba9af..350539681 100644
|
||||
--- a/src/qhull/CMakeLists.txt
|
||||
+++ b/src/qhull/CMakeLists.txt
|
||||
@@ -28,7 +28,7 @@ endif()
|
||||
else(Qhull_FOUND)
|
||||
|
||||
project(qhull)
|
||||
-cmake_minimum_required(VERSION 2.6)
|
||||
+cmake_minimum_required(VERSION 2.6...3.10)
|
||||
|
||||
# Define qhull_VERSION in CMakeLists.txt, Makefile, qhull-exports.def, qhull_p-exports.def, qhull_r-exports.def, qhull-warn.pri
|
||||
set(qhull_VERSION2 "2015.2 2016/01/18") # not used, See global.c, global_r.c, rbox.c, rbox_r.c
|
||||
diff --git a/src/semver/CMakeLists.txt b/src/semver/CMakeLists.txt
|
||||
index 4b61a7456..76a231074 100644
|
||||
--- a/src/semver/CMakeLists.txt
|
||||
+++ b/src/semver/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 2.8.12)
|
||||
+cmake_minimum_required(VERSION 2.8.12...3.10)
|
||||
project(semver)
|
||||
|
||||
add_library(semver STATIC
|
||||
diff --git a/tests/cpp17/CMakeLists.txt b/tests/cpp17/CMakeLists.txt
|
||||
index 4e151ecbf..2ac0a9e3d 100644
|
||||
--- a/tests/cpp17/CMakeLists.txt
|
||||
+++ b/tests/cpp17/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 3.1)
|
||||
+cmake_minimum_required(VERSION 3.1...3.10)
|
||||
|
||||
project(Cpp17Test)
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 0b4b9a8..8c22f60 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -125,7 +125,7 @@ if (NOT WIN32 AND NOT APPLE)
|
||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/unix/BuildLinuxImage.sh.in ${CMAKE_CURRENT_BINARY_DIR}/BuildLinuxImage.sh @ONLY)
|
||||
endif ()
|
||||
|
||||
-target_link_libraries(BambuStudio libslic3r cereal)
|
||||
+target_link_libraries(BambuStudio libslic3r)
|
||||
if (APPLE)
|
||||
# add_compile_options(-stdlib=libc++)
|
||||
# add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
|
||||
diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
|
||||
index 4481362..7d41af3 100644
|
||||
--- a/src/libslic3r/CMakeLists.txt
|
||||
+++ b/src/libslic3r/CMakeLists.txt
|
||||
@@ -574,7 +574,6 @@ set(OCCT_LIBS
|
||||
target_link_libraries(libslic3r
|
||||
libnest2d
|
||||
admesh
|
||||
- cereal
|
||||
libigl
|
||||
miniz
|
||||
boost_libs
|
||||
diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt
|
||||
index 0a852a4..2da0533 100644
|
||||
--- a/src/slic3r/CMakeLists.txt
|
||||
+++ b/src/slic3r/CMakeLists.txt
|
||||
@@ -671,8 +671,8 @@ source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SLIC3R_GUI_SOURCES})
|
||||
|
||||
encoding_check(libslic3r_gui)
|
||||
|
||||
-target_link_libraries(libslic3r_gui libslic3r cereal imgui imguizmo minilzo GLEW::GLEW OpenGL::GL hidapi ${wxWidgets_LIBRARIES} glfw libcurl OpenSSL::SSL OpenSSL::Crypto)
|
||||
-#target_link_libraries(libslic3r_gui libslic3r cereal imgui imguizmo minilzo GLEW::GLEW OpenGL::GL hidapi libcurl OpenSSL::SSL OpenSSL::Crypto ${wxWidgets_LIBRARIES} glfw)
|
||||
+target_link_libraries(libslic3r_gui libslic3r imgui imguizmo minilzo GLEW::GLEW OpenGL::GL hidapi ${wxWidgets_LIBRARIES} glfw libcurl OpenSSL::SSL OpenSSL::Crypto)
|
||||
+#target_link_libraries(libslic3r_gui libslic3r imgui imguizmo minilzo GLEW::GLEW OpenGL::GL hidapi libcurl OpenSSL::SSL OpenSSL::Crypto ${wxWidgets_LIBRARIES} glfw)
|
||||
|
||||
if (MSVC)
|
||||
target_link_libraries(libslic3r_gui Setupapi.lib)
|
||||
@@ -10,16 +10,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "biome";
|
||||
version = "2.2.7";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "biomejs";
|
||||
repo = "biome";
|
||||
rev = "@biomejs/biome@${finalAttrs.version}";
|
||||
hash = "sha256-VBNFQkgruomZjDaQouR4KZooGNN/0VCRYFRomdhPFF8=";
|
||||
hash = "sha256-SUihyk1tbSiF3uY19/T9ZgQsURVc81p8lFMN933p6f0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-CkKwzTi9yqao8mGqIu4F2lqMKZVpFsLUtccXOSXr+uw=";
|
||||
cargoHash = "sha256-nzQb2GJFltktA10Rrl7tltHVjVYNPgLNpDzOXCHQeQA=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ente-web-${enteApp}";
|
||||
version = "1.2.11";
|
||||
version = "1.2.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ente-io";
|
||||
@@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
sparseCheckout = [ "web" ];
|
||||
tag = "photos-v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-h+Bkz41rOAQhRqDdzUx+CWNq2QYvGFw+TE0ryps63bI=";
|
||||
hash = "sha256-27Jmv7dbXwR31KBvWcMZ4p972BxUivN2tbZq7ISplSg=";
|
||||
};
|
||||
sourceRoot = "${finalAttrs.src.name}/web";
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${finalAttrs.src}/web/yarn.lock";
|
||||
hash = "sha256-g6g4VCn6pQWIqhaUctMISHvbQv+o+B+MFSWKT+S7YVU=";
|
||||
hash = "sha256-m+7woB5XnOPDMLpoIBui1GxeW1BOms18SKJ8vaJcv68=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
withAdjustor ? false,
|
||||
|
||||
# dependencies
|
||||
systemd,
|
||||
@@ -13,6 +14,7 @@
|
||||
lsof,
|
||||
btrfs-progs,
|
||||
util-linux,
|
||||
adjustor,
|
||||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "handheld-daemon";
|
||||
@@ -79,14 +81,19 @@ python3Packages.buildPythonApplication rec {
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
evdev
|
||||
pyserial
|
||||
pyyaml
|
||||
rich
|
||||
setuptools
|
||||
xlib
|
||||
];
|
||||
dependencies =
|
||||
with python3Packages;
|
||||
[
|
||||
evdev
|
||||
pyserial
|
||||
pyyaml
|
||||
rich
|
||||
setuptools
|
||||
xlib
|
||||
]
|
||||
++ lib.optionals withAdjustor [
|
||||
adjustor
|
||||
];
|
||||
|
||||
# This package doesn't have upstream tests.
|
||||
doCheck = false;
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "kubernetes-validate";
|
||||
version = "1.33.1";
|
||||
version = "1.34.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "kubernetes_validate";
|
||||
inherit version;
|
||||
hash = "sha256-U2Nb9mpeBJASCa5/av8OjBnvoUXMmpCHI0TJKjE1Opk=";
|
||||
hash = "sha256-uC2kR6QG/EdauD4PZ4tkQixZX8EHcN0nMyDCRMm0AxU=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -8,12 +8,12 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "models-dev";
|
||||
version = "0-unstable-2025-10-25";
|
||||
version = "0-unstable-2025-10-28";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sst";
|
||||
repo = "models.dev";
|
||||
rev = "6aaec4681f415cd7c87519b4acd61720525cdda1";
|
||||
hash = "sha256-77PoCq072udYDsplW1ENQbw/8lQqXrEiPFh2e/oAqVw=";
|
||||
rev = "86138343a8c048caa813c17ac56fda39e92458bf";
|
||||
hash = "sha256-VYR9Sp7AKQ6abJg1Dyhr/GyYwGgE9XcuKHLW3an5/wY=";
|
||||
};
|
||||
|
||||
node_modules = stdenvNoCC.mkDerivation {
|
||||
|
||||
@@ -28,13 +28,13 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "opencloud";
|
||||
version = "3.5.0";
|
||||
version = "3.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opencloud-eu";
|
||||
repo = "opencloud";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-NPBz9pevjDUqDrEg/S6Vtk+jAA9f2H95ehO8EgcB1eY=";
|
||||
hash = "sha256-D9bqTsRMOgaeAj8k1H2Jz1zhagnaq1SCSzN8HHy4A3k=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -9,19 +9,19 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "opencloud-web";
|
||||
version = "4.0.0";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opencloud-eu";
|
||||
repo = "web";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-IMFbDPVn32offVIHHxQvHjauQLGYnFf/s1mAo6OF7Mk=";
|
||||
hash = "sha256-m02qZS2au6gH0D009Mt8H2qKp2VdVxSIT0q3RKRkh8U=";
|
||||
};
|
||||
|
||||
pnpmDeps = pnpm_10.fetchDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-CHImAISDPhjfhB+Qj3fuo6jaOyi+wBVwuLm8ODzRU4M=";
|
||||
hash = "sha256-wHrVBb/um7+6prBTzc30MXMCtERgGFV0mGvfS19tyTI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,23 +10,23 @@
|
||||
|
||||
let
|
||||
pname = "osu-lazer-bin";
|
||||
version = "2025.912.0";
|
||||
version = "2025.1029.1";
|
||||
|
||||
src =
|
||||
{
|
||||
aarch64-darwin = fetchzip {
|
||||
url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Apple.Silicon.zip";
|
||||
hash = "sha256-wGThpn4Yb3t02MYrn1Sg8S48ak6n09T1vPSpF5zEx7E=";
|
||||
hash = "sha256-Asqz0jiiHTtLcBzvibNzlaRe0jAop5YU4gmooZf/8gw=";
|
||||
stripRoot = false;
|
||||
};
|
||||
x86_64-darwin = fetchzip {
|
||||
url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Intel.zip";
|
||||
hash = "sha256-OWqCqAQx1e6TsVdvOezF3gvZ06tXFIEfNMb5LA4mf5s=";
|
||||
hash = "sha256-2ZAZ3CnYz/6VJxqpDNvx6jGcNV/9oo8Eb5/GkSidiv0=";
|
||||
stripRoot = false;
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.AppImage";
|
||||
hash = "sha256-73UY3RJp0pFfbxRWX8qSnLeoZB/BRGtucmQClJP7Qwg=";
|
||||
hash = "sha256-lx+RN20sPiG++pLS0gW6ixIYw3+g1KGCMrAhgW+yZIw=";
|
||||
};
|
||||
}
|
||||
.${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported.");
|
||||
|
||||
Generated
+14
-14
@@ -571,23 +571,23 @@
|
||||
},
|
||||
{
|
||||
"pname": "OpenTabletDriver",
|
||||
"version": "0.6.5.1",
|
||||
"hash": "sha256-/awjEXQ2F8Zoj/2xZJnSg8pBP6hN0zet0lycALfjVoM="
|
||||
"version": "0.6.6.2",
|
||||
"hash": "sha256-y8qI1EPIxKky0M4wDwvo0EEnkXGKNa5bmclPlQGvCBY="
|
||||
},
|
||||
{
|
||||
"pname": "OpenTabletDriver.Configurations",
|
||||
"version": "0.6.5.1",
|
||||
"hash": "sha256-4NFcoDlDrNKnaV+Vz6nGKGhZzxPB6ykEAiauHrDRfGU="
|
||||
"version": "0.6.6.2",
|
||||
"hash": "sha256-tsVq8FRk472eqMhRjyxDZlu8R0M4x7IyLcBVFnDLpF8="
|
||||
},
|
||||
{
|
||||
"pname": "OpenTabletDriver.Native",
|
||||
"version": "0.6.5.1",
|
||||
"hash": "sha256-04Oh5wYEj1qRq6RIoSM9bDTzwFKJS3LKo9d25FAyseI="
|
||||
"version": "0.6.6.2",
|
||||
"hash": "sha256-okPhvAieIc+4ojQK9vd9kWQcAIXhcKZBl5D3eJ4gQxc="
|
||||
},
|
||||
{
|
||||
"pname": "OpenTabletDriver.Plugin",
|
||||
"version": "0.6.5.1",
|
||||
"hash": "sha256-9N8+hq2ZoAiZlU6pk214zu3e4l50s40bgYUK3Aw7w7k="
|
||||
"version": "0.6.6.2",
|
||||
"hash": "sha256-EcrM+3NeTrPnIhNGPqNm2LzUTxdDGRC1BwyaCYlrUYE="
|
||||
},
|
||||
{
|
||||
"pname": "PolySharp",
|
||||
@@ -626,8 +626,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "ppy.osu.Framework",
|
||||
"version": "2025.908.0",
|
||||
"hash": "sha256-ywGPEtZqgeqgG7LJ459FfRy+JtCw9zChuYUHHY4QIcU="
|
||||
"version": "2025.1028.0",
|
||||
"hash": "sha256-np5O4DOajO/UB2ihWUYYo81q+he4HWG1AAtn/P5rFgw="
|
||||
},
|
||||
{
|
||||
"pname": "ppy.osu.Framework.NativeLibs",
|
||||
@@ -641,8 +641,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "ppy.osu.Game.Resources",
|
||||
"version": "2025.911.0",
|
||||
"hash": "sha256-N7CPME+A+tPpojOe7HN7Vz49VwtcmRKCJK4IIdY0kFs="
|
||||
"version": "2025.1006.0",
|
||||
"hash": "sha256-ZHwi8l8JVu+wTEtAkgoLSFmt8z8vVJIIsTR29gRbrCA="
|
||||
},
|
||||
{
|
||||
"pname": "ppy.osuTK.NS20",
|
||||
@@ -656,8 +656,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "ppy.SDL3-CS",
|
||||
"version": "2025.828.0",
|
||||
"hash": "sha256-3+ShJIv4TJuzPAIF7uiwOXVyb+5EpCAuIz1Ff0dPdhA="
|
||||
"version": "2025.920.0",
|
||||
"hash": "sha256-gNy0f95tR3hXkagzLH/mngGSsDA7UqIMKYyTf00nsCI="
|
||||
},
|
||||
{
|
||||
"pname": "ppy.Veldrid",
|
||||
|
||||
@@ -22,13 +22,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "osu-lazer";
|
||||
version = "2025.912.0";
|
||||
version = "2025.1029.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ppy";
|
||||
repo = "osu";
|
||||
tag = "${version}-lazer";
|
||||
hash = "sha256-OpFiqGldVK0GpIlNopRhbFzb6tOvKnLr/zQeQvWPgmA=";
|
||||
hash = "sha256-zIeeZVyI//uTZDH3i7FyuKRDDRcVRaT/43/4F5/Lamw=";
|
||||
};
|
||||
|
||||
projectFile = "osu.Desktop/osu.Desktop.csproj";
|
||||
|
||||
+6063
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,44 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
php84,
|
||||
}:
|
||||
|
||||
let
|
||||
php = php84;
|
||||
in
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "postfixadmin";
|
||||
version = "4.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "postfixadmin";
|
||||
repo = "postfixadmin";
|
||||
tag = "postfixadmin-${finalAttrs.version}";
|
||||
hash = "sha256-mr5FBURTGP2J3JMlcexXjz4GFJNqPR4rZyqHVN7+6iM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-gv6QYuHGo2r2WgtLPLco/PmKxYSijDkpWoF/vIR5y5s=";
|
||||
|
||||
# Upstream does not ship a lock file, we have to maintain our own for now.
|
||||
# https://github.com/postfixadmin/postfixadmin/issues/948
|
||||
composerLock = ./composer.lock;
|
||||
|
||||
postInstall = ''
|
||||
out_dir="$out"/share/php/postfixadmin/
|
||||
|
||||
ln -sf /etc/postfixadmin/config.local.php "$out_dir"
|
||||
ln -sf /var/cache/postfixadmin/templates_c "$out_dir"
|
||||
'';
|
||||
|
||||
passthru.phpPackage = php;
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/postfixadmin/postfixadmin/releases/tag/${finalAttrs.src.tag}";
|
||||
description = "Web based virtual user administration interface for Postfix mail servers";
|
||||
homepage = "https://postfixadmin.sourceforge.io/";
|
||||
maintainers = with lib.maintainers; [ yayayayaka ];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
@@ -56,7 +56,7 @@ buildGoModule (finalAttrs: {
|
||||
homepage = "https://github.com/grafana/pyroscope";
|
||||
changelog = "https://github.com/grafana/pyroscope/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = [ lib.teams.mercury ];
|
||||
teams = [ lib.teams.mercury ];
|
||||
mainProgram = "pyroscope";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -26,14 +26,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "s7";
|
||||
version = "11.7-unstable-2025-10-26";
|
||||
version = "11.7-unstable-2025-10-29";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "cm-gitlab.stanford.edu";
|
||||
owner = "bil";
|
||||
repo = "s7";
|
||||
rev = "6fc94288ed46533527b1ddb24c3b162a9d0f7ab7";
|
||||
hash = "sha256-kJhvgZ/GTSSplmY6bzHxHhtgukssepBsSWD7kwXwnps=";
|
||||
rev = "cb3da9a414401e447066c6f2ccd4476c2da886ec";
|
||||
hash = "sha256-RHYALNWKxQ5mgU/mvQVsVW87Efd+kxgIBkw7vOgwVAo=";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
# nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa
|
||||
rec {
|
||||
pname = "mesa";
|
||||
version = "25.2.5";
|
||||
version = "25.2.6";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "mesa";
|
||||
repo = "mesa";
|
||||
rev = "mesa-${version}";
|
||||
hash = "sha256-3ZoC1aY0EMbyoQe4twNfyVHaZeyCbvqTJ57tMuc1YYo=";
|
||||
hash = "sha256-erfvNR1Yor3k8gVVClyiBJsgyaOv7BMFd1NSgieTY5I=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -8,15 +8,15 @@
|
||||
alcotest,
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "dockerfile";
|
||||
version = "8.3.2";
|
||||
version = "8.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocurrent";
|
||||
repo = "ocaml-dockerfile";
|
||||
tag = version;
|
||||
hash = "sha256-L4TjCf8SaNMxqkrr+AoL/Lx2oWgf2owJFs26lu68ejs=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-F58KnC4YpsS0ehmi6efFMT+WG5BDuYfQOA1RsFVtO/8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@@ -35,8 +35,8 @@ buildDunePackage rec {
|
||||
description = "Interface for creating Dockerfiles";
|
||||
homepage = "https://www.ocurrent.org/ocaml-dockerfile/dockerfile/Dockerfile/index.html";
|
||||
downloadPage = "https://github.com/ocurrent/ocaml-dockerfile";
|
||||
changelog = "https://github.com/ocurrent/ocaml-dockerfile/blob/v${version}/CHANGES.md";
|
||||
changelog = "https://github.com/ocurrent/ocaml-dockerfile/blob/${finalAttrs.version}/CHANGES.md";
|
||||
license = lib.licenses.isc;
|
||||
maintainers = [ lib.maintainers.ethancedwards8 ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,19 +1,21 @@
|
||||
{
|
||||
lib,
|
||||
fetchzip,
|
||||
fetchFromGitHub,
|
||||
buildDunePackage,
|
||||
re,
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "ninja_utils";
|
||||
version = "0.9.0";
|
||||
version = "1.0.0";
|
||||
|
||||
minimalOCamlVersion = "4.12";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/CatalaLang/ninja_utils/archive/refs/tags/${version}.tar.gz";
|
||||
hash = "sha256-VSj1IXfczoI3lSAtOqQPIqsxX+HgyxKzlssKd7By/Lo=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "CatalaLang";
|
||||
repo = "ninja_utils";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-2OYsZVk7/KYHXHTqAAEyVEHzcUCC+vBRU1s1XdfnWaE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ re ];
|
||||
@@ -22,6 +24,6 @@ buildDunePackage rec {
|
||||
description = "Small library used to generate Ninja build files";
|
||||
homepage = "https://github.com/CatalaLang/ninja_utils";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ ];
|
||||
maintainers = [ lib.maintainers.stepbrobd ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -74,6 +74,6 @@ buildPythonPackage rec {
|
||||
description = "Python interface to R";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib; [ teams.sage ];
|
||||
teams = with lib.teams; [ sage ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
|
||||
|
||||
meta = {
|
||||
description = "Test that frugally-deep can load MIOpen model files";
|
||||
maintainers = with lib.teams; [ rocm ];
|
||||
teams = with lib.teams; [ rocm ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "BottlecapDave";
|
||||
domain = "octopus_energy";
|
||||
version = "17.0.3";
|
||||
version = "17.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit owner;
|
||||
repo = "HomeAssistant-OctopusEnergy";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-mogPWl+3BqGSURH7jnbJYB/68ijc1lkfSAc6HfwZWFw=";
|
||||
hash = "sha256-2xfchJUFi8c+DK84p8bdersb/BSTclSz0JU7P9uYatM=";
|
||||
};
|
||||
|
||||
dependencies = [ pydantic ];
|
||||
|
||||
@@ -1219,7 +1219,6 @@ mapAliases {
|
||||
polypane = throw "'polypane' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-25
|
||||
poppler_utils = throw "'poppler_utils' has been renamed to/replaced by 'poppler-utils'"; # Converted to throw 2025-10-27
|
||||
posterazor = throw "posterazor was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
|
||||
postfixadmin = throw "'postfixadmin' has been removed due to lack of maintenance and missing support for PHP >8.1"; # Added 2025-10-03
|
||||
postgis = throw "'postgis' has been removed. Use 'postgresqlPackages.postgis' instead."; # Added 2025-07-19
|
||||
postgres-lsp = lib.warnOnInstantiate "'postgres-lsp' has been renamed to 'postgres-language-server'" postgres-language-server; # Added 2025-10-28
|
||||
postgresql13JitPackages = throw "'postgresql13JitPackages' has been renamed to/replaced by 'postgresql13Packages'"; # Converted to throw 2025-10-27
|
||||
|
||||
Reference in New Issue
Block a user