Merge master into staging-next
This commit is contained in:
@@ -871,6 +871,15 @@ general. A number of other parameters can be overridden:
|
||||
(hello { }).override { extraRustcOpts = "-Z debuginfo=2"; }
|
||||
```
|
||||
|
||||
- Extra arguments passed to `rustc` when the crate is a proc-macro,
|
||||
replacing `extraRustcOpts`. Useful to keep instrumentation flags
|
||||
(sanitizers, coverage) off host dylibs. Defaults to `null`, which
|
||||
inherits `extraRustcOpts`:
|
||||
|
||||
```nix
|
||||
(myProcMacro { }).override { extraRustcOptsForProcMacro = [ ]; }
|
||||
```
|
||||
|
||||
- The lint level cap passed to `rustc`. Defaults to `null`, which
|
||||
auto-resolves to `"allow"` (silences all lints) when `lints` is
|
||||
empty, or `"forbid"` (no cap) when `lints` is set. Because `rustc`
|
||||
|
||||
@@ -64,9 +64,9 @@ let
|
||||
|
||||
codium_running.wait() # type: ignore[union-attr]
|
||||
with codium_running: # type: ignore[union-attr]
|
||||
# Wait until vscodium is visible. "File" is in the menu bar.
|
||||
machine.wait_for_text('(Get|Started|with|Customize|theme)')
|
||||
machine.screenshot('start_screen')
|
||||
# Wait until vscodium is visible.
|
||||
machine.wait_for_text('Search')
|
||||
machine.screenshot('screen')
|
||||
|
||||
test_string = 'testfile'
|
||||
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
deadbeef,
|
||||
vgmstream,
|
||||
mpg123,
|
||||
libvorbis,
|
||||
ffmpeg,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "deadbeef-vgmstream-plugin";
|
||||
version = "2026-05-09.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jchv";
|
||||
repo = "deadbeef-vgmstream";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-dR1TEx61jnprEQokHRX/mi3WvbS+CVp4VIMlutX6uS8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
deadbeef
|
||||
mpg123
|
||||
libvorbis
|
||||
ffmpeg.dev
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
makeFlags = [ "DEADBEEF_ROOT=${deadbeef}" ];
|
||||
installFlags = [ "DEADBEEF_ROOT=$(out)" ];
|
||||
|
||||
postUnpack = ''
|
||||
rm -rf $sourceRoot/vgmstream
|
||||
cp --no-preserve=mode,ownership -LR ${vgmstream.src} $sourceRoot/vgmstream
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Streaming video game music decoder plugin for the DeaDBeeF music player";
|
||||
homepage = "https://github.com/jchv/deadbeef-vgmstream";
|
||||
license = lib.licenses.isc;
|
||||
maintainers = [ lib.maintainers.jchw ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
File diff suppressed because it is too large
Load Diff
@@ -3285,12 +3285,6 @@ assertNoAdditions {
|
||||
];
|
||||
};
|
||||
|
||||
nvim-sioyek-highlights = super.nvim-sioyek-highlights.overrideAttrs (old: {
|
||||
meta = old.meta // {
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
});
|
||||
|
||||
nvim-snippets = super.nvim-snippets.overrideAttrs {
|
||||
checkInputs = [
|
||||
# Optional cmp integration
|
||||
|
||||
@@ -1820,7 +1820,7 @@ https://github.com/natecraddock/workspaces.nvim/,,
|
||||
https://github.com/andrewferrier/wrapping.nvim/,,
|
||||
https://github.com/tweekmonster/wstrip.vim/,,
|
||||
https://github.com/piersolenski/wtf.nvim/,,
|
||||
https://github.com/kyza0d/xeno.nvim/,,
|
||||
https://github.com/kyzadev/xeno.nvim/,,
|
||||
https://github.com/Mythos-404/xmake.nvim/,,
|
||||
https://github.com/drmingdrmer/xptemplate/,,
|
||||
https://github.com/guns/xterm-color-table.vim/,,
|
||||
|
||||
@@ -27,12 +27,12 @@ let
|
||||
|
||||
hash =
|
||||
{
|
||||
x86_64-linux = "sha256-CP4tIZhDoC56T6N0RUebNRw3CjxG82odHt4WY8rgmS8=";
|
||||
x86_64-darwin = "sha256-4EWKIXc+CKQLot7eN6Bkd/xigByEGafLMKJ832EOSwA=";
|
||||
aarch64-linux = "sha256-5EwENP1lpHzqiWWeXNQzQOp/zAAEanSbDhWcMeup2sY=";
|
||||
aarch64-darwin = "sha256-9n7kVtknqfSfTc2MmFps5bxSqMnL6KNhZgTb+DVUkhY=";
|
||||
armv7l-linux = "sha256-aXGqp7ljvqDJNb5BMiBIm2CluIr70oiNPmR7BULLsv8=";
|
||||
loongarch64-linux = "sha256-XPEssw+7NVKljyrWcc+Q2HzRr31seDwbdNn3EtyHlSY=";
|
||||
x86_64-linux = "sha256-gscXPWqnQV9nd9XWbL5YkCdyxxnDDEY4WpFAgx5G7a0=";
|
||||
x86_64-darwin = "sha256-H6sKVtQi++U7NvSkKWipjDDJQsTu0Zg3tp9kijL85eU=";
|
||||
aarch64-linux = "sha256-09C5ER/nZBphWHZRRAf9o/hyB6qc2mqIuxOLNdlVSfU=";
|
||||
aarch64-darwin = "sha256-utDPI80JCPcXTFvK65UR5CBlyb+EsocpHM0KWeojaUI=";
|
||||
armv7l-linux = "sha256-voNvX40YWm7oYrgNAIhoRE/9zZlIq/MgaGVlumDUaz4=";
|
||||
loongarch64-linux = "sha256-T7QGiIilEL2lR01yUZ70ubQ2XGgnL7NQ4xkt0MeDD3s=";
|
||||
}
|
||||
.${system} or throwSystem;
|
||||
|
||||
@@ -43,7 +43,7 @@ buildVscode rec {
|
||||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.112.01907";
|
||||
version = "1.116.02821";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
|
||||
@@ -255,6 +255,12 @@ lib.makeOverridable
|
||||
# Example: [ "-Z debuginfo=2" ]
|
||||
# Default: []
|
||||
extraRustcOptsForBuildRs,
|
||||
# Extra rustc options for proc-macro crates, replacing
|
||||
# `extraRustcOpts`. Lets callers keep instrumentation flags
|
||||
# (sanitizers, coverage) off host dylibs, mirroring Cargo's
|
||||
# behaviour of not applying RUSTFLAGS to host artifacts.
|
||||
# Default: null (inherit `extraRustcOpts`)
|
||||
extraRustcOptsForProcMacro,
|
||||
# The lint level cap passed to rustc via `--cap-lints`.
|
||||
# See <https://doc.rust-lang.org/rustc/lints/levels.html#capping-lints>.
|
||||
#
|
||||
@@ -353,7 +359,21 @@ lib.makeOverridable
|
||||
buildInputs_ = buildInputs;
|
||||
extraRustcOpts_ = extraRustcOpts;
|
||||
extraRustcOptsForBuildRs_ = extraRustcOptsForBuildRs;
|
||||
extraRustcOptsForProcMacro_ = extraRustcOptsForProcMacro;
|
||||
buildTests_ = buildTests;
|
||||
procMacro = lib.attrByPath [ "procMacro" ] false crate;
|
||||
# For proc-macros, prefer the *ForProcMacro variant at each level
|
||||
# (crate attr, override arg) and fall back to extraRustcOpts.
|
||||
crateExtraRustcOpts =
|
||||
if procMacro && crate ? extraRustcOptsForProcMacro then
|
||||
crate.extraRustcOptsForProcMacro
|
||||
else
|
||||
crate.extraRustcOpts or [ ];
|
||||
overrideExtraRustcOpts =
|
||||
if procMacro && extraRustcOptsForProcMacro_ != null then
|
||||
extraRustcOptsForProcMacro_
|
||||
else
|
||||
extraRustcOpts_;
|
||||
resolvedLints = crate.lints or lints;
|
||||
lintFlags = lintsToRustcFlags resolvedLints;
|
||||
resolvedCapLints =
|
||||
@@ -486,7 +506,7 @@ lib.makeOverridable
|
||||
crateRustVersion = crate.rust-version or "";
|
||||
crateVersion = crate.version;
|
||||
crateType =
|
||||
if lib.attrByPath [ "procMacro" ] false crate then
|
||||
if procMacro then
|
||||
[ "proc-macro" ]
|
||||
else if lib.attrByPath [ "plugin" ] false crate then
|
||||
[ "dylib" ]
|
||||
@@ -497,8 +517,8 @@ lib.makeOverridable
|
||||
edition = crate.edition or null;
|
||||
codegenUnits = if crate ? codegenUnits then crate.codegenUnits else defaultCodegenUnits;
|
||||
extraRustcOpts =
|
||||
lib.optionals (crate ? extraRustcOpts) crate.extraRustcOpts
|
||||
++ extraRustcOpts_
|
||||
crateExtraRustcOpts
|
||||
++ overrideExtraRustcOpts
|
||||
++ lintFlags
|
||||
++ (lib.optional (edition != null) "--edition ${edition}");
|
||||
extraRustcOptsForBuildRs =
|
||||
@@ -598,6 +618,7 @@ lib.makeOverridable
|
||||
verbose = crate_.verbose or true;
|
||||
extraRustcOpts = [ ];
|
||||
extraRustcOptsForBuildRs = [ ];
|
||||
extraRustcOptsForProcMacro = null;
|
||||
capLints = null;
|
||||
lints = { };
|
||||
features = [ ];
|
||||
|
||||
@@ -836,6 +836,32 @@ rec {
|
||||
];
|
||||
};
|
||||
};
|
||||
# Default (null) inherits extraRustcOpts for proc-macros.
|
||||
procMacroExtraOptsInherit = {
|
||||
procMacro = true;
|
||||
edition = "2018";
|
||||
extraRustcOpts = [ "--cfg=target_only" ];
|
||||
src = mkFile "src/lib.rs" ''
|
||||
#[cfg(not(target_only))]
|
||||
compile_error!("extraRustcOpts not inherited by proc-macro");
|
||||
use proc_macro as _;
|
||||
'';
|
||||
};
|
||||
# When set, extraRustcOptsForProcMacro replaces extraRustcOpts
|
||||
# for proc-macro crates.
|
||||
procMacroExtraOptsOverride = {
|
||||
procMacro = true;
|
||||
edition = "2018";
|
||||
extraRustcOpts = [ "--cfg=target_only" ];
|
||||
extraRustcOptsForProcMacro = [ "--cfg=host_only" ];
|
||||
src = mkFile "src/lib.rs" ''
|
||||
#[cfg(target_only)]
|
||||
compile_error!("extraRustcOpts leaked into proc-macro");
|
||||
#[cfg(not(host_only))]
|
||||
compile_error!("extraRustcOptsForProcMacro not applied");
|
||||
use proc_macro as _;
|
||||
'';
|
||||
};
|
||||
# The `lints` attr mirrors Cargo.toml's `[lints]` table and is
|
||||
# translated to rustc `-A`/`-W`/`-D`/`-F` flags. Lower-priority
|
||||
# entries are emitted first so that higher-priority specific lints
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "asccli";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rorkai";
|
||||
repo = "App-Store-Connect-CLI";
|
||||
tag = "${finalAttrs.version}";
|
||||
hash = "sha256-VMLLziuLV7F95mTdEmaUxwMC9vKSTejJZgw3KFHr7sg=";
|
||||
hash = "sha256-junTdPz0gtfmDPycuitYo06a0D25yi3E2uVPaaQtWBQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XBEDMUGwSh8P+dVKMebN3zD83e1odAN+Wy15yys0+2M=";
|
||||
|
||||
@@ -28,14 +28,14 @@ let
|
||||
in
|
||||
stdenv'.mkDerivation (finalAttrs: {
|
||||
pname = "ctranslate2";
|
||||
version = "4.7.1";
|
||||
version = "4.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenNMT";
|
||||
repo = "CTranslate2";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-Dc67hYgZ0aAauZLrVp10jmP52AwdLIZw0iWR9YKHTtU=";
|
||||
hash = "sha256-jtOfMrC5kFKQN4eFEZeawo0blWHbpMu+peM3XtTSf5w=";
|
||||
};
|
||||
|
||||
# Fix CMake 4 compatibility
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
blueprint-compiler,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
@@ -16,16 +17,17 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dippi";
|
||||
version = "4.2.0";
|
||||
version = "5.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cassidyjames";
|
||||
repo = "dippi";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-iA7ymByLVrkOatW4Y79pGV7GhlS8G2gHY6PHpOfMq8g=";
|
||||
hash = "sha256-PfJp4DOM4uaDaKMYeLS70LA00mCeW/jaLmduJ1Wej4k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
blueprint-compiler
|
||||
meson
|
||||
ninja
|
||||
vala
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
pkg-config,
|
||||
fuse,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "djmount";
|
||||
version = "0.71";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/djmount/${finalAttrs.version}/djmount-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "0kqf0cy3h4cfiy5a2sigmisx0lvvsi1n0fbyb9ll5gacmy1b8nxa";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Taken from https://github.com/pupnp/pupnp/pull/334/files
|
||||
substituteInPlace libupnp/threadutil/inc/ithread.h \
|
||||
--replace \
|
||||
"#define ithread_mutexattr_setkind_np pthread_mutexattr_setkind_np" \
|
||||
'#define ithread_mutexattr_setkind_np pthread_mutexattr_settype'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ fuse ];
|
||||
|
||||
# Workaround build failure on -fno-common toolchains like upstream
|
||||
# gcc-10. Otherwise build fails as:
|
||||
# ld: libupnp/upnp/.libs/libupnp.a(libupnp_la-gena_ctrlpt.o):libupnp/upnp/src/inc/upnpapi.h:163:
|
||||
# multiple definition of `pVirtualDirList'; libupnp/upnp/.libs/libupnp.a(libupnp_la-upnpapi.o):libupnp/upnp/src/inc/upnpapi.h:163: first defined here
|
||||
env.NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
|
||||
meta = {
|
||||
homepage = "https://djmount.sourceforge.net/";
|
||||
description = "UPnP AV client, mounts as a Linux filesystem the media content of compatible UPnP AV devices";
|
||||
mainProgram = "djmount";
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.gpl2Plus;
|
||||
};
|
||||
})
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
maven.buildMavenPackage rec {
|
||||
pname = "filius";
|
||||
version = "2.10.1";
|
||||
version = "2.11.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "filius1";
|
||||
repo = "filius";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-q6A+S50n09DgwayylAWbUFQ/sqfCVEkIoWCRtZT80M8=";
|
||||
hash = "sha256-l90KnHfndGsEzgJpTNabW0ADJhTYr7z3243TZUJbxNw=";
|
||||
};
|
||||
|
||||
mvnHash = "sha256-R14EtImJJEC/DhKm7MKWzq9XEOqDGNPtLIaK3OKbyiQ=";
|
||||
|
||||
@@ -24,8 +24,8 @@ let
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
srcVersion = "nov25a";
|
||||
version = "20251101_a";
|
||||
srcVersion = "may26a";
|
||||
version = "20260501_a";
|
||||
pname = "gildas";
|
||||
|
||||
src = fetchurl {
|
||||
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
"http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz"
|
||||
"http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz"
|
||||
];
|
||||
hash = "sha256-1wUKOW0DtGuxggZXzZf2aXRf9F4EFkgU5D4SjK8EwXM=";
|
||||
hash = "sha256-c/GwX4II6JFJXRaslPN/DfvtAis8apk+xonJ9WAvrQM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -26,13 +26,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gvm-libs";
|
||||
version = "23.0.0";
|
||||
version = "23.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "greenbone";
|
||||
repo = "gvm-libs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-WmHBR7BCkmyTx7l88lEV9aRrPFp1Dj+qh6bs23E6wnA=";
|
||||
hash = "sha256-dDyXUYDP+kWBtr7WCkPO2BetdwEYDWs9pyLMPLEi8zI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
}:
|
||||
buildGo125Module (finalAttrs: {
|
||||
pname = "jjui";
|
||||
version = "0.10.5";
|
||||
version = "0.10.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "idursun";
|
||||
repo = "jjui";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-3cr6aSJoIAv9Ine2ePHCC6xBaS1G4i23yQh8I5mq47g=";
|
||||
hash = "sha256-kz1GDk+M98yWVu69nTRVxjC/Kk9qbGFfXXJ5ZwDLEiU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-iUWeQIYwOkXhRFsQc5zBjFFG5m412ysR5LsZsHET1ak=";
|
||||
vendorHash = "sha256-I39Tcb28voPSuZhYkEPdvhsViZD7QZZtZjDtRKkZ5LE=";
|
||||
|
||||
ldflags = [ "-X main.Version=${finalAttrs.version}" ];
|
||||
|
||||
|
||||
@@ -23,13 +23,13 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "linux-firmware";
|
||||
version = "20260410";
|
||||
version = "20260519";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "kernel-firmware";
|
||||
repo = "linux-firmware";
|
||||
tag = version;
|
||||
hash = "sha256-nceQEGm6+Cj6KCeUNwmYsUdArRULfLXysXjzOXdCBQw=";
|
||||
hash = "sha256-vyrnHNnyNko7m/fZ3fXgLvvasYyJ/pzs5be/Ele+6vY=";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
|
||||
@@ -18,18 +18,18 @@
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "lux-cli";
|
||||
|
||||
version = "0.29.0";
|
||||
version = "0.29.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lumen-oss";
|
||||
repo = "lux";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-jQkqWngHLHf0myzy7PjiNQFEI0/cq9FZQNst3BzIexs=";
|
||||
hash = "sha256-x1sq83rtY3oiL6h4MO6GSyAItj7CX5/25DwXMhXefAU=";
|
||||
};
|
||||
|
||||
buildAndTestSubdir = "lux-cli";
|
||||
|
||||
cargoHash = "sha256-+geQjo/hvx+ZtF2n2bWfQZMbAI6zPgbDAVH2TZbrKQc=";
|
||||
cargoHash = "sha256-Z9WC14DMK13UCWDm1nGpN9UXY9wpFJkB21nkI2y77bw=";
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
|
||||
@@ -1,30 +1,28 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
python3,
|
||||
python3Packages,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "malwoverview";
|
||||
version = "6.1.1";
|
||||
version = "8.0.1";
|
||||
pyproject = true;
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexandreborges";
|
||||
repo = "malwoverview";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-43LcrP89vhVFDRRRItFL6hl++mvdGoPugMwD3TEOSE0=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-yIlKrZaIJmz3INGTrk+ydU+8gjAt54glSteMUrXSAgU=";
|
||||
};
|
||||
|
||||
pythonRemoveDeps = [
|
||||
"pathlib"
|
||||
];
|
||||
|
||||
build-system = with python3.pkgs; [
|
||||
build-system = with python3Packages; [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = with python3.pkgs; [
|
||||
dependencies = with python3Packages; [
|
||||
colorama
|
||||
configparser
|
||||
geocoder
|
||||
@@ -34,6 +32,11 @@ python3.pkgs.buildPythonApplication rec {
|
||||
requests
|
||||
simplejson
|
||||
validators
|
||||
tqdm
|
||||
python-whois
|
||||
ipwhois
|
||||
# For --tui
|
||||
textual
|
||||
];
|
||||
|
||||
# Project has no tests
|
||||
@@ -46,9 +49,9 @@ python3.pkgs.buildPythonApplication rec {
|
||||
meta = {
|
||||
description = "Tool for threat hunting and gathering intel information from various sources";
|
||||
homepage = "https://github.com/alexandreborges/malwoverview";
|
||||
changelog = "https://github.com/alexandreborges/malwoverview/releases/tag/v${version}";
|
||||
changelog = "https://github.com/alexandreborges/malwoverview/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
mainProgram = "malwoverview.py";
|
||||
mainProgram = "malwoverview";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
{ callPackage }: (callPackage ./versions.nix { }).vanilla
|
||||
@@ -0,0 +1,50 @@
|
||||
{
|
||||
lib,
|
||||
javaPackages,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
nixosTests,
|
||||
makeWrapper,
|
||||
udev,
|
||||
}:
|
||||
let
|
||||
versions = lib.importJSON ./versions.json;
|
||||
|
||||
latestVersion = lib.last (builtins.sort lib.versionOlder (builtins.attrNames versions));
|
||||
escapeVersion = builtins.replaceStrings [ "." ] [ "-" ];
|
||||
|
||||
getJavaVersion = v: (builtins.getAttr "openjdk${toString v}" javaPackages.compiler).headless;
|
||||
|
||||
mkVersion = (
|
||||
version: value: {
|
||||
name = "vanilla-${escapeVersion version}";
|
||||
value = import ./derivation.nix {
|
||||
inherit
|
||||
lib
|
||||
stdenv
|
||||
fetchurl
|
||||
nixosTests
|
||||
makeWrapper
|
||||
udev
|
||||
;
|
||||
inherit (value) version url sha1;
|
||||
jre_headless = getJavaVersion (
|
||||
if value.javaVersion == null then
|
||||
8
|
||||
else if value.javaVersion == 16 then
|
||||
17
|
||||
else
|
||||
value.javaVersion
|
||||
); # versions <= 1.6 will default to 8
|
||||
};
|
||||
}
|
||||
);
|
||||
|
||||
packages = lib.mapAttrs' mkVersion versions;
|
||||
in
|
||||
lib.recurseIntoAttrs (
|
||||
packages
|
||||
// {
|
||||
vanilla = (mkVersion latestVersion versions.${latestVersion}).value;
|
||||
}
|
||||
)
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "mint-themes";
|
||||
version = "2.3.9";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "mint-themes";
|
||||
rev = version;
|
||||
hash = "sha256-Zvy/qqyzc6Yu6TJC+vbJ660MYeyX27LIm1TovwbRjMs=";
|
||||
hash = "sha256-pO2qotVR48VTKIS1IDqb9GwKTo/l1BV1Hk0w4Pf5V+U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "misconfig-mapper";
|
||||
version = "1.16.0";
|
||||
version = "1.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intigriti";
|
||||
repo = "misconfig-mapper";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-WHVNUdzYDC3vV1UDYSAHkwWUlfBvMg1OCh/BwE7shWE=";
|
||||
hash = "sha256-cxBoGk9K9Y2mtkAM4JW3XoQi+MrOGhRmQ3iRKF2cueA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-jM+td4OUDK7Z4zZy/w0foupQMYpFhOTIefSUoovgEeE=";
|
||||
|
||||
@@ -8,12 +8,12 @@
|
||||
}:
|
||||
let
|
||||
pname = "models-dev";
|
||||
version = "0-unstable-2026-05-07";
|
||||
version = "0-unstable-2026-05-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "anomalyco";
|
||||
repo = "models.dev";
|
||||
rev = "2e5b87a9c20c198dba4e3c8eba3ccfa959499790";
|
||||
hash = "sha256-dZLzWgur3zccc92/iaeckcCMCFYOqBz49p1b5gzMaDY=";
|
||||
rev = "db0a7cf6113f380b15e8ab21944e5de18bb30feb";
|
||||
hash = "sha256-kFskkQ5YrK7ler8s+vC5ONEjmNmOpiIKAZqoiCk97Qk=";
|
||||
};
|
||||
|
||||
node_modules = stdenvNoCC.mkDerivation {
|
||||
@@ -57,7 +57,7 @@ let
|
||||
# NOTE: Required else we get errors that our fixed-output derivation references store paths
|
||||
dontFixup = true;
|
||||
|
||||
outputHash = "sha256-eXgzhb/yhgw0B1WDrpaEmH5Tyya+/rye6kJVKdiV56w=";
|
||||
outputHash = "sha256-kn5Ung5DGDYMf5MHnZ+jsqXCg+MYahfkbiixcD9kh4Y=";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
};
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "open62541pp";
|
||||
version = "0.21.0";
|
||||
version = "0.21.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open62541pp";
|
||||
repo = "open62541pp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-mxrAJjOwRZ85zy6zE0P4z+ToTK3goRZv0xKimUjA69M=";
|
||||
hash = "sha256-BYRPHkRG2b/k1vVyOIRK1UH7MRxEpui5YTPfdO3Wx+Y=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@@ -46,12 +46,12 @@ let
|
||||
|
||||
bandit = buildMix rec {
|
||||
name = "bandit";
|
||||
version = "1.5.7";
|
||||
version = "1.10.4";
|
||||
|
||||
src = fetchHex {
|
||||
pkg = "bandit";
|
||||
version = "${version}";
|
||||
sha256 = "f2dd92ae87d2cbea2fa9aa1652db157b6cba6c405cb44d4f6dd87abba41371cd";
|
||||
sha256 = "a5faf501042ac1f31d736d9d4a813b3db4ef812e634583b6a457b0928798a51d";
|
||||
};
|
||||
|
||||
beamDeps = [
|
||||
@@ -853,12 +853,12 @@ let
|
||||
|
||||
hackney = buildRebar3 rec {
|
||||
name = "hackney";
|
||||
version = "1.18.2";
|
||||
version = "1.20.1";
|
||||
|
||||
src = fetchHex {
|
||||
pkg = "hackney";
|
||||
version = "${version}";
|
||||
sha256 = "af94d5c9f97857db257090a4a10e5426ecb6f4918aa5cc666798566ae14b65fd";
|
||||
sha256 = "fe9094e5f1a2a2c0a7d10918fee36bfec0ec2a979994cff8cfe8058cd9af38e3";
|
||||
};
|
||||
|
||||
beamDeps = [
|
||||
@@ -1139,12 +1139,12 @@ let
|
||||
|
||||
mimerl = buildRebar3 rec {
|
||||
name = "mimerl";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchHex {
|
||||
pkg = "mimerl";
|
||||
version = "${version}";
|
||||
sha256 = "13af15f9f68c65884ecca3a3891d50a7b57d82152792f3e19d88650aa126b144";
|
||||
sha256 = "db648ce065bae14ea84ca8b5dd123f42f49417cef693541110bf6f9e9be9ecc4";
|
||||
};
|
||||
|
||||
beamDeps = [ ];
|
||||
@@ -1330,6 +1330,40 @@ let
|
||||
];
|
||||
};
|
||||
|
||||
oban_met = buildMix rec {
|
||||
name = "oban_met";
|
||||
version = "1.0.5";
|
||||
|
||||
src = fetchHex {
|
||||
pkg = "oban_met";
|
||||
version = "${version}";
|
||||
sha256 = "64664d50805bbfd3903aeada1f3c39634652a87844797ee400b0bcc95a28f5ea";
|
||||
};
|
||||
|
||||
beamDeps = [ oban ];
|
||||
};
|
||||
|
||||
oban_web = buildMix rec {
|
||||
name = "oban_web";
|
||||
version = "2.11.6";
|
||||
|
||||
src = fetchHex {
|
||||
pkg = "oban_web";
|
||||
version = "${version}";
|
||||
sha256 = "576d94b705688c313694c2c114ca21aa0f8f2ad1b9ca45c052c5ba316d3e8d10";
|
||||
};
|
||||
|
||||
beamDeps = [
|
||||
jason
|
||||
oban
|
||||
oban_met
|
||||
phoenix
|
||||
phoenix_html
|
||||
phoenix_live_view
|
||||
phoenix_pubsub
|
||||
];
|
||||
};
|
||||
|
||||
octo_fetch = buildMix rec {
|
||||
name = "octo_fetch";
|
||||
version = "0.4.0";
|
||||
@@ -1458,12 +1492,14 @@ let
|
||||
|
||||
phoenix_live_view = buildMix rec {
|
||||
name = "phoenix_live_view";
|
||||
version = "0.19.5";
|
||||
version = "1.1.19";
|
||||
|
||||
builInputs = [
|
||||
];
|
||||
src = fetchHex {
|
||||
pkg = "phoenix_live_view";
|
||||
version = "${version}";
|
||||
sha256 = "b2eaa0dd3cfb9bd7fb949b88217df9f25aed915e986a28ad5c8a0d054e7ca9d3";
|
||||
sha256 = "sha256-1a01fWshVipbQx8K0J3+dtuc5WSMaUnxqsM0yMRFXTI=";
|
||||
};
|
||||
|
||||
beamDeps = [
|
||||
@@ -1472,8 +1508,10 @@ let
|
||||
phoenix_html
|
||||
phoenix_template
|
||||
phoenix_view
|
||||
plug
|
||||
telemetry
|
||||
];
|
||||
|
||||
};
|
||||
|
||||
phoenix_pubsub = buildMix rec {
|
||||
@@ -1540,12 +1578,12 @@ let
|
||||
|
||||
plug = buildMix rec {
|
||||
name = "plug";
|
||||
version = "1.18.1";
|
||||
version = "1.19.1";
|
||||
|
||||
src = fetchHex {
|
||||
pkg = "plug";
|
||||
version = "${version}";
|
||||
sha256 = "57a57db70df2b422b564437d2d33cf8d33cd16339c1edb190cd11b1a3a546cc2";
|
||||
sha256 = "560a0017a8f6d5d30146916862aaf9300b7280063651dd7e532b8be168511e62";
|
||||
};
|
||||
|
||||
beamDeps = [
|
||||
@@ -1740,6 +1778,19 @@ let
|
||||
beamDeps = [ ];
|
||||
};
|
||||
|
||||
quic = buildRebar3 rec {
|
||||
name = "quic";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchHex {
|
||||
pkg = "quic";
|
||||
version = "${version}";
|
||||
sha256 = "7c196a66973c877a59768a5687f0a0610ff11817254d0a4e45cc4e3a16b1d00b";
|
||||
};
|
||||
|
||||
beamDeps = [ ];
|
||||
};
|
||||
|
||||
ranch = buildRebar3 rec {
|
||||
name = "ranch";
|
||||
version = "2.2.0";
|
||||
@@ -1969,12 +2020,12 @@ let
|
||||
|
||||
thousand_island = buildMix rec {
|
||||
name = "thousand_island";
|
||||
version = "1.3.14";
|
||||
version = "1.4.3";
|
||||
|
||||
src = fetchHex {
|
||||
pkg = "thousand_island";
|
||||
version = "${version}";
|
||||
sha256 = "d0d24a929d31cdd1d7903a4fe7f2409afeedff092d277be604966cd6aa4307ef";
|
||||
sha256 = "6e4ce09b0fd761a58594d02814d40f77daff460c48a7354a15ab353bb998ea0b";
|
||||
};
|
||||
|
||||
beamDeps = [ telemetry ];
|
||||
@@ -2077,16 +2128,15 @@ let
|
||||
|
||||
vix = buildMix rec {
|
||||
name = "vix";
|
||||
version = "0.26.0";
|
||||
version = "0.36.0";
|
||||
|
||||
src = fetchHex {
|
||||
pkg = "vix";
|
||||
version = "${version}";
|
||||
sha256 = "71b0a79ae7f199cacfc8e679b0e4ba25ee47dc02e182c5b9097efb29fbe14efd";
|
||||
sha256 = "92f912b4e90c453f92942742105bcdb367ad53406759da251bd2e587e33f4134";
|
||||
};
|
||||
|
||||
beamDeps = [
|
||||
castore
|
||||
cc_precompiler
|
||||
elixir_make
|
||||
];
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
beam,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchFromGitLab,
|
||||
fetchFromForgejo,
|
||||
fetchHex,
|
||||
file,
|
||||
cmake,
|
||||
@@ -19,14 +19,14 @@ let
|
||||
in
|
||||
beamPackages.mixRelease rec {
|
||||
pname = "pleroma";
|
||||
version = "2.10.0";
|
||||
version = "2.10.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
src = fetchFromForgejo {
|
||||
domain = "git.pleroma.social";
|
||||
owner = "pleroma";
|
||||
repo = "pleroma";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kW4AcOYHtm8lVXRroDCUM7jY7o39JHx/J/mfy2XfBgs=";
|
||||
sha256 = "sha256-5BFzV2alNDjO/bS08+V4idzFaXQLr+4pNlLLXayBqIE=";
|
||||
};
|
||||
|
||||
patches = [ ./Revert-Config-Restrict-permissions-of-OTP-config.patch ];
|
||||
@@ -72,7 +72,7 @@ beamPackages.mixRelease rec {
|
||||
name = "captcha";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
src = fetchFromForgejo {
|
||||
domain = "git.pleroma.social";
|
||||
owner = "pleroma/elixir-libraries";
|
||||
repo = "elixir-captcha";
|
||||
@@ -96,7 +96,7 @@ beamPackages.mixRelease rec {
|
||||
oban_plugins_lazarus = beamPackages.buildMix {
|
||||
name = "oban_plugins_lazarus";
|
||||
version = "0.1.0";
|
||||
src = fetchFromGitLab {
|
||||
src = fetchFromForgejo {
|
||||
domain = "git.pleroma.social";
|
||||
owner = "pleroma/elixir-libraries";
|
||||
repo = "oban_plugins_lazarus";
|
||||
@@ -109,7 +109,7 @@ beamPackages.mixRelease rec {
|
||||
name = "remote_ip";
|
||||
version = "0.1.5";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
src = fetchFromForgejo {
|
||||
domain = "git.pleroma.social";
|
||||
owner = "pleroma/elixir-libraries";
|
||||
repo = "remote_ip";
|
||||
@@ -136,15 +136,23 @@ beamPackages.mixRelease rec {
|
||||
|
||||
syslog = prev.syslog.override { buildPlugins = with beamPackages; [ pc ]; };
|
||||
|
||||
phoenix_live_view = prev.phoenix_live_view.override {
|
||||
# This listener breaks with elixir 1.18.
|
||||
# It's only using for dev, let's remove it.
|
||||
postPatch = ''
|
||||
sed -i '/listeners: \[Phoenix.CodeReloader\]/d' mix.exs
|
||||
'';
|
||||
};
|
||||
|
||||
oban_web = prev.oban_web.override {
|
||||
# This listener breaks with elixir 1.18.
|
||||
# It's only using for dev, let's remove it.
|
||||
postPatch = ''
|
||||
sed -i '/listeners: \[Phoenix.CodeReloader\]/d' mix.exs
|
||||
'';
|
||||
};
|
||||
|
||||
vix = prev.vix.override {
|
||||
# TOREMOVE override when upstream bumps the dependency. See
|
||||
# https://git.pleroma.social/pleroma/pleroma/-/issues/3393
|
||||
src = fetchFromGitHub {
|
||||
owner = "akash-akya";
|
||||
repo = "vix";
|
||||
tag = "v0.36.0";
|
||||
hash = "sha256-14gqzu5TBbgrqCU4+qz0jWCK6Ar5JvmKKLcfgz5BHtw=";
|
||||
};
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
vips
|
||||
|
||||
@@ -35,14 +35,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "poetry";
|
||||
version = "2.4.0";
|
||||
version = "2.4.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "python-poetry";
|
||||
repo = "poetry";
|
||||
tag = version;
|
||||
hash = "sha256-B3owfzchG2nlUvsIOrI7cLMH9EI0DmTQI7D9ses7DAc=";
|
||||
hash = "sha256-Mb1etVmBm542q7FrcMU6pzXdMUDQSpI8DFg/gbOiG4U=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication {
|
||||
pname = "renode-dts2repl";
|
||||
version = "0-unstable-2026-05-05";
|
||||
version = "0-unstable-2026-05-19";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "antmicro";
|
||||
repo = "dts2repl";
|
||||
rev = "3137db4ec2c85749cfc57bf05b460529d4e52a94";
|
||||
hash = "sha256-PHtt31DGvOWgutgqbBcOr2vjdvnjaJmCTpRbHtx8MJw=";
|
||||
rev = "2e62d9b087daac8aa6e56c22ad0eaef72aaa8bf8";
|
||||
hash = "sha256-+Pwk85cei9f7mvQKnZMIY1N7gjOc8UxicyTNQP3MPPI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,49 +6,36 @@
|
||||
which,
|
||||
perl,
|
||||
perlPackages,
|
||||
buildNimPackage,
|
||||
git,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
buildNimPackage (finalAttrs: {
|
||||
pname = "taskopen";
|
||||
version = "1.1.5";
|
||||
version = "2.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ValiValpas";
|
||||
owner = "jschlatow";
|
||||
repo = "taskopen";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-/xf7Ph2KKiZ5lgLKk95nCgw/z9wIBmuWf3QGaNebgHg=";
|
||||
sha256 = "sha256-0SAiSaN9V1JYnyJsWda6unqUlyXRL8y8JHXP4VNAFhM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# We don't need a DESTDIR and an empty string results in an absolute path
|
||||
# (due to the trailing slash) which breaks the build.
|
||||
sed 's|$(DESTDIR)/||' -i Makefile
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [
|
||||
which
|
||||
]
|
||||
++ (with perlPackages; [
|
||||
JSON
|
||||
perl
|
||||
]);
|
||||
|
||||
buildPhase = ''
|
||||
export HOME=$(pwd)
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
make PREFIX=$out
|
||||
make PREFIX=$out install
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/taskopen \
|
||||
--set PERL5LIB "$PERL5LIB"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Script for taking notes and open urls with taskwarrior";
|
||||
mainProgram = "taskopen";
|
||||
homepage = "https://github.com/ValiValpas/taskopen";
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = lib.platforms.all;
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ lib.maintainers.winpat ];
|
||||
};
|
||||
|
||||
@@ -8,16 +8,21 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "termirs";
|
||||
version = "0.2.5";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "caelansar";
|
||||
repo = "termirs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-n9/rtPDf7wNAjumOetiLRPVHWLReAYHhntJ+BgJ7f10=";
|
||||
hash = "sha256-Ae295u1qJLWrtWSYK+c9wMgjW6m3rvTJzVsm25BeXZo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Kkf20ljB2hm6e4hZXEGIg2l83ugxNlHUPpwxKEyBpdY=";
|
||||
cargoHash = "sha256-klSZDK3s5X7qRopXVy3Qec3Dnuu9ov0bfuhwc6DwpIM=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace ../termirs-0.3.2-vendor/source-git-0/wezterm-term-0.1.0/src/terminalstate/mod.rs \
|
||||
--replace-fail 'include_bytes!("../../../termwiz/data/wezterm")' 'include_bytes!("../../../termwiz-0.24.0/data/wezterm")'
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -10,14 +10,14 @@ let
|
||||
platform =
|
||||
if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system;
|
||||
hash = builtins.getAttr platform {
|
||||
"universal-macos" = "sha256-1Zn/JeRCwLH1kC+sZGNdez2Um6VZgEvCf4BwbWTfMSs=";
|
||||
"x86_64-linux" = "sha256-T2CjzbpxfOPYgJpAqOqcID1pvGW7FJFpRk6/hdgKiOk=";
|
||||
"aarch64-linux" = "sha256-Y4UsPOno5bfWGHYh2BwV2L9xLiFjv/wuVAW+FSevuV8=";
|
||||
"universal-macos" = "sha256-MyTSCp5bf24Z6VnwYL3tkj7HNUcQ0S5m5fmzYjKmg08=";
|
||||
"x86_64-linux" = "sha256-tkg7SP3ln5cw7rs7qM+yd8l/FICC98argrkMZPjrkKk=";
|
||||
"aarch64-linux" = "sha256-SLw2mFQWylfwNbxYQi0wCje1A4foPqxZn9GxkQEu6Zs=";
|
||||
};
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "tigerbeetle";
|
||||
version = "0.17.3";
|
||||
version = "0.17.4";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip";
|
||||
|
||||
@@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [
|
||||
];
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "trealla";
|
||||
version = "2.92.19";
|
||||
version = "2.99.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trealla-prolog";
|
||||
repo = "trealla";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-XqpLEJ/jmAzw+m2LEhP+oNCNGVRLkDCgNuYkEeZgf8Q=";
|
||||
hash = "sha256-pe6X4TCMB0V1U7tiTUF5cGMcaX9HOeI4Ubpc6TddJ6c=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -130,6 +130,9 @@ python3.pkgs.buildPythonApplication rec {
|
||||
"test_all_handlers[filesystem.extfs]"
|
||||
# regression in erofs-utils 1.9 https://github.com/onekey-sec/unblob/commit/c7c9f20dd871a5694d41a95ca3041eb0c98e257a
|
||||
"test_all_handlers[filesystem.android.erofs]"
|
||||
# unblob's landlock sandbox denies hardlinks within the extract dir (EXDEV). https://github.com/onekey-sec/unblob/issues/1210
|
||||
"test_all_handlers[filesystem.romfs]"
|
||||
"test_all_handlers[filesystem.yaffs]"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
@@ -9,6 +8,7 @@
|
||||
SDL2_image,
|
||||
SDL2_mixer,
|
||||
SDL2_net,
|
||||
makeBinaryWrapper,
|
||||
SDL2_ttf,
|
||||
pango,
|
||||
gettext,
|
||||
@@ -55,7 +55,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ makeBinaryWrapper ];
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
@@ -78,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DENABLE_SYSTEM_LUA=ON"
|
||||
(lib.cmakeBool "ENABLE_SYSTEM_LUA" true)
|
||||
"-DBINARY_SUFFIX=${suffix}"
|
||||
];
|
||||
|
||||
@@ -110,25 +111,24 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
echo "APPL????" > "$app_contents/PkgInfo"
|
||||
mv $out/bin "$app_contents/MacOS"
|
||||
mv $out/share/wesnoth "$app_contents/Resources"
|
||||
|
||||
pushd ../projectfiles/Xcode
|
||||
substitute Info.plist "$app_contents/Info.plist" \
|
||||
--replace-fail ''\'''${EXECUTABLE_NAME}' wesnoth${suffix} \
|
||||
--replace-fail '$(PRODUCT_BUNDLE_IDENTIFIER)' org.wesnoth.Wesnoth${suffix} \
|
||||
--replace-fail ''\'''${PRODUCT_NAME}' "$app_name"
|
||||
cp -r Resources/SDLMain.nib "$app_contents/Resources/"
|
||||
install -m0644 Resources/{container-migration.plist,icon.icns} "$app_contents/Resources"
|
||||
substitute Info.plist "$app_contents/Info.plist" \
|
||||
--replace-fail ''\'''${EXECUTABLE_NAME}' wesnoth${suffix} \
|
||||
--replace-fail '$(PRODUCT_BUNDLE_IDENTIFIER)' org.wesnoth.Wesnoth${suffix} \
|
||||
--replace-fail ''\'''${PRODUCT_NAME}' "$app_name"
|
||||
|
||||
cp -r Resources/SDLMain.nib "$app_contents/Resources/"
|
||||
install -m0644 Resources/{container-migration.plist,icon.icns} "$app_contents/Resources"
|
||||
popd
|
||||
|
||||
# Make the game and dedicated server binary available for shell users
|
||||
mkdir -p "$out/bin"
|
||||
ln -s "$app_contents/MacOS/wesnothd${suffix}" "$out/bin/wesnothd${suffix}"
|
||||
|
||||
# Symlinking the game binary is unsifficient as it would be unable to
|
||||
# find the bundle resources
|
||||
cat << EOF > "$out/bin/wesnoth${suffix}"
|
||||
#!${stdenvNoCC.shell}
|
||||
open -na "$app_bundle" --args "\$@"
|
||||
EOF
|
||||
chmod +x "$out/bin/wesnoth${suffix}"
|
||||
makeBinaryWrapper "$app_bundle/Contents/MacOS/wesnoth${suffix}" "$out/bin/wesnoth${suffix}"
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
@@ -154,7 +154,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
reclaim the throne of Wesnoth, or take hand in any number of other
|
||||
adventures.
|
||||
'';
|
||||
|
||||
homepage = "https://www.wesnoth.org/";
|
||||
changelog = "https://github.com/wesnoth/wesnoth/blob/${finalAttrs.version}/changelog.md";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
|
||||
@@ -37,13 +37,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xreader";
|
||||
version = "4.6.3";
|
||||
version = "4.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "xreader";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-lVJFNOiayAai/Lg4tl8lNaK5fdTlZ0ptzstUzciH1mA=";
|
||||
hash = "sha256-upX2+Hwdss7OfIWFg5MALoF9LIw5mk6+NYR+NEbcDX4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "zensical";
|
||||
version = "0.0.41";
|
||||
version = "0.0.43";
|
||||
pyproject = true;
|
||||
|
||||
# We fetch from PyPi, because GitHub repo does not contain all sources.
|
||||
@@ -16,12 +16,12 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
# We could combine sources, but then nix-update won't work.
|
||||
src = fetchPypi {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-bDyQMBEjdJ38JqIQ1sCA8GkSU8fHZa0wihC0UYNppv4=";
|
||||
hash = "sha256-3C04BP9WJ5XBAkEw4MPOeXNkZ5MHKd2jFPCW0ONbmMg=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-pfDqqtD0kKGVKkv7DvEUKpdDYk9xvRs5gmLCafFHrhs=";
|
||||
hash = "sha256-clm+y56i2RN0FxicGpZ/JWdGxjkSo6xFf0sGE6LdSaQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with rustPlatform; [
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
setuptools,
|
||||
numpy,
|
||||
scipy,
|
||||
@@ -22,6 +23,13 @@ buildPythonPackage rec {
|
||||
hash = "sha256-kx87XY4GCL1PQIeZyovEbrPyCC/EVA6Hdvt+3P/D6VI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
url = "https://salsa.debian.org/python-team/packages/python-bayespy/-/raw/071f54815608b31aebac8f8e83bc532b2c632a48/debian/patches/numpy2.4-compat.patch";
|
||||
hash = "sha256-Tk3z94+vbGaSIqGFFRQZz0pcXI1Fzcbnva3oWnv502U=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace versioneer.py \
|
||||
--replace-fail SafeConfigParser ConfigParser \
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
pytest-mock,
|
||||
pytest-cov-stub,
|
||||
pytestCheckHook,
|
||||
pythonAtLeast,
|
||||
requests,
|
||||
requests-mock,
|
||||
responses,
|
||||
@@ -54,6 +55,13 @@ buildPythonPackage rec {
|
||||
mkdir -p $HOME
|
||||
'';
|
||||
|
||||
disabledTests = lib.optionals (pythonAtLeast "3.14") [
|
||||
# argparse usage prefix uses the actual prog (python3.14 -m pytest) instead of sys.argv[0]
|
||||
"test_default_help"
|
||||
"test_help"
|
||||
"test_search_help"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "censys" ];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "claude-agent-sdk";
|
||||
version = "0.1.81";
|
||||
version = "0.2.82";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anthropics";
|
||||
repo = "claude-agent-sdk-python";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-doSMgHmbe0F3DdduLa+zzHFUqBBBj0NR4NwayfyZbDw=";
|
||||
hash = "sha256-mv04UsKb8hPNFYhOCQcgav9FxwKNswWpX/TkiGcqEHI=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "codecarbon";
|
||||
version = "3.2.6";
|
||||
version = "3.2.7";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -56,7 +56,7 @@ buildPythonPackage (finalAttrs: {
|
||||
owner = "mlco2";
|
||||
repo = "codecarbon";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Nzt+CKXnv6zvWKsFD7duguVj0AA4eWZgFUlBdIEujD8=";
|
||||
hash = "sha256-9eec43jszRCiA6oD3T8YTXXRkrq0ESLhSwmxL4Pg9fc=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -26,6 +26,10 @@ buildPythonPackage rec {
|
||||
hash = "sha256-H416dgZQxyqsnhmlK5keW8cJWY6gea4mebVuP0IEVOU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./tests-numpy-2.4.patch # https://github.com/dedupeio/pylbfgs/pull/52
|
||||
];
|
||||
|
||||
build-system = [
|
||||
cython
|
||||
numpy
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
diff --git a/tests/test_lbfgs.py b/tests/test_lbfgs.py
|
||||
index 1af91ef..65e2da9 100644
|
||||
--- a/tests/test_lbfgs.py
|
||||
+++ b/tests/test_lbfgs.py
|
||||
@@ -28,16 +28,16 @@ class TestOWLQN:
|
||||
|
||||
def test_owl_line_search_default(self):
|
||||
def f(x, g, *args):
|
||||
- g[0] = 2 * x
|
||||
- return x ** 2
|
||||
+ g[0] = 2 * x[0]
|
||||
+ return x[0] ** 2
|
||||
|
||||
with pytest.warns(UserWarning, match="OWL-QN"):
|
||||
xmin = fmin_lbfgs(f, 100., orthantwise_c=1)
|
||||
|
||||
def test_owl_line_search_warning_explicit(self):
|
||||
def f(x, g, *args):
|
||||
- g[0] = 2 * x
|
||||
- return x ** 2
|
||||
+ g[0] = 2 * x[0]
|
||||
+ return x[0] ** 2
|
||||
|
||||
with pytest.warns(UserWarning, match="OWL-QN"):
|
||||
xmin = fmin_lbfgs(f, 100., orthantwise_c=1, line_search='default')
|
||||
@@ -14,6 +14,7 @@
|
||||
pytest-lazy-fixture,
|
||||
pytest-mock,
|
||||
pytestCheckHook,
|
||||
pythonAtLeast,
|
||||
requests-toolbelt,
|
||||
requests,
|
||||
responses,
|
||||
@@ -98,6 +99,8 @@ buildPythonPackage rec {
|
||||
"test_naked_invocation"
|
||||
# Test is flaky
|
||||
"test_stdin_read_warning"
|
||||
# flaky: daemon status check exceeds attempt limit
|
||||
"test_daemon_runner"
|
||||
# httpbin compatibility issues
|
||||
"test_binary_suppresses_when_terminal"
|
||||
"test_binary_suppresses_when_not_terminal_but_pretty"
|
||||
@@ -107,9 +110,16 @@ buildPythonPackage rec {
|
||||
"test_terminal_output_response_charset_detection"
|
||||
"test_terminal_output_request_charset_detection"
|
||||
]
|
||||
++ lib.optionals (pythonAtLeast "3.14") [
|
||||
# https://github.com/httpie/cli/issues/1641
|
||||
"test_lazy_choices_help"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# Test is flaky
|
||||
"test_daemon_runner"
|
||||
# requires network: hit pie.dev (sandbox blocks external)
|
||||
"remote_httpbin"
|
||||
"chunked"
|
||||
"test_saved_session_cookies_on_different_domain"
|
||||
"test_saved_session_cookie_pool"
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pyintesishome";
|
||||
version = "1.8.7";
|
||||
version = "1.8.8";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jnimmo";
|
||||
repo = "pyIntesisHome";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-TwZAuu/mnChZwhZ5uGPiQ23curCiqTKWNgDrvwpgojc=";
|
||||
hash = "sha256-wB4rrguafKEzAVYRTKQQTG4Z48obWrigLHbeGdoNQrQ=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
aiohttp,
|
||||
netifaces,
|
||||
pytest-aio,
|
||||
@@ -13,28 +12,18 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-izone";
|
||||
version = "1.2.9";
|
||||
version = "1.2.10";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Swamp-Ig";
|
||||
repo = "pizone";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-0rj+tKn2pbFe+nczTMGLwIwmc4jCznGGF4/IMjlEvQg=";
|
||||
hash = "sha256-/wErnm3SY5N/Bm1oODQsAVTPAtERcrJqwPt1ipDBuZ0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/Swamp-Ig/pizone/pull/26
|
||||
(fetchpatch {
|
||||
name = "replace-async-timeout-with-asyncio.timeout.patch";
|
||||
url = "https://github.com/Swamp-Ig/pizone/commit/776a7c5682ecd1b75a0b36dea71c914c25476a77.patch";
|
||||
hash = "sha256-Cl71BErInSPtFNbPaV7E/LEDZPMuFNGKA8i5e+C3BMA=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "setuptools_scm[toml] >= 4, <6" "setuptools-scm[toml]" \
|
||||
--replace-fail '"setuptools_scm_git_archive",' ""
|
||||
'';
|
||||
|
||||
|
||||
@@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "recurring-ical-events";
|
||||
version = "3.8.2";
|
||||
version = "3.9.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "niccokunzmann";
|
||||
repo = "python-recurring-ical-events";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-tCtqLT+so4hBvjPB/hFogXzuje1YdGFtq9BmVKKyqoQ=";
|
||||
hash = "sha256-hBZg1u6JtWGC+l1D1M18al6OQ298Z76tkiqYrBQYIzQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "robotframework-seleniumlibrary";
|
||||
version = "6.8.0";
|
||||
version = "6.9.0";
|
||||
pyproject = true;
|
||||
|
||||
# no tests included in PyPI tarball
|
||||
@@ -23,7 +23,7 @@ buildPythonPackage (finalAttrs: {
|
||||
owner = "robotframework";
|
||||
repo = "SeleniumLibrary";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-TyYlcmoV5q3mfV4II/7P/SApfSNd3yC1EFYcuHllcyQ=";
|
||||
hash = "sha256-NiB1dJWivyDc1ucldQ2cs3jTWt3hHY6AGsboKPmY+mo=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -37,14 +37,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "textual";
|
||||
version = "8.2.5";
|
||||
version = "8.2.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Textualize";
|
||||
repo = "textual";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-bQnyTnoG/3Lcrn9cHwNHUYw6piOg8U9bAoPfZW7SDmQ=";
|
||||
hash = "sha256-VSgwa817ovlbKnuJx6KCy3osund8PXZ4Sqlh02TkxGA=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -25,14 +25,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "urllib3-future";
|
||||
version = "2.20.904";
|
||||
version = "2.20.905";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jawah";
|
||||
repo = "urllib3.future";
|
||||
tag = version;
|
||||
hash = "sha256-HcHTZDG4fAP6FlIHwnSQUh2cTCmDN+aN9Iz2wnn3LPg=";
|
||||
hash = "sha256-IA8aVChwAazkK4cqR7S7dDwzvKG6XmrsFgWjRssOrr4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
{
|
||||
callPackage,
|
||||
lib,
|
||||
javaPackages,
|
||||
}:
|
||||
let
|
||||
versions = lib.importJSON ./versions.json;
|
||||
|
||||
latestVersion = lib.last (builtins.sort lib.versionOlder (builtins.attrNames versions));
|
||||
escapeVersion = builtins.replaceStrings [ "." ] [ "-" ];
|
||||
|
||||
getJavaVersion = v: (builtins.getAttr "openjdk${toString v}" javaPackages.compiler).headless;
|
||||
|
||||
packages = lib.mapAttrs' (version: value: {
|
||||
name = "vanilla-${escapeVersion version}";
|
||||
value = callPackage ./derivation.nix {
|
||||
inherit (value) version url sha1;
|
||||
jre_headless = getJavaVersion (
|
||||
if value.javaVersion == null then
|
||||
8
|
||||
else if value.javaVersion == 16 then
|
||||
17
|
||||
else
|
||||
value.javaVersion
|
||||
); # versions <= 1.6 will default to 8
|
||||
};
|
||||
}) versions;
|
||||
in
|
||||
lib.recurseIntoAttrs (
|
||||
packages
|
||||
// {
|
||||
vanilla = builtins.getAttr "vanilla-${escapeVersion latestVersion}" packages;
|
||||
}
|
||||
)
|
||||
@@ -3,7 +3,7 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchurl,
|
||||
SDL2,
|
||||
sdl3,
|
||||
cmake,
|
||||
libpng,
|
||||
libzip,
|
||||
@@ -17,31 +17,36 @@ let
|
||||
sfl-src = fetchFromGitHub {
|
||||
owner = "slavenf";
|
||||
repo = "sfl-library";
|
||||
tag = "2.0.2";
|
||||
hash = "sha256-C8BRl77fryD1aNW6ASD/orb8+hrAKBqmXjr2Z4JqX94=";
|
||||
tag = "2.2.0";
|
||||
hash = "sha256-U1InclhSF3pte2AhKUVYBYOXZagksDMkUWgFn5ZB/tk=";
|
||||
};
|
||||
|
||||
openloco-objects = fetchurl {
|
||||
url = "https://github.com/OpenLoco/OpenGraphics/releases/download/v0.1.5/objects.zip";
|
||||
sha256 = "fe8943fabad8eb07cebab5354589abd7e798a705f7993bb4d9dab2122b4fe96e";
|
||||
url = "https://github.com/OpenLoco/OpenGraphics/releases/download/v0.1.8/objects.zip";
|
||||
sha256 = "sha256-ZYiR2UpGBAt79x39fwG7wd2mRwcSyz3AdIKTH+tQE8c=";
|
||||
};
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openloco";
|
||||
version = "25.11";
|
||||
version = "26.04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenLoco";
|
||||
repo = "OpenLoco";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ohHTa5ow6wiq0GajqLcOwL9mnjocw+Od93SEaxCR2C0=";
|
||||
hash = "sha256-tOvqDJfF6iG05EatUdWGp4wv8UDXdDs1frQ9FMF5myU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# the upstream build process determines the version tag from git; since we
|
||||
# are not using a git checkout, we patch it manually
|
||||
sed -i '/#define OPENLOCO_NAME "OpenLoco"/a#define OPENLOCO_VERSION_TAG "${version}"' src/OpenLoco/src/Version.cpp
|
||||
# the upstream build process determines the version tag, branch
|
||||
# and commit hash from git; since we are not using a git checkout,
|
||||
# we patch it manually
|
||||
sed -i '/#define OPENLOCO_NAME "OpenLoco"/a\
|
||||
#define OPENLOCO_VERSION_TAG "${version}"\
|
||||
#define OPENLOCO_BRANCH "master"\
|
||||
#define OPENLOCO_COMMIT_SHA1_SHORT "b79ace0"'\
|
||||
src/Version/include/OpenLoco/Version.hpp
|
||||
|
||||
# prefetch sfl header sources
|
||||
grep -q 'GIT_TAG \+${sfl-src.tag}' thirdparty/CMakeLists.txt
|
||||
@@ -63,7 +68,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
sdl3
|
||||
libpng
|
||||
libzip
|
||||
openal
|
||||
|
||||
@@ -57,7 +57,6 @@ let
|
||||
# THIRD PARTY
|
||||
inherit
|
||||
cmark
|
||||
gpgme
|
||||
taglib
|
||||
wayland
|
||||
wayland-protocols
|
||||
@@ -85,6 +84,7 @@ let
|
||||
oxygen-icons = self.callPackage ./misc/oxygen-icons { };
|
||||
phonon = self.callPackage ./misc/phonon { };
|
||||
phonon-vlc = self.callPackage ./misc/phonon-vlc { };
|
||||
plasma-pass = self.callPackage ./misc/plasma-pass { };
|
||||
plasma-wayland-protocols = self.callPackage ./misc/plasma-wayland-protocols { };
|
||||
polkit-qt-1 = self.callPackage ./misc/polkit-qt-1 { };
|
||||
pulseaudio-qt = self.callPackage ./misc/pulseaudio-qt { };
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
{
|
||||
lib,
|
||||
mkKdeDerivation,
|
||||
fetchurl,
|
||||
|
||||
oath-toolkit,
|
||||
qgpgme,
|
||||
}:
|
||||
mkKdeDerivation rec {
|
||||
pname = "plasma-pass";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/plasma-pass/plasma-pass-${version}.tar.xz";
|
||||
hash = "sha256-WoiYXcUiyjKH8T7ZiWCak4cZltToxbCkFZTi06L+jyo=";
|
||||
};
|
||||
|
||||
extraBuildInputs = [
|
||||
oath-toolkit
|
||||
qgpgme
|
||||
];
|
||||
|
||||
meta.license = [ lib.licenses.lgpl21Plus ];
|
||||
}
|
||||
@@ -170,6 +170,7 @@ let
|
||||
"plasma-dialer"
|
||||
"plasma-disks"
|
||||
"plasma-firewall"
|
||||
"plasma-pass"
|
||||
"plasma-phonebook"
|
||||
"plasma-remotecontrollers"
|
||||
"plasma-sdk"
|
||||
@@ -611,6 +612,7 @@ mapAliases {
|
||||
dfilemanager = throw "'dfilemanager' has been dropped as it was unmaintained"; # Added 2025-06-03
|
||||
discord-screenaudio = throw "discord-screenaudio has been removed because it was archived upstream. Use vesktop instead."; # added 2025-11-29
|
||||
DisnixWebService = warnAlias "'DisnixWebService' has been renamed to 'disnix-web-service'" disnix-web-service; # Added 2026-01-14
|
||||
djmount = throw "'djmount' has been removed as it is no longer maintained"; # Added 2026-05-19
|
||||
dleyna-connector-dbus = throw "'dleyna-connector-dbus' has been renamed to/replaced by 'dleyna'"; # Converted to throw 2025-10-27
|
||||
dleyna-core = throw "'dleyna-core' has been renamed to/replaced by 'dleyna'"; # Converted to throw 2025-10-27
|
||||
dleyna-renderer = throw "'dleyna-renderer' has been renamed to/replaced by 'dleyna'"; # Converted to throw 2025-10-27
|
||||
@@ -1708,7 +1710,6 @@ mapAliases {
|
||||
plant-it = throw "plant-it backend was discontinued in september 2025"; # Added 2026-01-30
|
||||
plant-it-frontend = throw "plant-it-frontend has been presented as being Android-only since the server-side was discontinued in september 2025"; # Added 2026-01-30
|
||||
plasma-applet-volumewin7mixer = throw "'plasma-applet-volumewin7mixer' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
|
||||
plasma-pass = throw "'plasma-pass' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
|
||||
plasma-theme-switcher = throw "'plasma-theme-switcher' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
|
||||
platformioPackages.platformio-chrootenv = platformio-chrootenv; # Added 2025-09-04
|
||||
platformioPackages.platformio-core = platformio-core; # Added 2025-09-04
|
||||
|
||||
@@ -9117,6 +9117,7 @@ with pkgs;
|
||||
musical-spectrum = callPackage ../applications/audio/deadbeef/plugins/musical-spectrum.nix { };
|
||||
statusnotifier = callPackage ../applications/audio/deadbeef/plugins/statusnotifier.nix { };
|
||||
playlist-manager = callPackage ../applications/audio/deadbeef/plugins/playlist-manager.nix { };
|
||||
vgmstream = callPackage ../applications/audio/deadbeef/plugins/vgmstream.nix { };
|
||||
waveform-seekbar = callPackage ../applications/audio/deadbeef/plugins/waveform-seekbar.nix { };
|
||||
};
|
||||
|
||||
@@ -10918,8 +10919,7 @@ with pkgs;
|
||||
enableServer = true;
|
||||
};
|
||||
|
||||
minecraftServers = import ../games/minecraft-servers { inherit callPackage lib javaPackages; };
|
||||
minecraft-server = minecraftServers.vanilla; # backwards compatibility
|
||||
minecraftServers = callPackage ../by-name/mi/minecraft-server/versions.nix { };
|
||||
|
||||
luanti-client = luanti.override { buildServer = false; };
|
||||
luanti-server = luanti.override { buildClient = false; };
|
||||
|
||||
Reference in New Issue
Block a user