Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
@@ -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=",
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -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"
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -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"
|
||||
|
||||
@@ -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
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -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;
|
||||
};
|
||||
})
|
||||
+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 ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
+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
|
||||
];
|
||||
|
||||
@@ -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 = [ ];
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -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 ];
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -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 ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -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)
|
||||
@@ -2042,8 +2042,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
|
||||
@@ -2687,8 +2685,6 @@ with pkgs;
|
||||
isl_0_27
|
||||
;
|
||||
|
||||
jackett = callPackage ../servers/jackett { };
|
||||
|
||||
jamesdsp-pulse = callPackage ../by-name/ja/jamesdsp/package.nix {
|
||||
usePipewire = false;
|
||||
usePulseaudio = true;
|
||||
@@ -3292,8 +3288,6 @@ with pkgs;
|
||||
|
||||
tabview = with python3Packages; toPythonApplication tabview;
|
||||
|
||||
tautulli = python3Packages.callPackage ../servers/tautulli { };
|
||||
|
||||
inherit (callPackage ../development/tools/pnpm { })
|
||||
pnpm_8
|
||||
pnpm_9
|
||||
@@ -3308,10 +3302,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;
|
||||
@@ -3435,10 +3425,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;
|
||||
};
|
||||
@@ -6740,10 +6726,6 @@ with pkgs;
|
||||
'';
|
||||
});
|
||||
|
||||
isso = callPackage ../servers/isso {
|
||||
nodejs = nodejs_20;
|
||||
};
|
||||
|
||||
itk_5_2 = callPackage ../development/libraries/itk/5.2.x.nix {
|
||||
enableRtk = false;
|
||||
};
|
||||
@@ -6766,7 +6748,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;
|
||||
@@ -8206,8 +8187,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 { };
|
||||
@@ -8219,11 +8198,6 @@ with pkgs;
|
||||
|
||||
dodgy = with python3Packages; toPythonApplication dodgy;
|
||||
|
||||
prosody = callPackage ../servers/xmpp/prosody {
|
||||
withExtraLibs = [ ];
|
||||
withExtraLuaPackages = _: [ ];
|
||||
};
|
||||
|
||||
inherit (callPackages ../servers/firebird { })
|
||||
firebird_4
|
||||
firebird_3
|
||||
@@ -8348,8 +8322,6 @@ with pkgs;
|
||||
];
|
||||
};
|
||||
|
||||
minio = callPackage ../servers/minio { };
|
||||
|
||||
mkchromecast = libsForQt5.callPackage ../applications/networking/mkchromecast { };
|
||||
|
||||
moodle = callPackage ../servers/web-apps/moodle { };
|
||||
@@ -8525,10 +8497,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
|
||||
@@ -8673,8 +8641,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;
|
||||
@@ -8700,8 +8666,6 @@ with pkgs;
|
||||
|
||||
scalene = with python3Packages; toPythonApplication scalene;
|
||||
|
||||
shairplay = callPackage ../servers/shairplay { avahi = avahi-compat; };
|
||||
|
||||
shairport-sync-airplay2 = shairport-sync.override {
|
||||
enableAirplay2 = true;
|
||||
};
|
||||
@@ -8719,11 +8683,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 { })
|
||||
@@ -9324,11 +9283,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 { });
|
||||
|
||||
@@ -12417,19 +12372,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 (
|
||||
|
||||
Reference in New Issue
Block a user