Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
@@ -78,8 +78,8 @@ in
|
||||
copy_bin_and_libs ${pkgs.curl}/bin/curl
|
||||
copy_bin_and_libs ${pkgs.bashNonInteractive}/bin/bash
|
||||
copy_bin_and_libs ${pkgs.cryptsetup}/bin/cryptsetup
|
||||
copy_bin_and_libs ${pkgs.gnused}/bin/gnused
|
||||
copy_bin_and_libs ${pkgs.gnugrep}/bin/gnugrep
|
||||
copy_bin_and_libs ${pkgs.gnused}/bin/sed
|
||||
copy_bin_and_libs ${pkgs.gnugrep}/bin/grep
|
||||
|
||||
copy_bin_and_libs ${pkgs.tpm2-tools}/bin/.tpm2-wrapped
|
||||
mv $out/bin/{.tpm2-wrapped,tpm2}
|
||||
@@ -106,6 +106,7 @@ in
|
||||
systemd = {
|
||||
extraBin = lib.mkIf systemd.enable {
|
||||
clevis = "${cfg.package}/bin/clevis";
|
||||
curl = "${pkgs.curl}/bin/curl";
|
||||
};
|
||||
|
||||
storePaths = lib.mkIf systemd.enable [
|
||||
|
||||
@@ -27,13 +27,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"aiven_aiven": {
|
||||
"hash": "sha256-Aih7prC6CKv414bxiJnV3PFXZfH0MxsmS2g9c4eVWOk=",
|
||||
"hash": "sha256-lNDorhkIngyZ8S51lyuI3LRtnFtzVG01Nzo1vRPytbQ=",
|
||||
"homepage": "https://registry.terraform.io/providers/aiven/aiven",
|
||||
"owner": "aiven",
|
||||
"repo": "terraform-provider-aiven",
|
||||
"rev": "v4.50.0",
|
||||
"rev": "v4.51.0",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-S2QbhaK7GlfUnggLE9wNNJCrNnk5ReD7kY8yeRKPi7Q="
|
||||
"vendorHash": "sha256-c4eCY/iQ8v/gBX55j22TRxWIeoevi5EJs4TtN9xXfKA="
|
||||
},
|
||||
"akamai_akamai": {
|
||||
"hash": "sha256-WXIx2/1EiamjolyPy+d3Gwp4hOguJrmxKwgLZqzQqDg=",
|
||||
@@ -580,13 +580,13 @@
|
||||
"vendorHash": "sha256-lhTdDrTwTbRuWngQ+NGuh+x5Z5HZfVTtNi+mZqIENbg="
|
||||
},
|
||||
"hashicorp_google-beta": {
|
||||
"hash": "sha256-NRTnx5nqdCtjz0mGZjuA96jEzW1rKR+M0AY2//TAYk4=",
|
||||
"hash": "sha256-frRtwDdgNNux875U9rgSbZict8//X/WzxM7EBSxRqW4=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-google-beta",
|
||||
"rev": "v7.18.0",
|
||||
"rev": "v7.20.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-/wClcz8fwl9Of2JSKcfETs7VR6c5KrYnnF+yW5iUoSU="
|
||||
"vendorHash": "sha256-KnB6R5yrEeaf4Z+LzQjCeQJjAgHK0kJEJzT1rb3pimY="
|
||||
},
|
||||
"hashicorp_helm": {
|
||||
"hash": "sha256-S4Fe65f+gEWWxRMC+/i93dwwe7QigPccx4wiqNBpcL8=",
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.11.12";
|
||||
version = "0.11.13";
|
||||
in
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "ablog";
|
||||
@@ -17,7 +17,7 @@ python3Packages.buildPythonApplication {
|
||||
owner = "sunpy";
|
||||
repo = "ablog";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-bPTaxkuIKeypfnZItG9cl51flHBIx/yg0qENuiqQgY4=";
|
||||
hash = "sha256-P1eSN3wqlPNYbYW3Rkz2Y6yFcC379dt/qK8aVNwZRSs=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
@@ -43,7 +43,6 @@ python3Packages.buildPythonApplication {
|
||||
|
||||
pytestFlags = [
|
||||
"--rootdir=src/ablog"
|
||||
"-Wignore::sphinx.deprecation.RemovedInSphinx90Warning" # Ignore ImportError
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
|
||||
@@ -5,14 +5,16 @@
|
||||
nix-update-script,
|
||||
cmake,
|
||||
ninja,
|
||||
qtbase,
|
||||
qtwayland,
|
||||
qt5,
|
||||
qt6,
|
||||
libxcb,
|
||||
useQt6 ? false,
|
||||
}:
|
||||
let
|
||||
qt = if useQt6 then qt6 else qt5;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "adwaita-qt";
|
||||
version = "1.4.2";
|
||||
|
||||
@@ -24,8 +26,8 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "FedoraQt";
|
||||
repo = "adwaita-qt";
|
||||
rev = version;
|
||||
sha256 = "sha256-K/+SL52C+M2OC4NL+mhBnm/9BwH0KNNTGIDmPwuUwkM=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-K/+SL52C+M2OC4NL+mhBnm/9BwH0KNNTGIDmPwuUwkM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -34,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qt.qtbase
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
libxcb
|
||||
@@ -43,7 +45,7 @@ stdenv.mkDerivation rec {
|
||||
qt5.qtx11extras
|
||||
]
|
||||
++ lib.optionals useQt6 [
|
||||
qtwayland
|
||||
qt6.qtwayland
|
||||
];
|
||||
|
||||
# Qt setup hook complains about missing `wrapQtAppsHook` otherwise.
|
||||
@@ -70,4 +72,4 @@ stdenv.mkDerivation rec {
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
writeTextFile,
|
||||
|
||||
pkg-config,
|
||||
@@ -43,6 +44,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
./remove-default-commit-hash.patch
|
||||
./remove-vendored-libraries.patch
|
||||
./fix-avcodec-close.patch
|
||||
(fetchpatch {
|
||||
name = "CVE-2026-2245.patch";
|
||||
url = "https://github.com/CCExtractor/ccextractor/commit/fd7271bae238ccb3ae8a71304ea64f0886324925.patch";
|
||||
hash = "sha256-wZiJob5v4SVa5YBmiHuNvgphSi4PhTTb3hg4vs1lhVg=";
|
||||
})
|
||||
]
|
||||
++ finalAttrs.cargoDeps.vendorStaging.patches;
|
||||
|
||||
|
||||
@@ -1,21 +1,20 @@
|
||||
{
|
||||
buildPythonApplication,
|
||||
fetchPypi,
|
||||
lib,
|
||||
pycryptodome,
|
||||
python3Packages,
|
||||
fetchPypi,
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "dcnnt";
|
||||
version = "0.10.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-73ZLgb5YcXlAOjbKLVv8oqgS6pstBdJxa7LFUgIHpUE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
pycryptodome
|
||||
];
|
||||
|
||||
@@ -30,4 +29,4 @@ buildPythonApplication rec {
|
||||
maintainers = with lib.maintainers; [ arnoutkroeze ];
|
||||
mainProgram = "dcnnt";
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -1,29 +0,0 @@
|
||||
From cdbf3ba41ddce41d8ae375464e514f72d158ec0b Mon Sep 17 00:00:00 2001
|
||||
From: Marcin Serwin <marcin@serwin.dev>
|
||||
Date: Sat, 5 Jul 2025 22:26:49 +0200
|
||||
Subject: [PATCH] CMakeLists: update mcl version to 0.1.13
|
||||
|
||||
The mcl in externals is already at this version, but it wasn't bumped
|
||||
here which makes it impossible to use prebuilt mcl.
|
||||
|
||||
Signed-off-by: Marcin Serwin <marcin@serwin.dev>
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index e95050da..edd153d0 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -145,7 +145,7 @@ set(TSL_ROBIN_MAP_ENABLE_INSTALL ON)
|
||||
|
||||
find_package(Boost 1.57 REQUIRED)
|
||||
find_package(fmt 9 CONFIG)
|
||||
-find_package(mcl 0.1.12 EXACT CONFIG)
|
||||
+find_package(mcl 0.1.13 EXACT CONFIG)
|
||||
find_package(tsl-robin-map CONFIG)
|
||||
|
||||
if ("arm64" IN_LIST ARCHITECTURE OR DYNARMIC_TESTS)
|
||||
--
|
||||
2.49.0
|
||||
|
||||
@@ -13,69 +13,21 @@
|
||||
nix-update-script,
|
||||
azahar,
|
||||
darwin,
|
||||
oaknut,
|
||||
mcl-cpp-utility-lib,
|
||||
}:
|
||||
let
|
||||
oaknut = stdenv.mkDerivation {
|
||||
pname = "oaknut";
|
||||
version = "1.2.2-unstable-2024-03-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "merryhime";
|
||||
repo = "oaknut";
|
||||
rev = "94c726ce0338b054eb8cb5ea91de8fe6c19f4392";
|
||||
hash = "sha256-IhP/110NGN42/FvpGIEm9MgsSiPYdtD8kNxL0cAWbqM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
];
|
||||
};
|
||||
|
||||
mcl = stdenv.mkDerivation {
|
||||
pname = "mcl";
|
||||
version = "0.1.13-unstable-2025-03-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "azahar-emu";
|
||||
repo = "mcl";
|
||||
rev = "7b08d83418f628b800dfac1c9a16c3f59036fbad";
|
||||
hash = "sha256-uTOiOlMzKbZSjKjtVSqFU+9m8v8horoCq3wL0O2E8sI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
fmt
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
catch2_3
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
checkPhase = ''
|
||||
tests/mcl-tests
|
||||
'';
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dynarmic";
|
||||
version = "6.7.0-unstable-2025-03-16";
|
||||
version = "6.7.0-unstable-2026-01-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "azahar-emu";
|
||||
repo = "dynarmic";
|
||||
rev = "278405bd71999ed3f3c77c5f78344a06fef798b9";
|
||||
hash = "sha256-D7nXn5y0h8FV0V8Tc8uBlRoeEU+gcpt44afujZvG+1A=";
|
||||
rev = "526227eebe1efff3fb14dbf494b9c5b44c2e9c1f";
|
||||
hash = "sha256-WG9mUFUnhEEF0+qsQzslTAj1nox3jaz6rVKs245EtV4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/azahar-emu/dynarmic/pull/2
|
||||
./0001-CMakeLists-update-mcl-version-to-0.1.13.patch
|
||||
# https://github.com/azahar-emu/dynarmic/pull/3
|
||||
./0001-xbyak-Fix-tests-when-using-newer-versions.patch
|
||||
];
|
||||
@@ -94,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildInputs = [
|
||||
boost
|
||||
robin-map
|
||||
mcl
|
||||
mcl-cpp-utility-lib
|
||||
fmt
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isAarch64 [
|
||||
@@ -123,8 +75,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
doCheck = true;
|
||||
|
||||
passthru = {
|
||||
inherit mcl oaknut;
|
||||
|
||||
updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
|
||||
tests = { inherit azahar; };
|
||||
};
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
|
||||
index 2c88356888..96198006b7 100644
|
||||
--- a/src/common/settings.cpp
|
||||
+++ b/src/common/settings.cpp
|
||||
@@ -176,7 +176,7 @@ bool IsFastmemEnabled() {
|
||||
if (values.cpu_accuracy.GetValue() == CpuAccuracy::Unsafe) {
|
||||
return bool(values.cpuopt_unsafe_host_mmu);
|
||||
}
|
||||
-#if !defined(__APPLE__) && !defined(__linux__) && !defined(__ANDROID__) && !defined(_WIN32)
|
||||
+#if !defined(__APPLE__) && !defined(__linux__) && !defined(__ANDROID__) && !defined(_WIN32) || (defined(__linux__) && defined(__aarch64__))
|
||||
return false;
|
||||
#else
|
||||
return true;
|
||||
@@ -0,0 +1,254 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
cmake,
|
||||
ninja,
|
||||
SDL2,
|
||||
boost,
|
||||
catch2_3,
|
||||
cpp-jwt,
|
||||
cubeb,
|
||||
enet,
|
||||
fetchFromGitea,
|
||||
fetchurl,
|
||||
ffmpeg-headless,
|
||||
fmt,
|
||||
frozen-containers,
|
||||
gamemode,
|
||||
glslang,
|
||||
httplib,
|
||||
kdePackages,
|
||||
libopus,
|
||||
libusb1,
|
||||
lz4,
|
||||
mcl-cpp-utility-lib,
|
||||
mbedtls,
|
||||
nix-update-script,
|
||||
nlohmann_json,
|
||||
oaknut,
|
||||
openssl,
|
||||
pipewire,
|
||||
pkg-config,
|
||||
python3,
|
||||
qt6,
|
||||
simpleini,
|
||||
sirit,
|
||||
spirv-headers,
|
||||
spirv-tools,
|
||||
stb,
|
||||
unordered_dense,
|
||||
vulkan-headers,
|
||||
vulkan-loader,
|
||||
vulkan-memory-allocator,
|
||||
vulkan-utility-libraries,
|
||||
xbyak,
|
||||
zlib,
|
||||
zstd,
|
||||
tzdata,
|
||||
}:
|
||||
|
||||
let
|
||||
# Old yuzu compat list, the project does not publish its own at the moment
|
||||
compat-list = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/flathub/org.yuzu_emu.yuzu/4abf1d239aba843180abfed58fa8541432fece5b/compatibility_list.json";
|
||||
hash = "sha256-OC22KdawYK9yKiffqc1rtgrBanVExYMi9jqhvkwMD6w=";
|
||||
};
|
||||
|
||||
nx_tzdb = stdenv.mkDerivation (finalAttrs: {
|
||||
name = "tzdb_to_nx";
|
||||
version = "120226";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "git.crueter.xyz";
|
||||
owner = "misc";
|
||||
repo = "tzdb_to_nx";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-egPu8UVbj73RQ0Z5JMTjd5HVdy47WTfkUMlQaS0wUTg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeFeature "TZDB2NX_ZONEINFO_DIR" "${tzdata}/share/zoneinfo")
|
||||
(lib.cmakeFeature "TZDB2NX_VERSION" tzdata.version)
|
||||
];
|
||||
|
||||
ninjaFlags = [ "x80e" ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
cp -r src/tzdb/nx $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
});
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "eden";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "git.eden-emu.dev";
|
||||
owner = "eden-emu";
|
||||
repo = "eden";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-tkro7ZHgn2809Utf/Li5+OiseywyQKH15eqphxlJZQQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
glslang
|
||||
pkg-config
|
||||
python3
|
||||
qt6.qttools
|
||||
qt6.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
cpp-jwt
|
||||
cubeb
|
||||
enet
|
||||
ffmpeg-headless
|
||||
fmt
|
||||
frozen-containers
|
||||
gamemode
|
||||
httplib
|
||||
kdePackages.quazip
|
||||
libopus
|
||||
libusb1
|
||||
# intentionally omitted: LLVM - heavy, only used for stack traces in the debugger
|
||||
lz4
|
||||
mcl-cpp-utility-lib
|
||||
nlohmann_json
|
||||
openssl
|
||||
qt6.qtbase
|
||||
qt6.qtmultimedia
|
||||
qt6.qtwayland
|
||||
qt6.qtwebengine
|
||||
# intentionally omitted: renderdoc - heavy, developer only
|
||||
SDL2
|
||||
stb
|
||||
simpleini
|
||||
spirv-tools
|
||||
spirv-headers
|
||||
vulkan-headers
|
||||
vulkan-memory-allocator
|
||||
vulkan-utility-libraries
|
||||
mbedtls
|
||||
sirit
|
||||
unordered_dense
|
||||
zlib
|
||||
zstd
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isx86_64 [
|
||||
xbyak
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isAarch64 [
|
||||
oaknut
|
||||
];
|
||||
|
||||
patches = [
|
||||
# https://git.eden-emu.dev/eden-emu/eden/issues/3484
|
||||
./aarch64-disable-fastmem.patch
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkInputs = [
|
||||
catch2_3
|
||||
oaknut
|
||||
];
|
||||
|
||||
__structuredAttrs = true;
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck)
|
||||
(lib.cmakeBool "YUZU_TESTS" false) # some timer tests are flaky
|
||||
|
||||
# use system libraries
|
||||
(lib.cmakeBool "CPMUTIL_FORCE_SYSTEM" true)
|
||||
(lib.cmakeBool "YUZU_USE_EXTERNAL_SDL2" false)
|
||||
(lib.cmakeBool "YUZU_USE_BUNDLED_FFMPEG" false)
|
||||
(lib.cmakeFeature "YUZU_TZDB_PATH" "${nx_tzdb}")
|
||||
|
||||
# enable some optional features
|
||||
(lib.cmakeBool "YUZU_USE_QT_WEB_ENGINE" true)
|
||||
(lib.cmakeBool "YUZU_USE_QT_MULTIMEDIA" true)
|
||||
(lib.cmakeBool "ENABLE_QT_TRANSLATION" true)
|
||||
|
||||
# We dont want to bother upstream with potentially outdated compat reports
|
||||
(lib.cmakeBool "YUZU_ENABLE_COMPATIBILITY_REPORTING" false)
|
||||
|
||||
(lib.cmakeFeature "TITLE_BAR_FORMAT_IDLE" "${finalAttrs.pname} | ${finalAttrs.version} (nixpkgs) {}")
|
||||
(lib.cmakeFeature "TITLE_BAR_FORMAT_RUNNING" "${finalAttrs.pname} | ${finalAttrs.version} (nixpkgs) | {}")
|
||||
];
|
||||
|
||||
postConfigure = ''
|
||||
ln -sf ${compat-list} ./dist/compatibility_list/compatibility_list.json
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -Dm444 $src/dist/72-yuzu-input.rules $out/lib/udev/rules.d/72-yuzu-input.rules
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
qtWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${
|
||||
lib.makeLibraryPath [
|
||||
vulkan-loader
|
||||
pipewire
|
||||
]
|
||||
})
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit nx_tzdb compat-list;
|
||||
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Switch 1 emulator derived from Yuzu and Sudachi";
|
||||
homepage = "https://eden-emu.dev/";
|
||||
mainProgram = "eden";
|
||||
maintainers = with lib.maintainers; [ marcin-serwin ];
|
||||
license = with lib.licenses; [
|
||||
# Primary
|
||||
gpl3Plus
|
||||
|
||||
# Build system
|
||||
lgpl3Plus
|
||||
|
||||
# Dynarmic and Yuzu code
|
||||
gpl2Plus
|
||||
bsd0
|
||||
|
||||
# Icons
|
||||
cc-by-40
|
||||
cc-by-sa-30
|
||||
cc0
|
||||
|
||||
# Timezone data
|
||||
publicDomain
|
||||
|
||||
# Vendored/incorporated libs
|
||||
apsl20
|
||||
llvm-exception
|
||||
lib.licenses.boost
|
||||
bsd2
|
||||
bsd3
|
||||
mit
|
||||
mpl20
|
||||
wtfpl
|
||||
];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,38 @@
|
||||
From 8b1db0c6724640ff995c24145a9777bd49da1ce4 Mon Sep 17 00:00:00 2001
|
||||
From: Marcin Serwin <marcin@serwin.dev>
|
||||
Date: Fri, 21 Nov 2025 19:11:48 +0100
|
||||
Subject: [PATCH] Fix SDL_SOUND_CFLAGS usage
|
||||
|
||||
The flags were quried but unused during compilation. Also, there was a
|
||||
typo in the else branch.
|
||||
|
||||
Signed-off-by: Marcin Serwin <marcin@serwin.dev>
|
||||
---
|
||||
src/sdl/Makefile | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/sdl/Makefile b/src/sdl/Makefile
|
||||
index e21477e..84a2136 100644
|
||||
--- a/src/sdl/Makefile
|
||||
+++ b/src/sdl/Makefile
|
||||
@@ -22,7 +22,7 @@ SDL_CFLAGS += $(shell $(PKGCONF) $(SDL_PKGS) --cflags)
|
||||
SDL_SOUND_CFLAGS += $(shell $(PKGCONF) $(SDL_SOUND_PKGS) --cflags)
|
||||
else
|
||||
SDL_CFLAGS += $(SDL_CFLAGS_DEF)
|
||||
-SD_SOUND_CFLAGS += $(SDL_SOUND_CFLAGS_DEF)
|
||||
+SDL_SOUND_CFLAGS += $(SDL_SOUND_CFLAGS_DEF)
|
||||
endif
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ $(TARGET): $(DEFINES) $(OBJECTS) | $(DEFINES)
|
||||
@echo "** Done with SDL interface."
|
||||
|
||||
%.o: %.c
|
||||
- $(CC) $(CFLAGS) $(SDL_CFLAGS) -fPIC -fpic -o $@ -c $<
|
||||
+ $(CC) $(CFLAGS) $(SDL_CFLAGS) $(SDL_SOUND_CFLAGS) -fPIC -fpic -o $@ -c $<
|
||||
|
||||
$(DEFINES):
|
||||
@echo "** Generating $@"
|
||||
--
|
||||
2.51.2
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
fetchpatch,
|
||||
libao,
|
||||
libmodplug,
|
||||
libsamplerate,
|
||||
@@ -11,28 +10,42 @@
|
||||
ncurses,
|
||||
which,
|
||||
pkg-config,
|
||||
SDL2,
|
||||
SDL2_mixer,
|
||||
zlib,
|
||||
libjpeg,
|
||||
libpng,
|
||||
freetype,
|
||||
frontend ? "ncurses",
|
||||
}:
|
||||
|
||||
assert lib.assertOneOf "frontend" frontend [
|
||||
"ncurses"
|
||||
"sdl"
|
||||
# NOTE: more options are present in the Makefile, e.g., x11, dumb, nosound, ...
|
||||
];
|
||||
let
|
||||
progName = if frontend == "ncurses" then "frotz" else "sfrotz";
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "frotz";
|
||||
version = "2.54";
|
||||
pname = progName;
|
||||
version = "2.55";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.com";
|
||||
owner = "DavidGriffith";
|
||||
repo = "frotz";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-GvGxojD8d5GVy/d8h3q6K7KJroz2lsKbfE0F0acjBl8=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-XZjimskjupTtYdgfVaOS2QnQrDIBSwkJqxrffdjgZk0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/macports/macports-ports/raw/496e5b91e3b6c9dc6820d77ab60dbe400d1924ee/games/frotz/files/Makefile.patch";
|
||||
extraPrefix = "";
|
||||
hash = "sha256-P83ZzSi3bhncQ52Y38Q3F/7v1SJKr5614tytt862HRg=";
|
||||
})
|
||||
# https://gitlab.com/DavidGriffith/frotz/-/merge_requests/226
|
||||
./0001-Fix-SDL_SOUND_CFLAGS-usage.patch
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
enableParallelBuilding = true;
|
||||
nativeBuildInputs = [
|
||||
which
|
||||
pkg-config
|
||||
@@ -43,16 +56,37 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libsamplerate
|
||||
libsndfile
|
||||
libvorbis
|
||||
ncurses
|
||||
];
|
||||
]
|
||||
++ (
|
||||
if frontend == "ncurses" then
|
||||
[ ncurses ]
|
||||
else
|
||||
[
|
||||
freetype
|
||||
libjpeg
|
||||
libpng
|
||||
SDL2
|
||||
SDL2_mixer
|
||||
zlib
|
||||
]
|
||||
);
|
||||
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
makeFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
"HOMEBREW_PREFIX=/var/empty"
|
||||
];
|
||||
preConfigure = ''
|
||||
makeFlagsArray+=(CURSES_CONFIG="$PKG_CONFIG ncurses")
|
||||
'';
|
||||
|
||||
buildFlags = [ frontend ];
|
||||
installTargets = if frontend == "ncurses" then "install-frotz" else "install-${frontend}";
|
||||
|
||||
meta = {
|
||||
homepage = "https://davidgriffith.gitlab.io/frotz/";
|
||||
changelog = "https://gitlab.com/DavidGriffith/frotz/-/raw/${finalAttrs.version}/NEWS";
|
||||
description = "Z-machine interpreter for Infocom games and other interactive fiction";
|
||||
mainProgram = "frotz";
|
||||
description = "Z-machine interpreter for Infocom games and other interactive fiction (${frontend})";
|
||||
mainProgram = progName;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [
|
||||
nicknovitski
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gnmic";
|
||||
version = "0.43.0";
|
||||
version = "0.44.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openconfig";
|
||||
repo = "gnmic";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-+5f4SxAmpZrOmIr8MUR3ImmoPbzFQ0bh/4qnqkpfs1g=";
|
||||
hash = "sha256-gIKhJ8BaJq/IXXOJrY+n8BoAxKxDDXvEc3JDXGcOxW0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-zsb+Tky2yVyEUSKjvnS8YkRFMUf/01VIX2Vl6mB5mpw=";
|
||||
vendorHash = "sha256-osVsIqluU4la2oDWGbjDQq0sM9uCiWgsar5H/XNudV0=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "hyprviz";
|
||||
version = "0.7.1";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "timasoft";
|
||||
repo = "hyprviz";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ar1O/Em9AcPPfbuT4xnyOwBX1IClJlFYfdPQbU/5vTk=";
|
||||
hash = "sha256-5w7+fkf2oB0x5N6xlKjSPbgsB7Ifr1NWW8qWDmGyFwU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-BICF6nZcn/7t5X4Dj18fPD2RpEz7U1Zytt9sfHe7Xnw=";
|
||||
cargoHash = "sha256-+8MKYruPjCTooiY7pxwz5oqIpk4ZidugPrVlMZ1yMI0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -10,12 +10,12 @@
|
||||
libxcrypt,
|
||||
util-linux,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "inetutils";
|
||||
version = "2.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/inetutils/inetutils-${version}.tar.gz";
|
||||
url = "mirror://gnu/inetutils/inetutils-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-oVa+HN48XA/+/CYhgNk2mmBIQIeQeqVUxieH0vQOwIY=";
|
||||
};
|
||||
|
||||
@@ -125,4 +125,4 @@ stdenv.mkDerivation rec {
|
||||
*/
|
||||
priority = (util-linux.meta.priority or lib.meta.defaultPriority) + 1;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,16 +1,14 @@
|
||||
{
|
||||
nodejs,
|
||||
lib,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
nixosTests,
|
||||
fetchNpmDeps,
|
||||
nodejs_20,
|
||||
npmHooks,
|
||||
}:
|
||||
|
||||
with python3Packages;
|
||||
|
||||
buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "isso";
|
||||
version = "0.13.0";
|
||||
format = "setuptools";
|
||||
@@ -18,12 +16,12 @@ buildPythonApplication rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "posativ";
|
||||
repo = "isso";
|
||||
tag = version;
|
||||
sha256 = "sha256-kZNf7Rlb1DZtQe4dK1B283OkzQQcCX+pbvZzfL65gsA=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-kZNf7Rlb1DZtQe4dK1B283OkzQQcCX+pbvZzfL65gsA=";
|
||||
};
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit src;
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-RBpuhFI0hdi8bB48Pks9Ac/UdcQ/DJw+WFnNj5f7IYE=";
|
||||
};
|
||||
|
||||
@@ -38,7 +36,7 @@ buildPythonApplication rec {
|
||||
--replace "self.client.delete_cookie('localhost.local', '1')" "self.client.delete_cookie(key='1', domain='localhost')"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
itsdangerous
|
||||
jinja2
|
||||
misaka
|
||||
@@ -49,25 +47,25 @@ buildPythonApplication rec {
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cffi
|
||||
sphinxHook
|
||||
sphinx
|
||||
nodejs
|
||||
python3Packages.cffi
|
||||
python3Packages.sphinxHook
|
||||
python3Packages.sphinx
|
||||
nodejs_20
|
||||
npmHooks.npmConfigHook
|
||||
];
|
||||
|
||||
NODE_PATH = "$npmDeps";
|
||||
|
||||
preBuild = ''
|
||||
ln -s ${npmDeps}/node_modules ./node_modules
|
||||
export PATH="${npmDeps}/bin:$PATH"
|
||||
ln -s ${finalAttrs.npmDeps}/node_modules ./node_modules
|
||||
export PATH="${finalAttrs.npmDeps}/bin:$PATH"
|
||||
|
||||
make js
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-cov-stub
|
||||
python3Packages.pytestCheckHook
|
||||
python3Packages.pytest-cov-stub
|
||||
];
|
||||
|
||||
passthru.tests = { inherit (nixosTests) isso; };
|
||||
@@ -79,4 +77,4 @@ buildPythonApplication rec {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fgaz ];
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -6,17 +6,18 @@
|
||||
dotnetCorePackages,
|
||||
openssl,
|
||||
mono,
|
||||
nix-update-script,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
buildDotnetModule rec {
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "jackett";
|
||||
version = "0.24.1066";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jackett";
|
||||
repo = "jackett";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-o0Mu5+m6+2iVRIJ8OIlUDNUY9h3qKn1hOsSA1JYd71o=";
|
||||
};
|
||||
|
||||
@@ -32,7 +33,7 @@ buildDotnetModule rec {
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace ${projectFile} ${testProjectFile} \
|
||||
substituteInPlace ${finalAttrs.projectFile} ${finalAttrs.testProjectFile} \
|
||||
--replace-fail '<TargetFrameworks>net9.0;net471</' '<TargetFrameworks>net9.0</'
|
||||
'';
|
||||
|
||||
@@ -49,19 +50,21 @@ buildDotnetModule rec {
|
||||
ln -s $out/bin/jackett $out/bin/Jackett || :
|
||||
ln -s $out/bin/Jackett $out/bin/jackett || :
|
||||
'';
|
||||
passthru.updateScript = ./updater.sh;
|
||||
|
||||
passthru.tests = { inherit (nixosTests) jackett; };
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests = { inherit (nixosTests) jackett; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "API Support for your favorite torrent trackers";
|
||||
mainProgram = "jackett";
|
||||
homepage = "https://github.com/Jackett/Jackett/";
|
||||
changelog = "https://github.com/Jackett/Jackett/releases/tag/v${version}";
|
||||
changelog = "https://github.com/Jackett/Jackett/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
nyanloutre
|
||||
purcell
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -21,6 +21,11 @@ python3Packages.buildPythonApplication rec {
|
||||
hash = "sha256-dZrZjzygT6Q7jIPkasYgJ2uN3eyPQXsg0opksookLYI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "typer-slim" "typer"
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
python3Packages.uv-build
|
||||
];
|
||||
@@ -28,7 +33,7 @@ python3Packages.buildPythonApplication rec {
|
||||
dependencies =
|
||||
with python3Packages;
|
||||
[
|
||||
typer-slim
|
||||
typer
|
||||
]
|
||||
++ lib.optionals withPrecommit [ pre-commit ];
|
||||
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "jjui";
|
||||
version = "0.9.11";
|
||||
version = "0.9.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "idursun";
|
||||
repo = "jjui";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-WkUMDIzVW6n5Zp1r7rp1GgkcgswatmgNYdSpkmz5VWs=";
|
||||
hash = "sha256-CBNMoVALCLWQ9bsrQilnx8djLufLNt8p9iK+HnpUPgc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-nXUaqkCz3QERqevwGk94sRrrPgJoJOPWXYc7iBOMAdY=";
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "k6";
|
||||
version = "1.6.0";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "k6";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-rfurCWplI21vEYEArxp4wrAn6oOWenMkGetFDy5WCAY=";
|
||||
hash = "sha256-pKkLrvqOz5d6iRCv3Ln31vhTBi0XWG1nSkIQ8xrK468=";
|
||||
};
|
||||
|
||||
subPackages = [ "./" ];
|
||||
|
||||
@@ -7,19 +7,19 @@
|
||||
talloc,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libasn1c";
|
||||
version = "0.9.38";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "osmocom";
|
||||
repo = "libasn1c";
|
||||
rev = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-cnXcUvP6WwHVvpdsIVsMkizlLyg9KMwVj8XYX/nIfic=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
echo "${version}" > .tarball-version
|
||||
echo "${finalAttrs.version}" > .tarball-version
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -40,4 +40,4 @@ stdenv.mkDerivation rec {
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -0,0 +1,25 @@
|
||||
{
|
||||
lib,
|
||||
fetchzip,
|
||||
lilypond,
|
||||
writeScript,
|
||||
}:
|
||||
|
||||
lilypond.overrideAttrs (
|
||||
finalAttrs: prevAttrs: {
|
||||
version = "2.25.32";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor finalAttrs.version}/lilypond-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-j7Avb9WSy27yQCak3KV7OB24M+T76b/tLcLoINLSEbo=";
|
||||
};
|
||||
|
||||
passthru.updateScript = writeScript "update-lilypond-unstable" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p common-updater-scripts curl
|
||||
version="$(curl -s 'https://gitlab.com/lilypond/lilypond/-/raw/master/VERSION' | grep 'VERSION_DEVEL=' | cut -d= -f2)"
|
||||
update-source-version lilypond-unstable "$version" \
|
||||
--file=pkgs/by-name/li/lilypond-unstable/package.nix
|
||||
'';
|
||||
}
|
||||
)
|
||||
@@ -14,7 +14,11 @@ lib.appendToName "with-fonts" (symlinkJoin {
|
||||
meta
|
||||
;
|
||||
|
||||
paths = [ lilypond ] ++ openlilylib-fonts.all;
|
||||
paths = [
|
||||
lilypond
|
||||
]
|
||||
# relevant for lilypond-unstable-with-fonts
|
||||
++ (openlilylib-fonts.override { inherit lilypond; }).all;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -40,9 +40,10 @@
|
||||
metafont
|
||||
]
|
||||
),
|
||||
writeScript,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lilypond";
|
||||
version = "2.24.4";
|
||||
outputs = [
|
||||
@@ -51,7 +52,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
src = fetchzip {
|
||||
url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz";
|
||||
url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor finalAttrs.version}/lilypond-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-UYdORvodrVchxslOxpMiXrAh7DtB9sWp9yqZU/jeB9Y=";
|
||||
};
|
||||
|
||||
@@ -120,10 +121,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.updateScript = {
|
||||
command = [ ./update.sh ];
|
||||
supportedFeatures = [ "commit" ];
|
||||
};
|
||||
passthru.updateScript = writeScript "update-lilypond" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p common-updater-scripts curl
|
||||
version="$(curl -s 'https://gitlab.com/lilypond/lilypond/-/raw/master/VERSION' | grep 'VERSION_STABLE=' | cut -d= -f2)"
|
||||
update-source-version lilypond "$version"
|
||||
'';
|
||||
|
||||
# documentation makefile uses "out" for different purposes, hence we explicitly set it to an empty string
|
||||
makeFlags = [ "out=" ];
|
||||
@@ -147,4 +150,4 @@ stdenv.mkDerivation rec {
|
||||
FONTCONFIG_FILE = lib.optional stdenv.hostPlatform.isDarwin (makeFontsConf {
|
||||
fontDirectories = [ freefont_ttf ];
|
||||
});
|
||||
}
|
||||
})
|
||||
@@ -0,0 +1,46 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
ninja,
|
||||
fmt,
|
||||
catch2_3,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mcl";
|
||||
version = "0.1.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "azahar-emu";
|
||||
repo = "mcl";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-7lHOjlUvCQsct/pijn0M0OOG5LpExmXwB6kH+ostA2I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
fmt
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
catch2_3
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
checkPhase = ''
|
||||
tests/mcl-tests
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Collection of C++20 utilities which is common to a number of merry's projects";
|
||||
homepage = "https://github.com/azahar-emu/mcl";
|
||||
maintainers = with lib.maintainers; [ marcin-serwin ];
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
@@ -28,14 +28,14 @@ let
|
||||
# => "2021"
|
||||
versionToYear = version: builtins.elemAt (lib.splitString "-" version) 0;
|
||||
in
|
||||
buildGoModule rec {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "minio";
|
||||
version = "2025-10-15T17-29-55Z";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minio";
|
||||
repo = "minio";
|
||||
rev = "RELEASE.${version}";
|
||||
rev = "RELEASE.${finalAttrs.version}";
|
||||
hash = "sha256-HbjmCJYkWyRRHKriLP6QohaXYLk3QEVfi32Krq3ujjo=";
|
||||
};
|
||||
|
||||
@@ -56,10 +56,10 @@ buildGoModule rec {
|
||||
[
|
||||
"-s"
|
||||
"-w"
|
||||
"-X ${t}.Version=${versionToTimestamp version}"
|
||||
"-X ${t}.CopyrightYear=${versionToYear version}"
|
||||
"-X ${t}.ReleaseTag=RELEASE.${version}"
|
||||
"-X ${t}.CommitID=${src.rev}"
|
||||
"-X ${t}.Version=${versionToTimestamp finalAttrs.version}"
|
||||
"-X ${t}.CopyrightYear=${versionToYear finalAttrs.version}"
|
||||
"-X ${t}.ReleaseTag=RELEASE.${finalAttrs.version}"
|
||||
"-X ${t}.CommitID=${finalAttrs.src.rev}"
|
||||
];
|
||||
|
||||
passthru.tests.minio = nixosTests.minio;
|
||||
@@ -67,7 +67,7 @@ buildGoModule rec {
|
||||
meta = {
|
||||
homepage = "https://www.minio.io/";
|
||||
description = "S3-compatible object storage server";
|
||||
changelog = "https://github.com/minio/minio/releases/tag/RELEASE.${version}";
|
||||
changelog = "https://github.com/minio/minio/releases/tag/RELEASE.${finalAttrs.version}";
|
||||
maintainers = with lib.maintainers; [
|
||||
bachp
|
||||
ryan4yin
|
||||
@@ -75,4 +75,4 @@ buildGoModule rec {
|
||||
license = lib.licenses.agpl3Plus;
|
||||
mainProgram = "minio";
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -0,0 +1,31 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
ninja,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "oaknut";
|
||||
version = "2.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eden-emulator";
|
||||
repo = "oaknut";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-NWJMottKMiG6Rk2/ACNtBiYfWDsCeSGznPTqVO809P0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Header-only library that allows one to dynamically assemble code in-memory at runtime";
|
||||
homepage = "https://github.com/eden-emulator/oaknut";
|
||||
maintainers = with lib.maintainers; [ marcin-serwin ];
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pdfmixtool";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "scarpetta";
|
||||
repo = "pdfmixtool";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-UuRTMLlUIyo2RF+XjI229kkE67ybmllIy98p97PjWCE=";
|
||||
hash = "sha256-+omL0WNU34BcWbsfK3FXfhp0DVWjm9Vb5OVjRCoT/IA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
+5
-7
@@ -1,25 +1,23 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
evdev,
|
||||
pyudev,
|
||||
udevCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
python3Packages.buildPythonPackage {
|
||||
pname = "persistent-evdev";
|
||||
version = "unstable-2022-05-07";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aiberia";
|
||||
repo = pname;
|
||||
repo = "persistent-evdev";
|
||||
rev = "52bf246464e09ef4e6f2e1877feccc7b9feba164";
|
||||
sha256 = "d0i6DL/qgDELet4ew2lyVqzd9TApivRxL3zA3dcsQXY=";
|
||||
hash = "sha256-d0i6DL/qgDELet4ew2lyVqzd9TApivRxL3zA3dcsQXY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
evdev
|
||||
pyudev
|
||||
];
|
||||
@@ -4,14 +4,14 @@
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "polaris-web";
|
||||
version = "69";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "agersant";
|
||||
repo = "polaris-web";
|
||||
rev = "build-${version}";
|
||||
tag = "build-${finalAttrs.version}";
|
||||
hash = "sha256-/UmAOunc/79DpZByUrzqNA7q7JNugEceKRZvyTGhtVQ=";
|
||||
};
|
||||
|
||||
@@ -36,4 +36,4 @@ buildNpmPackage rec {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ pbsds ];
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -7,14 +7,14 @@
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "polaris";
|
||||
version = "0.14.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "agersant";
|
||||
repo = "polaris";
|
||||
rev = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-2GHYIlEzRS7KXahdrxMjyIcPCNw8gXJw5/4ZpB/zT3Y=";
|
||||
|
||||
# The polaris version upstream in Cargo.lock is "0.0.0".
|
||||
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
|
||||
postFetch = ''
|
||||
# 'substituteInPlace' does not support multiline replacements?
|
||||
sed -i $out/Cargo.lock -z \
|
||||
-e 's/\[\[package\]\]\nname = "polaris"\nversion = "0.0.0"/[[package]]\nname = "polaris"\nversion = "'"${version}"'"/g'
|
||||
-e 's/\[\[package\]\]\nname = "polaris"\nversion = "0.0.0"/[[package]]\nname = "polaris"\nversion = "'"${finalAttrs.version}"'"/g'
|
||||
'';
|
||||
};
|
||||
|
||||
@@ -66,4 +66,4 @@ rustPlatform.buildRustPackage rec {
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "polaris";
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -1,10 +1,10 @@
|
||||
{ lib, fetchurl, ... }:
|
||||
let
|
||||
fetchurl (finalAttrs: {
|
||||
pname = "prototype";
|
||||
version = "1.7.3.0";
|
||||
in
|
||||
fetchurl {
|
||||
name = "prototype-${version}.js";
|
||||
url = "https://ajax.googleapis.com/ajax/libs/prototype/${version}/prototype.js";
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}.js";
|
||||
|
||||
url = "https://ajax.googleapis.com/ajax/libs/prototype/${finalAttrs.version}/prototype.js";
|
||||
sha256 = "0q43vvrsb22h4jvavs1gk3v4ps61yx9k85b5n6q9mxivhmxprg26";
|
||||
|
||||
meta = {
|
||||
@@ -21,4 +21,4 @@ fetchurl {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ das_j ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -8,15 +8,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "prow";
|
||||
version = "0-unstable-2026-02-06";
|
||||
rev = "85e3dda3b79520c15cd101b85b52ccf4f7e1f1e6";
|
||||
version = "0-unstable-2026-02-17";
|
||||
rev = "999e46ca7aee8a1561241b965222140ebc29120c";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
|
||||
owner = "kubernetes-sigs";
|
||||
repo = "prow";
|
||||
hash = "sha256-1x0RKRYi7HruNJJwAhPQ+sIcKKwdyyI3cysBQvY2Z8Y=";
|
||||
hash = "sha256-EzP0Yd3cMstMhPGBD+3dUJE4NL0YnJTGip/tTDj/Rfw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Pv9LznRh7Nzm74gMKT2Q/VLIMIIc93en0qX6YA6TwK4=";
|
||||
|
||||
+4
-6
@@ -2,9 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchgit,
|
||||
qmake,
|
||||
wrapQtAppsHook,
|
||||
qtbase,
|
||||
qt5,
|
||||
libxtst,
|
||||
}:
|
||||
|
||||
@@ -23,12 +21,12 @@ stdenv.mkDerivation {
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
wrapQtAppsHook
|
||||
qt5.qmake
|
||||
qt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qt5.qtbase
|
||||
libxtst
|
||||
];
|
||||
|
||||
@@ -12,12 +12,12 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "salt";
|
||||
version = "3007.11";
|
||||
version = "3007.12";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-EAkO0/1kKSXRkEXNH6mJHznUkQR0AsQ2ijtzCrwUCAU=";
|
||||
hash = "sha256-y7JG3aXOynH/5Uq9/mY4s6LjGWw2JPv7EgdSo9HYN5c=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -1,72 +1 @@
|
||||
{
|
||||
fetchFromGitLab,
|
||||
freetype,
|
||||
libao,
|
||||
libjpeg,
|
||||
libmodplug,
|
||||
libpng,
|
||||
libsamplerate,
|
||||
libsndfile,
|
||||
libvorbis,
|
||||
pkg-config,
|
||||
SDL2,
|
||||
SDL2_mixer,
|
||||
lib,
|
||||
stdenv,
|
||||
zlib,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sfrotz";
|
||||
version = "2.54";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.com";
|
||||
owner = "DavidGriffith";
|
||||
repo = "frotz";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-GvGxojD8d5GVy/d8h3q6K7KJroz2lsKbfE0F0acjBl8=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
freetype
|
||||
libao
|
||||
libjpeg
|
||||
libmodplug
|
||||
libpng
|
||||
libsamplerate
|
||||
libsndfile
|
||||
libvorbis
|
||||
SDL2
|
||||
SDL2_mixer
|
||||
zlib
|
||||
];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
buildPhase = "make sdl";
|
||||
installTargets = [ "install_sfrotz" ];
|
||||
|
||||
meta = {
|
||||
description = "Interpreter for Infocom and other Z-Machine games (SDL interface)";
|
||||
mainProgram = "sfrotz";
|
||||
longDescription = ''
|
||||
Frotz is a Z-Machine interpreter. The Z-machine is a virtual machine
|
||||
designed by Infocom to run all of their text adventures. It went through
|
||||
multiple revisions during the lifetime of the company, and two further
|
||||
revisions (V7 and V8) were created by Graham Nelson after the company's
|
||||
demise. The specification is now quite well documented; this version of
|
||||
Frotz supports version 1.0.
|
||||
|
||||
This version of Frotz fully supports all these versions of the Z-Machine
|
||||
including the graphical version 6. Graphics and sound are created through
|
||||
the use of the SDL libraries. AIFF sound effects and music in MOD and OGG
|
||||
formats are supported when packaged in Blorb container files or optionally
|
||||
from individual files.
|
||||
'';
|
||||
homepage = "https://davidgriffith.gitlab.io/frotz/";
|
||||
changelog = "https://gitlab.com/DavidGriffith/frotz/-/raw/${finalAttrs.version}/NEWS";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ ddelabru ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
{ frotz }: frotz.override { frontend = "sdl"; }
|
||||
|
||||
@@ -4,11 +4,11 @@
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
pkg-config,
|
||||
avahi,
|
||||
avahi-compat,
|
||||
libao,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "shairplay-unstable";
|
||||
version = "2018-08-24";
|
||||
|
||||
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
avahi
|
||||
avahi-compat
|
||||
libao
|
||||
];
|
||||
|
||||
@@ -34,16 +34,16 @@ stdenv.mkDerivation rec {
|
||||
# the build will fail without complaining about a reference to /tmp
|
||||
preFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
patchelf \
|
||||
--set-rpath "${lib.makeLibraryPath buildInputs}:$out/lib" \
|
||||
--set-rpath "${lib.makeLibraryPath finalAttrs.buildInputs}:$out/lib" \
|
||||
$out/bin/shairplay
|
||||
'';
|
||||
|
||||
meta = {
|
||||
inherit (src.meta) homepage;
|
||||
inherit (finalAttrs.src.meta) homepage;
|
||||
description = "Apple AirPlay and RAOP protocol server";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ peterhoeg ];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "shairplay";
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -8,27 +8,23 @@
|
||||
libtasn1,
|
||||
|
||||
# Optional Dependencies
|
||||
pam ? null,
|
||||
libidn ? null,
|
||||
gnutls ? null,
|
||||
usePam ? lib.meta.availableOn stdenv.hostPlatform pam && stdenv.hostPlatform.isLinux,
|
||||
pam,
|
||||
useLibidn ? lib.meta.availableOn stdenv.hostPlatform libidn,
|
||||
libidn,
|
||||
useGnutls ? lib.meta.availableOn stdenv.hostPlatform gnutls,
|
||||
gnutls,
|
||||
}:
|
||||
|
||||
let
|
||||
shouldUsePkg =
|
||||
pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null;
|
||||
|
||||
optPam = shouldUsePkg pam;
|
||||
optLibidn = shouldUsePkg libidn;
|
||||
optGnutls = shouldUsePkg gnutls;
|
||||
|
||||
inherit (lib) enableFeature withFeature optionalString;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "shishi";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/shishi/shishi-${version}.tar.gz";
|
||||
url = "mirror://gnu/shishi/shishi-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-lXmP/RLdAaT4jgMR7gPKSibly05ekFmkDk/E2fKRfpI=";
|
||||
};
|
||||
|
||||
@@ -39,19 +35,20 @@ stdenv.mkDerivation rec {
|
||||
libgcrypt
|
||||
libgpg-error
|
||||
libtasn1
|
||||
optPam
|
||||
optLibidn
|
||||
optGnutls
|
||||
# TODO use lib.optional instead of setting packages to null
|
||||
(if usePam then pam else null)
|
||||
(if useLibidn then libidn else null)
|
||||
(if useGnutls then gnutls else null)
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--sysconfdir=/etc"
|
||||
"--localstatedir=/var"
|
||||
(enableFeature true "libgcrypt")
|
||||
(enableFeature (optPam != null) "pam")
|
||||
(enableFeature usePam "pam")
|
||||
(enableFeature true "ipv6")
|
||||
(withFeature (optLibidn != null) "stringprep")
|
||||
(enableFeature (optGnutls != null) "starttls")
|
||||
(withFeature useLibidn "stringprep")
|
||||
(enableFeature useGnutls "starttls")
|
||||
(enableFeature true "des")
|
||||
(enableFeature true "3des")
|
||||
(enableFeature true "aes")
|
||||
@@ -70,11 +67,11 @@ stdenv.mkDerivation rec {
|
||||
postInstall = ''
|
||||
sed -i $out/lib/libshi{sa,shi}.la \
|
||||
''
|
||||
+ optionalString (optLibidn != null) ''
|
||||
-e 's,\(-lidn\),-L${optLibidn.out}/lib \1,' \
|
||||
+ optionalString useLibidn ''
|
||||
-e 's,\(-lidn\),-L${libidn.out}/lib \1,' \
|
||||
''
|
||||
+ optionalString (optGnutls != null) ''
|
||||
-e 's,\(-lgnutls\),-L${optGnutls.out}/lib \1,' \
|
||||
+ optionalString useGnutls ''
|
||||
-e 's,\(-lgnutls\),-L${gnutls.out}/lib \1,' \
|
||||
''
|
||||
+ ''
|
||||
-e 's,\(-lgcrypt\),-L${libgcrypt.out}/lib \1,' \
|
||||
@@ -89,4 +86,4 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with lib.maintainers; [ lovek323 ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -0,0 +1,40 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
ninja,
|
||||
spirv-headers,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sirit";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eden-emulator";
|
||||
repo = "sirit";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ThyUaoVmnYz9eQ1a19BbLhqfOpPxRjSovBl2wvlfRoI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
];
|
||||
buildInputs = [ spirv-headers ];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "SIRIT_USE_SYSTEM_SPIRV_HEADERS" true)
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Runtime SPIR-V assembler";
|
||||
homepage = "https://github.com/eden-emulator/sirit";
|
||||
license = with lib.licenses; [
|
||||
agpl3Plus
|
||||
gpl3Plus
|
||||
];
|
||||
maintainers = with lib.maintainers; [ marcin-serwin ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -2,7 +2,8 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
ocamlPackages,
|
||||
pkgsHostHost,
|
||||
ocaml-ng,
|
||||
perl,
|
||||
zlib,
|
||||
db,
|
||||
@@ -10,7 +11,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (ocamlPackages)
|
||||
inherit (ocaml-ng.ocamlPackages_4_12)
|
||||
ocaml
|
||||
findlib
|
||||
cryptokit
|
||||
@@ -18,7 +19,7 @@ let
|
||||
;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sks";
|
||||
version = "unstable-2021-02-04";
|
||||
|
||||
@@ -39,11 +40,23 @@ stdenv.mkDerivation rec {
|
||||
"webSamples"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
ocaml
|
||||
findlib
|
||||
perl
|
||||
];
|
||||
nativeBuildInputs =
|
||||
# use static -> static ocaml because dynamic -> static ocaml doesn't compile
|
||||
(
|
||||
if stdenv.hostPlatform.isStatic then
|
||||
[
|
||||
pkgsHostHost.ocaml-ng.ocamlPackages_4_12.ocaml
|
||||
pkgsHostHost.ocaml-ng.ocamlPackages_4_12.findlib
|
||||
]
|
||||
else
|
||||
[
|
||||
ocaml
|
||||
findlib
|
||||
]
|
||||
)
|
||||
++ [
|
||||
perl
|
||||
];
|
||||
buildInputs = [
|
||||
zlib
|
||||
db
|
||||
@@ -81,9 +94,9 @@ stdenv.mkDerivation rec {
|
||||
servers, and even wildly out-of-date servers, or servers that experience
|
||||
spotty connectivity, can fully synchronize with rest of the system.
|
||||
'';
|
||||
inherit (src.meta) homepage;
|
||||
inherit (finalAttrs.src.meta) homepage;
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "sydbox";
|
||||
version = "3.48.7";
|
||||
version = "3.49.1";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -24,10 +24,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "Sydbox";
|
||||
repo = "sydbox";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-oNA0/1X0av/pd7e6lxDWidNdc+nu7fIclNwkH85Vdag=";
|
||||
hash = "sha256-TFPN0KvzO+tNlt9EWEx7MC3DNC3+CzHJn2MfMWpwOp4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-U8Q1OGHfM4o7QYSh7e0yuB7RdIN02z21ZnHfCMfrL74=";
|
||||
cargoHash = "sha256-yrsJrZ4rDBYlapz/O+1l4h6MIAgZ0PpYm68OFfeHb8A=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
mandoc
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
asciidoc,
|
||||
asciidoc-full,
|
||||
jansson,
|
||||
jose,
|
||||
http-parser,
|
||||
@@ -17,19 +17,19 @@
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tang";
|
||||
version = "15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "latchset";
|
||||
repo = "tang";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-nlC2hdNzQZrfirjS2gX4oFp2OD1OdxmLsN03hfxD3ug=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
asciidoc
|
||||
asciidoc-full
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
|
||||
version = testers.testVersion {
|
||||
package = tang;
|
||||
command = "${tang}/libexec/tangd --version";
|
||||
version = "tangd ${version}";
|
||||
version = "tangd ${finalAttrs.version}";
|
||||
};
|
||||
};
|
||||
updateScript = gitUpdater { };
|
||||
@@ -69,9 +69,9 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "Server for binding data to network presence";
|
||||
homepage = "https://github.com/latchset/tang";
|
||||
changelog = "https://github.com/latchset/tang/releases/tag/v${version}";
|
||||
changelog = "https://github.com/latchset/tang/releases/tag/v${finalAttrs.version}";
|
||||
maintainers = with lib.maintainers; [ fpletz ];
|
||||
license = lib.licenses.gpl3Plus;
|
||||
mainProgram = "tangd";
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -1,27 +1,25 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildPythonApplication,
|
||||
setuptools,
|
||||
wrapPython,
|
||||
python3Packages,
|
||||
makeWrapper,
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "Tautulli";
|
||||
version = "2.16.1";
|
||||
pyproject = false;
|
||||
|
||||
pythonPath = [ setuptools ];
|
||||
pythonPath = [ python3Packages.setuptools ];
|
||||
nativeBuildInputs = [
|
||||
wrapPython
|
||||
python3Packages.wrapPython
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Tautulli";
|
||||
repo = "Tautulli";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-Zct7EhnU5LROO23Joz6OxQTtC9uGZhtceSG+aX6MI2c=";
|
||||
};
|
||||
|
||||
@@ -32,7 +30,7 @@ buildPythonApplication rec {
|
||||
cp -R contrib data lib plexpy Tautulli.py CHANGELOG.md $out/libexec/tautulli
|
||||
|
||||
echo "master" > $out/libexec/tautulli/branch.txt
|
||||
echo "v${version}" > $out/libexec/tautulli/version.txt
|
||||
echo "v${finalAttrs.version}" > $out/libexec/tautulli/version.txt
|
||||
|
||||
# Can't just symlink to the main script, since it uses __file__ to
|
||||
# import bundled packages and manage the service
|
||||
@@ -60,4 +58,4 @@ buildPythonApplication rec {
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ rhoriguchi ];
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -1,16 +1,3 @@
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 9e69128d..8c53ac88 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -226,7 +226,7 @@ if is_64bit_system
|
||||
xcb_64bit_dep = dependency('xcb')
|
||||
endif
|
||||
if with_bitbridge
|
||||
- xcb_32bit_dep = winegcc.find_library('xcb')
|
||||
+ xcb_32bit_dep = winegcc.find_library('xcb', dirs: ['@libxcb32@/lib'])
|
||||
endif
|
||||
|
||||
# These are all headers-only libraries, and thus won't require separate 32-bit
|
||||
diff --git a/src/common/notifications.cpp b/src/common/notifications.cpp
|
||||
index 654b6c83..78ba2fe7 100644
|
||||
--- a/src/common/notifications.cpp
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
{
|
||||
lib,
|
||||
multiStdenv,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
replaceVars,
|
||||
pkgsi686Linux,
|
||||
dbus,
|
||||
meson,
|
||||
ninja,
|
||||
@@ -73,7 +72,7 @@ let
|
||||
hash = "sha256-LsPHPoAL21XOKmF1Wl/tvLJGzjaCLjaDAcUtDvXdXSU=";
|
||||
};
|
||||
in
|
||||
multiStdenv.mkDerivation (finalAttrs: {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "yabridge";
|
||||
version = "5.1.1";
|
||||
|
||||
@@ -105,7 +104,6 @@ multiStdenv.mkDerivation (finalAttrs: {
|
||||
# Hard code bitbridge & runtime dependencies
|
||||
(replaceVars ./hardcode-dependencies.patch {
|
||||
libdbus = dbus.lib;
|
||||
libxcb32 = pkgsi686Linux.libxcb;
|
||||
inherit wine;
|
||||
})
|
||||
|
||||
@@ -140,7 +138,7 @@ multiStdenv.mkDerivation (finalAttrs: {
|
||||
mesonFlags = [
|
||||
"--cross-file"
|
||||
"cross-wine.conf"
|
||||
"-Dbitbridge=true"
|
||||
"-Dbitbridge=false"
|
||||
|
||||
# Requires CMake and is unnecessary
|
||||
"-Dtomlplusplus:generate_cmake_config=false"
|
||||
@@ -149,7 +147,7 @@ multiStdenv.mkDerivation (finalAttrs: {
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p "$out/bin" "$out/lib"
|
||||
cp yabridge-host{,-32}.exe{,.so} "$out/bin"
|
||||
cp yabridge-host.exe{,.so} "$out/bin"
|
||||
cp libyabridge{,-chainloader}-{vst2,vst3,clap}.so "$out/lib"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -26,12 +26,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "yarg";
|
||||
version = "0.13.2";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/YARC-Official/YARG/releases/download/v${finalAttrs.version}/YARG_v${finalAttrs.version}-Linux-x86_64.zip";
|
||||
stripRoot = false;
|
||||
hash = "sha256-TcX4O0TDesuBMbUH8Lp6wLM8A5xzXH9Pl7vCMEIhQvE=";
|
||||
hash = "sha256-l83tnEO9hHFiaks7D/y9D1HJKihU7+cvsvkbIKkNeuk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "zrepl";
|
||||
version = "0.6.1";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zrepl";
|
||||
repo = "zrepl";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-sFSWcJ0aBMay+ngUqnr0PKBMOfCcKHgBjff6KRpPZrg=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-D2ADK1mX6Aq0I2fBeNLZeJ0GdxWxi2ApiZqT4b72yf4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-75fGejR7eiECsm1j3yIU1lAWaW9GrorrVnv8JEzkAtU=";
|
||||
vendorHash = "sha256-yu/bKkcWhHJSQPU2F4C58RC7geVTVEcXHlV0DRn/sUs=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
@@ -46,6 +46,7 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
meta = {
|
||||
homepage = "https://zrepl.github.io/";
|
||||
changelog = "https://github.com/zrepl/zrepl/releases/tag/${finalAttrs.src.tag}";
|
||||
description = "One-stop, integrated solution for ZFS replication";
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.mit;
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "synchronizer";
|
||||
version = "0.2";
|
||||
version = "0.3";
|
||||
|
||||
minimalOCamlVersion = "5.2";
|
||||
|
||||
@@ -16,7 +16,7 @@ buildDunePackage (finalAttrs: {
|
||||
owner = "OCamlPro";
|
||||
repo = "synchronizer";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-0XtPHpDlyH1h8W2ZlRvJbZjCN9WP5mzk2N01WFd8eLQ=";
|
||||
hash = "sha256-zomP15CRV6pFK3yk9hMCSDHPk11hEqXiRw8vr2Dg0CI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -5,26 +5,24 @@
|
||||
poetry-core,
|
||||
aiohttp,
|
||||
yarl,
|
||||
aioresponses,
|
||||
pytest-asyncio,
|
||||
pytest-cov-stub,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiosolaredge";
|
||||
version = "0.2.0";
|
||||
version = "1.0.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bdraco";
|
||||
repo = "aiosolaredge";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-1C74U5HWDTJum1XES21t1uIJwm0YW3l041mwvqY/dA4=";
|
||||
hash = "sha256-1RdkYcdhhU+MaP91iJ1tSrL0OlUi6Il1XBXnmRYhC7g=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i "/^addopts/d" pyproject.toml
|
||||
'';
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
dependencies = [
|
||||
@@ -35,12 +33,14 @@ buildPythonPackage rec {
|
||||
pythonImportsCheck = [ "aiosolaredge" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
aioresponses
|
||||
pytest-asyncio
|
||||
pytest-cov-stub
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/bdraco/aiosolaredge/blob/${src.rev}/CHANGELOG.md";
|
||||
changelog = "https://github.com/bdraco/aiosolaredge/blob/${src.tag}/CHANGELOG.md";
|
||||
description = "Asyncio SolarEdge API client";
|
||||
homepage = "https://github.com/bdraco/aiosolaredge";
|
||||
license = lib.licenses.mit;
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "debugpy";
|
||||
version = "1.8.19";
|
||||
version = "1.8.20";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -42,7 +42,7 @@ buildPythonPackage rec {
|
||||
sed -i 's/git_refnames = "[^"]*"/git_refnames = " (tag: ${src.tag})"/' "$out/src/debugpy/_version.py"
|
||||
'';
|
||||
|
||||
hash = "sha256-O9RHqyV7xMMnouCp4t18CNH/z2jBxZBUkybAw1c2gY0=";
|
||||
hash = "sha256-0h2VQU5eYb0heXSFmKnwAFW0jcWc+bYllhwxfdzkGWc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -41,14 +41,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-allauth";
|
||||
version = "65.14.0";
|
||||
version = "65.14.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "allauth";
|
||||
repo = "django-allauth";
|
||||
tag = version;
|
||||
hash = "sha256-hoPNSMzn/bX98Qe+7guaLK8UhA5FfHpUCjzN6hCXVgs=";
|
||||
hash = "sha256-Kr6iYN+qM1ZdtQAJ9Ks+zC70AiiUi2IY2O/G9S+tTmI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gettext ];
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
pyyaml,
|
||||
shellingham,
|
||||
tqdm,
|
||||
typer-slim,
|
||||
typer,
|
||||
typing-extensions,
|
||||
|
||||
# optional-dependencies
|
||||
@@ -45,6 +45,11 @@ buildPythonPackage (finalAttrs: {
|
||||
hash = "sha256-At3FN+dplQ3L9B4vDZrEvREdwgepUvzWC7yeU6L5XY8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace-fail "typer-slim" "typer"
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
@@ -56,7 +61,7 @@ buildPythonPackage (finalAttrs: {
|
||||
pyyaml
|
||||
shellingham
|
||||
tqdm
|
||||
typer-slim
|
||||
typer
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
blurhash,
|
||||
cryptography,
|
||||
decorator,
|
||||
fetchpatch,
|
||||
graphemeu,
|
||||
http-ece,
|
||||
python-dateutil,
|
||||
@@ -30,6 +31,14 @@ buildPythonPackage rec {
|
||||
hash = "sha256-i3HMT8cabSl664UK3eopJQ9bDBpGCgbHTvBJkgeoxd8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Switch dependency from unmaintained `grapheme` to `graphemeu`
|
||||
(fetchpatch {
|
||||
url = "https://github.com/halcy/Mastodon.py/commit/939c7508414e950922c518260a9ba5a5853aeef2.patch";
|
||||
hash = "sha256-XBiAFxYUBNyynld++UwPGIIg9j+3/EF2jGqiysVqYRM=";
|
||||
})
|
||||
];
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyturbojpeg";
|
||||
version = "1.8.2";
|
||||
version = "2.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lilohuang";
|
||||
repo = "PyTurboJPEG";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-zyLNIo7hQuzTlEgdvri3bSnAiRRKKup57tfCIxiBq24=";
|
||||
hash = "sha256-yITX+6mP8AihaTFjZG9A5U6pAUTdPy6UDbbjnznwuqI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -17,7 +17,7 @@ let
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "reportlab";
|
||||
version = "4.4.9";
|
||||
version = "4.4.10";
|
||||
pyproject = true;
|
||||
|
||||
# See https://bitbucket.org/pypy/compatibility/wiki/reportlab%20toolkit
|
||||
@@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-fPSHdkKU7nkaR4H1oVe+vOJipmauS7uHeGdgqWdsk3g=";
|
||||
hash = "sha256-XLuzSsNUYDnQCG3rKTjN7AaxLaPNuDboEyWOszzShIc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
torch,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "roma";
|
||||
version = "1.5.4";
|
||||
version = "1.5.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "naver";
|
||||
repo = "roma";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-byPW58I+6mCE2fR6eVNQfNDCLbZSfoPmPbc/GuRpKGo=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-0R8p8pQxLQqK7MTbk9J5lFtA13XJth76Glemkfj9X/E=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -38,9 +38,10 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://naver.github.io/roma/#changelog";
|
||||
description = "Lightweight library to deal with 3D rotations in PyTorch";
|
||||
homepage = "https://github.com/naver/roma";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ nim65s ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "simsimd";
|
||||
version = "6.5.12";
|
||||
version = "6.5.13";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ashvardanian";
|
||||
repo = "SimSIMD";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-4mgWm4FcTGf9DNc39GOjK9jnyev7hIeODjpnuIz6f1k=";
|
||||
hash = "sha256-jNJ44jCPcs83HbLSkup6eeCL0Hf+SyU4RzyQAyuPJ94=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -47,8 +47,7 @@ buildPythonPackage (finalAttrs: {
|
||||
|
||||
# cli deps
|
||||
typer
|
||||
]
|
||||
++ typer.optional-dependencies.standard;
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
# make sphinx_path an alias of pathlib.Path, since sphinx_path was removed in Sphinx v7.2.0
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
safetensors,
|
||||
tokenizers,
|
||||
tqdm,
|
||||
typer-slim,
|
||||
typer,
|
||||
|
||||
# optional-dependencies
|
||||
# sklearn
|
||||
@@ -103,6 +103,11 @@ buildPythonPackage (finalAttrs: {
|
||||
hash = "sha256-vus4Y+1QXUNqwBO1ZK0gWd+sJBPwrqWW7O2sn0EBvno=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace-fail "typer-slim" "typer"
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
@@ -114,7 +119,7 @@ buildPythonPackage (finalAttrs: {
|
||||
safetensors
|
||||
tokenizers
|
||||
tqdm
|
||||
typer-slim
|
||||
typer
|
||||
];
|
||||
|
||||
optional-dependencies = lib.fix (self: {
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
hatchling,
|
||||
lib,
|
||||
pytestCheckHook,
|
||||
typer-slim,
|
||||
typer,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -20,13 +20,18 @@ buildPythonPackage rec {
|
||||
hash = "sha256-nwEYFw+4jeF/SoaZWR51VWRezqBFjGoLiVgJWdPNoIk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "typer-slim" "typer"
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
hatch-vcs
|
||||
hatchling
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
typer-slim
|
||||
typer
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "typer_injector" ];
|
||||
|
||||
@@ -1,90 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
pdm-backend,
|
||||
|
||||
# dependencies
|
||||
click,
|
||||
typing-extensions,
|
||||
|
||||
# optional-dependencies
|
||||
rich,
|
||||
shellingham,
|
||||
|
||||
# tests
|
||||
pytest-xdist,
|
||||
pytestCheckHook,
|
||||
writableTmpDirAsHomeHook,
|
||||
procps,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "typer-slim";
|
||||
version = "0.21.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastapi";
|
||||
repo = "typer";
|
||||
tag = version;
|
||||
hash = "sha256-m/oJL6Yn3SzlD72vaPoag8EOThcNgyLPoiitqBqLgEU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
for f in $(find tests -type f -print); do
|
||||
# replace `sys.executable -m coverage run` with `sys.executable`
|
||||
sed -z -i 's/"-m",\n\?\s*"coverage",\n\?\s*"run",//g' "$f"
|
||||
done
|
||||
'';
|
||||
|
||||
env.TIANGOLO_BUILD_PACKAGE = "typer-slim";
|
||||
|
||||
build-system = [ pdm-backend ];
|
||||
|
||||
dependencies = [
|
||||
click
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
standard = [
|
||||
rich
|
||||
shellingham
|
||||
];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
writableTmpDirAsHomeHook
|
||||
]
|
||||
++ lib.concatAttrValues optional-dependencies
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
procps
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_scripts"
|
||||
# Likely related to https://github.com/sarugaku/shellingham/issues/35
|
||||
# fails also on Linux
|
||||
"test_show_completion"
|
||||
"test_install_completion"
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
|
||||
"test_install_completion"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "typer" ];
|
||||
|
||||
meta = {
|
||||
description = "Library for building CLI applications";
|
||||
homepage = "https://typer.tiangolo.com/";
|
||||
changelog = "https://github.com/tiangolo/typer/releases/tag/${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ winpat ];
|
||||
};
|
||||
}
|
||||
@@ -1,20 +1,84 @@
|
||||
{
|
||||
lib,
|
||||
mkPythonMetaPackage,
|
||||
typer-slim,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
pdm-backend,
|
||||
|
||||
# dependencies
|
||||
annotated-doc,
|
||||
click,
|
||||
|
||||
# optional-dependencies
|
||||
rich,
|
||||
shellingham,
|
||||
|
||||
# tests
|
||||
pytest-xdist,
|
||||
pytestCheckHook,
|
||||
writableTmpDirAsHomeHook,
|
||||
procps,
|
||||
}:
|
||||
|
||||
mkPythonMetaPackage {
|
||||
buildPythonPackage rec {
|
||||
pname = "typer";
|
||||
inherit (typer-slim) version optional-dependencies;
|
||||
dependencies = [ typer-slim ] ++ typer-slim.optional-dependencies.standard;
|
||||
version = "0.24.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastapi";
|
||||
repo = "typer";
|
||||
tag = version;
|
||||
hash = "sha256-ha/cT2+I9/WUjb7ZXSKqLSocZ3vq0N1fm4RvRpsXIDc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
for f in $(find tests -type f -print); do
|
||||
# replace `sys.executable -m coverage run` with `sys.executable`
|
||||
sed -z -i 's/"-m",\n\?\s*"coverage",\n\?\s*"run",//g' "$f"
|
||||
done
|
||||
'';
|
||||
|
||||
env.TIANGOLO_BUILD_PACKAGE = "typer";
|
||||
|
||||
build-system = [ pdm-backend ];
|
||||
|
||||
dependencies = [
|
||||
annotated-doc
|
||||
click
|
||||
rich
|
||||
shellingham
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
writableTmpDirAsHomeHook
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
procps
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_scripts"
|
||||
# Likely related to https://github.com/sarugaku/shellingham/issues/35
|
||||
# fails also on Linux
|
||||
"test_show_completion"
|
||||
"test_install_completion"
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
|
||||
"test_install_completion"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "typer" ];
|
||||
|
||||
meta = {
|
||||
inherit (typer-slim.meta)
|
||||
changelog
|
||||
description
|
||||
homepage
|
||||
license
|
||||
maintainers
|
||||
;
|
||||
description = "Library for building CLI applications";
|
||||
homepage = "https://typer.tiangolo.com/";
|
||||
changelog = "https://github.com/tiangolo/typer/releases/tag/${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ winpat ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
requests,
|
||||
smart-open,
|
||||
srsly,
|
||||
typer-slim,
|
||||
typer,
|
||||
wasabi,
|
||||
|
||||
# tests
|
||||
@@ -33,6 +33,11 @@ buildPythonPackage rec {
|
||||
hash = "sha256-Xd7cJlUi/a8gwtnuO9wqZiHT1xVMbp6V6Ha+Kyr4tFE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace-fail "typer-slim" "typer"
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
@@ -43,7 +48,7 @@ buildPythonPackage rec {
|
||||
requests
|
||||
smart-open
|
||||
srsly
|
||||
typer-slim
|
||||
typer
|
||||
wasabi
|
||||
];
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
boost,
|
||||
gtest,
|
||||
@@ -133,6 +134,17 @@ in
|
||||
// {
|
||||
pname = "nixd";
|
||||
|
||||
patches = [
|
||||
# Pull upstream fix for boost-1.89 & boost 1.87 support:
|
||||
# https://github.com/nix-community/nixd/pull/783
|
||||
(fetchpatch {
|
||||
name = "boost-1.89.patch";
|
||||
url = "https://github.com/nix-community/nixd/commit/11dfdf5f2db2e0fc1fea0349fb68739a9c747a41.patch";
|
||||
hash = "sha256-aCb9wRKqZSuUXmamzjpYe0vRqEQh4tenwoScv+juYK8=";
|
||||
stripLen = 1;
|
||||
})
|
||||
];
|
||||
|
||||
sourceRoot = "${common.src.name}/nixd";
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
fetchzip,
|
||||
lilypond,
|
||||
}:
|
||||
|
||||
lilypond.overrideAttrs (oldAttrs: rec {
|
||||
version = "2.25.32";
|
||||
src = fetchzip {
|
||||
url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz";
|
||||
hash = "sha256-j7Avb9WSy27yQCak3KV7OB24M+T76b/tLcLoINLSEbo=";
|
||||
};
|
||||
|
||||
passthru.updateScript = {
|
||||
command = [
|
||||
./update.sh
|
||||
"unstable"
|
||||
];
|
||||
supportedFeatures = [ "commit" ];
|
||||
};
|
||||
})
|
||||
@@ -1,25 +0,0 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -I nixpkgs=./. -i bash -p curl gnused nix
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
if [ $# -gt 0 ] && [ "$1" = "unstable" ]; then
|
||||
ATTR="lilypond-unstable"
|
||||
FILE="$(dirname "${BASH_SOURCE[@]}")/unstable.nix"
|
||||
QUERY="VERSION_DEVEL="
|
||||
else
|
||||
ATTR="lilypond"
|
||||
FILE="$(dirname "${BASH_SOURCE[@]}")/default.nix"
|
||||
QUERY="VERSION_STABLE="
|
||||
fi
|
||||
|
||||
# update version
|
||||
PREV=$(nix eval --raw -f default.nix $ATTR.version)
|
||||
NEXT=$(curl -s 'https://gitlab.com/lilypond/lilypond/-/raw/master/VERSION' | grep "$QUERY" | cut -d= -f2)
|
||||
sed -i "s|$PREV|$NEXT|" "$FILE"
|
||||
echo "[{\"commitMessage\":\"$ATTR: $PREV -> $NEXT\"}]"
|
||||
|
||||
# update hash
|
||||
PREV=$(nix eval --raw -f default.nix $ATTR.src.outputHash)
|
||||
NEXT=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-url --type sha256 --unpack $(nix eval --raw -f default.nix $ATTR.src.url)))
|
||||
sed -i "s|$PREV|$NEXT|" "$FILE"
|
||||
@@ -1,16 +0,0 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts
|
||||
set -eo pipefail
|
||||
cd "$(dirname "${BASH_SOURCE[0]}")"
|
||||
|
||||
new_version="$(curl -s "https://api.github.com/repos/jackett/jackett/releases?per_page=1" | jq -r '.[0].name')"
|
||||
old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)"
|
||||
|
||||
if [[ "$new_version" == "$old_version" ]]; then
|
||||
echo "Already up to date!"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
cd ../../..
|
||||
update-source-version jackett "${new_version//v}"
|
||||
$(nix-build -A jackett.fetch-deps --no-out-link)
|
||||
@@ -2037,8 +2037,6 @@ with pkgs;
|
||||
|
||||
unify = with python3Packages; toPythonApplication unify;
|
||||
|
||||
persistent-evdev = python3Packages.callPackage ../servers/persistent-evdev { };
|
||||
|
||||
inherit (import ../development/libraries/libsbsms pkgs)
|
||||
libsbsms
|
||||
libsbsms_2_0_2
|
||||
@@ -2682,8 +2680,6 @@ with pkgs;
|
||||
isl_0_27
|
||||
;
|
||||
|
||||
jackett = callPackage ../servers/jackett { };
|
||||
|
||||
jamesdsp-pulse = callPackage ../by-name/ja/jamesdsp/package.nix {
|
||||
usePipewire = false;
|
||||
usePulseaudio = true;
|
||||
@@ -3287,8 +3283,6 @@ with pkgs;
|
||||
|
||||
tabview = with python3Packages; toPythonApplication tabview;
|
||||
|
||||
tautulli = python3Packages.callPackage ../servers/tautulli { };
|
||||
|
||||
inherit (callPackage ../development/tools/pnpm { })
|
||||
pnpm_8
|
||||
pnpm_9
|
||||
@@ -3303,10 +3297,6 @@ with pkgs;
|
||||
|
||||
po4a = perlPackages.Po4a;
|
||||
|
||||
polaris = callPackage ../servers/polaris { };
|
||||
|
||||
polaris-web = callPackage ../servers/polaris/web.nix { };
|
||||
|
||||
proxmark3 = libsForQt5.callPackage ../tools/security/proxmark3/default.nix { };
|
||||
|
||||
pycflow2dot = with python3.pkgs; toPythonApplication pycflow2dot;
|
||||
@@ -3430,10 +3420,6 @@ with pkgs;
|
||||
# aka., pgp-tools
|
||||
simplescreenrecorder = libsForQt5.callPackage ../applications/video/simplescreenrecorder { };
|
||||
|
||||
sks = callPackage ../servers/sks {
|
||||
ocamlPackages = ocaml-ng.ocamlPackages_4_12;
|
||||
};
|
||||
|
||||
snapcast = callPackage ../applications/audio/snapcast {
|
||||
pulseaudioSupport = config.pulseaudio or stdenv.hostPlatform.isLinux;
|
||||
};
|
||||
@@ -6735,10 +6721,6 @@ with pkgs;
|
||||
'';
|
||||
});
|
||||
|
||||
isso = callPackage ../servers/isso {
|
||||
nodejs = nodejs_20;
|
||||
};
|
||||
|
||||
itk_5_2 = callPackage ../development/libraries/itk/5.2.x.nix {
|
||||
enableRtk = false;
|
||||
};
|
||||
@@ -6761,7 +6743,6 @@ with pkgs;
|
||||
|
||||
libappindicator-gtk2 = libappindicator.override { gtkVersion = "2"; };
|
||||
libappindicator-gtk3 = libappindicator.override { gtkVersion = "3"; };
|
||||
libasn1c = callPackage ../servers/osmocom/libasn1c/default.nix { };
|
||||
|
||||
libbass = (callPackage ../development/libraries/audio/libbass { }).bass;
|
||||
libbass_fx = (callPackage ../development/libraries/audio/libbass { }).bass_fx;
|
||||
@@ -8201,8 +8182,6 @@ with pkgs;
|
||||
erlang = beamMinimalPackages.erlang;
|
||||
};
|
||||
|
||||
dcnnt = python3Packages.callPackage ../servers/dcnnt { };
|
||||
|
||||
dict = callPackage ../servers/dict {
|
||||
flex = flex_2_5_35;
|
||||
libmaa = callPackage ../servers/dict/libmaa.nix { };
|
||||
@@ -8214,11 +8193,6 @@ with pkgs;
|
||||
|
||||
dodgy = with python3Packages; toPythonApplication dodgy;
|
||||
|
||||
prosody = callPackage ../servers/xmpp/prosody {
|
||||
withExtraLibs = [ ];
|
||||
withExtraLuaPackages = _: [ ];
|
||||
};
|
||||
|
||||
inherit (callPackages ../servers/firebird { })
|
||||
firebird_4
|
||||
firebird_3
|
||||
@@ -8343,8 +8317,6 @@ with pkgs;
|
||||
];
|
||||
};
|
||||
|
||||
minio = callPackage ../servers/minio { };
|
||||
|
||||
mkchromecast = libsForQt5.callPackage ../applications/networking/mkchromecast { };
|
||||
|
||||
moodle = callPackage ../servers/web-apps/moodle { };
|
||||
@@ -8520,10 +8492,6 @@ with pkgs;
|
||||
msVarsTemplate = stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isAarch64;
|
||||
};
|
||||
|
||||
tang = callPackage ../servers/tang {
|
||||
asciidoc = asciidoc-full;
|
||||
};
|
||||
|
||||
inherit (import ../servers/sql/postgresql pkgs)
|
||||
postgresqlVersions
|
||||
postgresqlJitVersions
|
||||
@@ -8668,8 +8636,6 @@ with pkgs;
|
||||
|
||||
pypiserver = with python3Packages; toPythonApplication pypiserver;
|
||||
|
||||
qremotecontrol-server = libsForQt5.callPackage ../servers/misc/qremotecontrol-server { };
|
||||
|
||||
rethinkdb = callPackage ../servers/nosql/rethinkdb {
|
||||
stdenv = clangStdenv;
|
||||
libtool = cctools;
|
||||
@@ -8695,8 +8661,6 @@ with pkgs;
|
||||
|
||||
scalene = with python3Packages; toPythonApplication scalene;
|
||||
|
||||
shairplay = callPackage ../servers/shairplay { avahi = avahi-compat; };
|
||||
|
||||
shairport-sync-airplay2 = shairport-sync.override {
|
||||
enableAirplay2 = true;
|
||||
};
|
||||
@@ -8714,11 +8678,6 @@ with pkgs;
|
||||
sensu-go-cli
|
||||
;
|
||||
|
||||
shishi = callPackage ../servers/shishi {
|
||||
pam = if stdenv.hostPlatform.isLinux then pam else null;
|
||||
# see also openssl, which has/had this same trick
|
||||
};
|
||||
|
||||
spacecookie = haskell.lib.compose.justStaticExecutables haskellPackages.spacecookie;
|
||||
|
||||
inherit (callPackages ../servers/http/tomcat { })
|
||||
@@ -9319,11 +9278,7 @@ with pkgs;
|
||||
|
||||
### DATA
|
||||
|
||||
adwaita-qt = libsForQt5.callPackage ../data/themes/adwaita-qt { };
|
||||
|
||||
adwaita-qt6 = qt6Packages.callPackage ../data/themes/adwaita-qt {
|
||||
useQt6 = true;
|
||||
};
|
||||
adwaita-qt6 = adwaita-qt.override { useQt6 = true; };
|
||||
|
||||
dejavu_fonts = lowPrio (callPackage ../data/fonts/dejavu-fonts { });
|
||||
|
||||
@@ -12412,19 +12367,10 @@ with pkgs;
|
||||
;
|
||||
kops = kops_1_33;
|
||||
|
||||
lilypond = callPackage ../misc/lilypond { };
|
||||
|
||||
lilypond-unstable = callPackage ../misc/lilypond/unstable.nix { };
|
||||
|
||||
lilypond-unstable-with-fonts = callPackage ../misc/lilypond/with-fonts.nix {
|
||||
lilypond-unstable-with-fonts = lilypond-with-fonts.override {
|
||||
lilypond = lilypond-unstable;
|
||||
openlilylib-fonts = openlilylib-fonts.override {
|
||||
lilypond = lilypond-unstable;
|
||||
};
|
||||
};
|
||||
|
||||
lilypond-with-fonts = callPackage ../misc/lilypond/with-fonts.nix { };
|
||||
|
||||
openlilylib-fonts = recurseIntoAttrs (callPackage ../misc/lilypond/fonts.nix { });
|
||||
|
||||
nixDependencies = recurseIntoAttrs (
|
||||
|
||||
@@ -27,6 +27,26 @@ let
|
||||
lib.mapAttrs (
|
||||
n: alias: removeDistribute (removeRecurseForDerivations (checkInPkgs n alias))
|
||||
) aliases;
|
||||
|
||||
warnAlias =
|
||||
msg: v:
|
||||
if lib.isDerivation v then
|
||||
lib.warnOnInstantiate msg v
|
||||
else if lib.isAttrs v then
|
||||
lib.mapAttrs (_: lib.warn msg) v
|
||||
else if lib.isFunction v then
|
||||
arg: lib.warn msg (v arg)
|
||||
else if lib.isList v then
|
||||
map (lib.warn msg) v
|
||||
else
|
||||
# Can’t do better than this, and a `throw` would be more
|
||||
# disruptive for users…
|
||||
#
|
||||
# `nix search` flags up warnings already, so hopefully this won’t
|
||||
# make things much worse until we have proper CI for aliases,
|
||||
# especially since aliases of paths and numbers are presumably
|
||||
# not common.
|
||||
lib.warn msg v;
|
||||
in
|
||||
|
||||
### Deprecated aliases - for backward compatibility
|
||||
@@ -526,6 +546,7 @@ mapAliases {
|
||||
tvdb_api = throw "'tvdb_api' has been renamed to/replaced by 'tvdb-api'"; # Converted to throw 2025-10-29
|
||||
tweedledum = throw "'tweedledum' has been removed due to lack of upstream maintenance."; # Added 2025-11-22
|
||||
typed-ast = throw "typed-ast was removed because it went end of life in July 2023"; # added 2025-05-24
|
||||
typer-slim = warnAlias "typer-slim was an alias package of typer that only depended on it and has been removed." typer; # added 2026-02-16
|
||||
types-typed-ast = throw "types-typed-ast was removed because so was typed-ast"; # added 2025-05-24
|
||||
typesentry = throw "typesentry was removed because it was broken and unmaintained"; # added 2026-02-02
|
||||
typesystem = throw "'typesystem' has been removed as it was broken, unmaintained, and archived upstream"; # Added 2025-11-27
|
||||
|
||||
@@ -19627,8 +19627,6 @@ self: super: with self; {
|
||||
|
||||
typer-shell = callPackage ../development/python-modules/typer-shell { };
|
||||
|
||||
typer-slim = callPackage ../development/python-modules/typer-slim { };
|
||||
|
||||
types-aiobotocore = callPackage ../development/python-modules/types-aiobotocore { };
|
||||
|
||||
inherit (callPackage ../development/python-modules/types-aiobotocore-packages { })
|
||||
|
||||
Reference in New Issue
Block a user