Merge master into staging-nixos
This commit is contained in:
@@ -93,6 +93,11 @@
|
||||
github = "0x120581f";
|
||||
githubId = 130835755;
|
||||
};
|
||||
_0x2B = {
|
||||
name = "0x2B";
|
||||
github = "0x2B-bin";
|
||||
githubId = 49249957;
|
||||
};
|
||||
_0x3f = {
|
||||
name = "0x3f";
|
||||
github = "0x3fiona";
|
||||
@@ -4181,6 +4186,12 @@
|
||||
github = "brittonr";
|
||||
githubId = 4730485;
|
||||
};
|
||||
BrockoliniMorgan = {
|
||||
name = "Brock Morgan";
|
||||
email = "brockjamesmorgan@gmail.com";
|
||||
github = "BrockoliniMorgan";
|
||||
githubId = 166275321;
|
||||
};
|
||||
brodes = {
|
||||
email = "me@brod.es";
|
||||
github = "brhoades";
|
||||
@@ -12301,6 +12312,12 @@
|
||||
githubId = 67414100;
|
||||
name = "Jachym Putta";
|
||||
};
|
||||
jack-avery = {
|
||||
email = "jack.avery.business@gmail.com";
|
||||
github = "jack-avery";
|
||||
githubId = 47289484;
|
||||
name = "Jack Avery";
|
||||
};
|
||||
jackcres = {
|
||||
email = "crespomerchano@gmail.com";
|
||||
github = "omarcresp";
|
||||
@@ -29856,6 +29873,11 @@
|
||||
githubId = 7038383;
|
||||
name = "Vojta Káně";
|
||||
};
|
||||
vokinn = {
|
||||
github = "vokinn";
|
||||
githubId = 113241287;
|
||||
name = "vokin";
|
||||
};
|
||||
volfyd = {
|
||||
email = "lb.nix@lisbethmail.com";
|
||||
github = "volfyd";
|
||||
|
||||
@@ -17,6 +17,7 @@ let
|
||||
notice = 5;
|
||||
info = 6;
|
||||
debug = 7;
|
||||
trace = 8;
|
||||
};
|
||||
|
||||
fsOptions = with lib.types; {
|
||||
|
||||
@@ -14,13 +14,13 @@ let
|
||||
|
||||
pname = "ghostel";
|
||||
|
||||
version = "0.41.0-unstable-2026-07-06";
|
||||
version = "0.44.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dakra";
|
||||
repo = "ghostel";
|
||||
rev = "eb806d158df4ff302aee68e91caf257f11d66320";
|
||||
hash = "sha256-Xz3Sy0iR/g5SoEzqJTZo2ymfMPYQ0NvnAOEoXiXhQFE=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-vRGZoQtjsL42ga07fOfEjccKRidAhqgwHBoKs++62Ls=";
|
||||
};
|
||||
|
||||
module = stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -29,7 +29,7 @@ let
|
||||
deps = zig.fetchDeps {
|
||||
inherit (finalAttrs) src pname version;
|
||||
fetchAll = true;
|
||||
hash = "sha256-lFU0ywNyP1q2NL9MkIfWciH03VAA/Act5dGYAV4V7EY=";
|
||||
hash = "sha256-yrVgiofdmVjTGJ+PGPGRCc8gb/JcEca1uAzIoPgHHqU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ zig ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
|
||||
@@ -69,7 +69,7 @@ melpaBuild {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { extraArgs = [ "--version=branch=main" ]; };
|
||||
updateScript = nix-update-script { };
|
||||
|
||||
inherit module;
|
||||
};
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "gambatte";
|
||||
version = "0-unstable-2026-07-03";
|
||||
version = "0-unstable-2026-07-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "gambatte-libretro";
|
||||
rev = "dfc165599f3f1068c40a0b7ad6fe5f161283d483";
|
||||
hash = "sha256-a7GXw0B/ekIcNl08s1DpuRQZyxm4tYGWzNVVBTjXeOk=";
|
||||
rev = "9b3b5e3cc18ec92f460d37dd551eaf90c55bfcea";
|
||||
hash = "sha256-IBQmVcWx839rRV8uLUou4fdwxgZqVbMWyqRVa3Dq0rc=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "swanstation";
|
||||
version = "0-unstable-2026-06-25";
|
||||
version = "0-unstable-2026-07-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "swanstation";
|
||||
rev = "32e5654cb4ff17db3e950250a677767906fa3cf8";
|
||||
hash = "sha256-l4Vb1kSuoqMJC4gn+S61zuePZaYvJ/nmVyoFOlsCTBM=";
|
||||
rev = "5430a4a53b89fa5827c97b84ada29d23317245bc";
|
||||
hash = "sha256-sE9jJjdt25nz0+B0oSonRubYWurE20o/FDdUTj//qOI=";
|
||||
};
|
||||
|
||||
extraNativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "vba-next";
|
||||
version = "0-unstable-2026-06-29";
|
||||
version = "0-unstable-2026-07-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "vba-next";
|
||||
rev = "91de6188c2544ecb13c7bc05e4d9c361d21a49ad";
|
||||
hash = "sha256-gC5SAw7wHlMxvFFXOSFB5abInAme23140eAm5uyOlNg=";
|
||||
rev = "2b96fd3a77025f3083daf61126b1852d5e0eace7";
|
||||
hash = "sha256-09KSCGlmHNrftX86CVUUAAIHiOpM+MpWwa+XOw3MrJA=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -109,6 +109,20 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
|
||||
# Include gobject-introspection typelibs in the wrapper.
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
|
||||
# TexText probes for a GUI toolkit by spawning a subprocess
|
||||
# (`sys.executable -c "import gi; gi.require_version('Gtk', '3.0'); ..."`)
|
||||
# instead of importing in-process. The Python wrapper makes runtime
|
||||
# dependencies importable via a site.addsitedir preamble and deliberately
|
||||
# does not export PYTHONPATH, so the spawned probe interpreter cannot import
|
||||
# gi and TexText aborts with "Neither GTK nor TkInter has been found".
|
||||
# Export PYTHONPATH so the probe subprocess inherits the dependencies too.
|
||||
# See https://github.com/NixOS/nixpkgs/issues/384042
|
||||
makeWrapperArgs+=(--prefix PYTHONPATH : "${
|
||||
lib.makeSearchPath python3.sitePackages (
|
||||
finalAttrs.propagatedBuildInputs ++ [ python3.pkgs.pycairo ]
|
||||
)
|
||||
}")
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
nodejs,
|
||||
pnpm_9,
|
||||
pnpm_11,
|
||||
fetchPnpmDeps,
|
||||
pnpmConfigHook,
|
||||
makeWrapper,
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "aonsoku";
|
||||
version = "0.14.0";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "victoralvesf";
|
||||
repo = "aonsoku";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Rbte0qYcZQ70E6ib8rj0YsNP5SMNO8eC3MEvWcT7N08=";
|
||||
hash = "sha256-zHYr50FBV7sSdNz6j07SdlMbVaXKj1SnJHmtjmsnBdY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -31,14 +31,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_9;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-oBwqYOx2KEtF0qdMKEIgdArZ4xs/AyeOqFoU4nHl3xY=";
|
||||
pnpm = pnpm_11;
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-YV3ZpXBSX9EEDUfWmk1aNbwGQI+5zNQ3eoXvNg7k0yQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
pnpm_9
|
||||
pnpm_11
|
||||
pnpmConfigHook
|
||||
makeWrapper
|
||||
electron
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
gitUpdater,
|
||||
cmake,
|
||||
arpa2cm,
|
||||
quickder,
|
||||
@@ -14,13 +15,13 @@
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
# leaf is already used
|
||||
pname = "arpa2-leaf";
|
||||
version = "0.2";
|
||||
version = "0.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "arpa2";
|
||||
repo = "leaf";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-s52gtxM+BmG7oVrB5F0ORjkb4F3fWONiOxIWdDn2P5k=";
|
||||
hash = "sha256-I2fJ3QkVFRRk9VVSQd0UKl01NDTYo9UGVhrL/mdy0vE=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
@@ -37,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
lillydap
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
|
||||
|
||||
meta = {
|
||||
description = "LDAP Extended Attribute Filter";
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
python3Packages,
|
||||
# https://github.com/balta2ar/brotab/issues/138
|
||||
python313Packages,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
python313Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "brotab";
|
||||
version = "1.5.0";
|
||||
pyproject = true;
|
||||
@@ -16,11 +17,11 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
hash = "sha256-Pv5tEDL11brc/n3TuFcad9kTr7Jb/Bt7JFb29HuX/28=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
build-system = with python313Packages; [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
dependencies = with python313Packages; [
|
||||
flask
|
||||
psutil
|
||||
requests
|
||||
@@ -50,7 +51,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
nativeCheckInputs = with python313Packages; [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
|
||||
@@ -34,6 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
maintainers = with lib.maintainers; [
|
||||
baloo
|
||||
matthiasbeyer
|
||||
sshine
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -12,23 +12,25 @@
|
||||
pkg-config,
|
||||
glib,
|
||||
libadwaita,
|
||||
libxml2,
|
||||
vte-gtk4,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "distroshelf";
|
||||
version = "1.0.15";
|
||||
version = "1.4.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ranfdev";
|
||||
repo = "DistroShelf";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-4rNdp0g/QaiLnKGC4baYAq29dxluyZ+9TgeBlqidRp0=";
|
||||
hash = "sha256-3O+KsOZzwH8E2rDSEgiVZK64B2wK1U/uDJ2z37NtJCg=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-5luI46rSgB+N0OKQzSopEhCCEnwAhMabRit9MtsSSVA=";
|
||||
hash = "sha256-lNKWcpdIr1tm2m50B9uOqFQvhndAEM5ADmmPBPb8sj4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -40,11 +42,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
rustc
|
||||
desktop-file-utils
|
||||
pkg-config
|
||||
libxml2
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
libadwaita
|
||||
vte-gtk4
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "dn42-registry-wizard";
|
||||
version = "0.4.20";
|
||||
version = "0.4.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kioubit";
|
||||
repo = "dn42_registry_wizard";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-WFU1K0Ib1ETSib2WJkwus3zHYJXoVOtFDqv4/QNiP7E=";
|
||||
hash = "sha256-PvB+rlIaedjCVA/8sDW754vvomVASIDhkUQlimZGiRg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-o8MF6uqk8f0Zc2fjBqLGElh56TKjLRRtNxrll5nY+bM=";
|
||||
cargoHash = "sha256-tSxxsRQCbbP6iRT8sNfA/JVLm72PsSSCsC80hD5ZVxw=";
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/{registry_wizard,dn42-registry-wizard}
|
||||
|
||||
@@ -35,7 +35,7 @@ in
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "pangolin";
|
||||
version = "1.19.4";
|
||||
version = "1.21.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
enableParallelBuilding = true;
|
||||
@@ -44,11 +44,11 @@ buildNpmPackage (finalAttrs: {
|
||||
owner = "fosrl";
|
||||
repo = "pangolin";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Joo7N92ZbKybD15ojIIoEtjLjzcho5PqAzuGlj17zag=";
|
||||
hash = "sha256-LR4UO2xrTLKmemDVsJWtEQoV2bDy6U2ahxTtA+SDymI=";
|
||||
};
|
||||
|
||||
npmDepsFetcherVersion = 2;
|
||||
npmDepsHash = "sha256-XOuP3WgV9Xt2uRhHVmnjjf46RV+Pv1pl8a71yTizn10=";
|
||||
npmDepsHash = "sha256-EBectG1zNdUb30SlhAzy9rCwF/mYHAV4HZTRbk2CbDY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
esbuild
|
||||
|
||||
@@ -51,6 +51,7 @@ let
|
||||
scipy
|
||||
shiboken6
|
||||
vtk
|
||||
networkx # for sheetmetal plugin
|
||||
];
|
||||
|
||||
freecad-utils = callPackage ./freecad-utils.nix { inherit (python3Packages) python; };
|
||||
|
||||
@@ -79,8 +79,8 @@
|
||||
xz,
|
||||
zlib,
|
||||
zstd,
|
||||
buildPackages,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gdal" + lib.optionalString useMinimalFeatures "-minimal";
|
||||
version = "3.13.1";
|
||||
@@ -132,6 +132,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# This is not strictly needed as the Java bindings wouldn't build anyway if
|
||||
# ant/jdk were not available.
|
||||
"-DBUILD_JAVA_BINDINGS=OFF"
|
||||
]
|
||||
++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
|
||||
"-DCMAKE_CROSSCOMPILING_EMULATOR=${stdenv.hostPlatform.emulator buildPackages}"
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gitte";
|
||||
version = "0.8.1";
|
||||
version = "0.9.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -30,12 +30,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "ckruse";
|
||||
repo = "Gitte";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-c7GhPn7/0PzRTYQbhfvlSUMJqHs4dRqeWRMBJG2eqdc=";
|
||||
hash = "sha256-k10Rqpf9fhcG+PU6WGr7Q2nVwZb0tLp2B2r3BNeicoI=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-yR4MYQJQMjqEs++8RhQwDV+h/blSVgFqrGYUfrPUGOg=";
|
||||
hash = "sha256-eK8o/psq0eHwUlbfD0I/TwIqoA40Ay0eJ9CtZypZCi4=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
let
|
||||
pname = "hunk";
|
||||
version = "0.17.0";
|
||||
version = "0.17.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "modem-dev";
|
||||
repo = "hunk";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-FlwCtcu2JRECyKC1balItY/DmQyb+obh+97wo7+06DU=";
|
||||
hash = "sha256-Sm/JPTjKw6zbXmBqiXt9wogTR0C24wxVzK3G9Ms7h9Y=";
|
||||
};
|
||||
|
||||
node_modules = stdenv.mkDerivation {
|
||||
@@ -56,7 +56,7 @@ let
|
||||
|
||||
dontFixup = true;
|
||||
|
||||
outputHash = "sha256-LkOAWScuNPx9/KOcG110ngLz0QmB4/S3VxIAb3EIH7I=";
|
||||
outputHash = "sha256-m1XHfN5wnIoEFBnNMAUPErgL56KzKPMWmUJuz6T0vts=";
|
||||
outputHashMode = "recursive";
|
||||
};
|
||||
in
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
{
|
||||
lib,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "jwtcat";
|
||||
version = "0-unstable-2022-10-15";
|
||||
pyproject = false;
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aress31";
|
||||
repo = "jwtcat";
|
||||
rev = "f80f3d9352b82f0e7da504b2ee11f4a61f23c385";
|
||||
hash = "sha256-pk0/Lzw4yUIXfLBX/0Xwaecio42MjLYUzECQ8xaH3vY=";
|
||||
};
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
pyjwt
|
||||
coloredlogs
|
||||
tqdm
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 jwtcat.py $out/bin/jwtcat
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "CPU-based JSON Web Token cracker and scanner";
|
||||
homepage = "https://github.com/aress31/jwtcat";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ _0x2B ];
|
||||
mainProgram = "jwtcat";
|
||||
};
|
||||
}
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
# native deps.
|
||||
runCommand,
|
||||
pkg-config,
|
||||
@@ -36,11 +35,11 @@ let
|
||||
|
||||
unwrapped = stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "knot-resolver_5";
|
||||
version = "5.7.6";
|
||||
version = "5.7.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://secure.nic.cz/files/knot-resolver/knot-resolver-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "500ccd3a560300e547b8dc5aaff322f7c8e2e7d6f0d7ef5f36e59cb60504d674";
|
||||
sha256 = "481d2a6eb8690023895d389601e56fffbaeba3cc18cc1de5a5f177df9d0f9530";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
@@ -48,15 +47,6 @@ let
|
||||
"dev"
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# https://gitlab.nic.cz/knot/knot-resolver/-/merge_requests/1772
|
||||
url = "https://gitlab.nic.cz/knot/knot-resolver/-/commit/f4eaf8e69cc9839f68b613d0be10103e05c57fe9.patch";
|
||||
hash = "sha256-u/YQ85Jb5OxV8G3HeVPQUw0cmA+TLIDPze9mreqJGL4=";
|
||||
excludes = [ "daemon/ratelimiting.test/tests.inc.c" ];
|
||||
})
|
||||
];
|
||||
|
||||
# Path fixups for the NixOS service.
|
||||
postPatch = ''
|
||||
patch meson.build <<EOF
|
||||
|
||||
@@ -36,11 +36,11 @@ let
|
||||
# TODO: we could cut the `let` short here, but it would de-indent everything.
|
||||
unwrapped = stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "knot-resolver_6";
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://secure.nic.cz/files/knot-resolver/knot-resolver-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-T0v+CfjXOw7n1nDdHJD18qwOkGD5sUeDVfJvJzdGrIA=";
|
||||
hash = "sha256-GqTClyHAm86amfPVZXIjEQNj1ms1ytSYm5Wyr9qTeag=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -38,13 +38,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "monero-cli";
|
||||
version = "0.18.5.0";
|
||||
version = "0.18.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "monero-project";
|
||||
repo = "monero";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-clw+7mZenWp58iA7fuEp4BPFH3KUwL53cC4IChIVh7w=";
|
||||
hash = "sha256-RxuhR+GH4Y5kSzNxsqJklRWMbq1K82K3A2V+6JqYR98=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -27,13 +27,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "monero-gui";
|
||||
version = "0.18.5.0";
|
||||
version = "0.18.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "monero-project";
|
||||
repo = "monero-gui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-uBZMBQ6Co1+H8DsyeL1vbjtVlKyIkJopKxHxr24BZv0=";
|
||||
hash = "sha256-2FlenQtrsoHmRTfU+KhWtg3eVPzz9ktQ3dnOlWhOPC8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -49,7 +49,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mumps";
|
||||
version = "5.9.0";
|
||||
version = "5.9.1";
|
||||
# makeFlags contain space and one should use makeFlagsArray+
|
||||
# Setting this magic var is an optional solution
|
||||
__structuredAttrs = true;
|
||||
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://mumps-solver.org/MUMPS_${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-6dytNY5IbuPcOOnCPdE08hNPS09eNrJeoNdJXhLnB5I=";
|
||||
hash = "sha256-DHuOlExYaksyW9UU23ddz8Jbit7nIkMRaHsBmBE+Py8=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
|
||||
@@ -49,13 +49,13 @@ let
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "nezha";
|
||||
version = "2.2.10";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nezhahq";
|
||||
repo = "nezha";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-eAJj+R3tSaZNa7aSfwLg8fS9grbGJRoBUBXdQpncqdI=";
|
||||
hash = "sha256-wlGDNsh67pAuPPgae56bXrtDsgwuviLxiaZ6CrOi3go=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
@@ -95,7 +95,7 @@ buildGoModule (finalAttrs: {
|
||||
GOROOT=''${GOROOT-$(go env GOROOT)} swag init --pd -d cmd/dashboard -g main.go -o cmd/dashboard/docs
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-rYzkaJqk5r31Uagn1FRFDeICUeK392o1fyP6IBk9zgk=";
|
||||
vendorHash = "sha256-U2rZVluYM+XcI8e9TBXAlb9sKz4IL+FMEj1CTDcH6qM=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "offpunk";
|
||||
version = "3.1";
|
||||
version = "3.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~lioploum";
|
||||
repo = "offpunk";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-RwigItHVNsgq6k3O8YrSMFBaZMJwJSzB6dfnNiYsefY=";
|
||||
hash = "sha256-1S8iftZ34NkhTydnr8RJBWzAMu/uk0MGi14PANWv/lM=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [ hatchling ];
|
||||
|
||||
@@ -41,13 +41,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "peergos";
|
||||
version = "1.29.0";
|
||||
version = "1.30.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Peergos";
|
||||
repo = "web-ui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WaTWz55pEfE/ncJnyc8FjkxJhsBYBXt7cFjBz8v0hw8=";
|
||||
hash = "sha256-lxxOPS/G+dNcdr0pnF/5KHLb/isrL759YT3tRAOn7Yw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
openssl,
|
||||
dbus,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "pesde";
|
||||
version = "0.7.3";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pesde-pkg";
|
||||
repo = "pesde";
|
||||
rev = "e57b4c2db9eaf295c8af998212f427ea039ed46e";
|
||||
hash = "sha256-+8SneWw3UQwXg1IV1zn0OM1ySAJpcvMqyoQd7eYAarE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-1k7bmH4ocF9JK15C7YonCmwDKVh639Nropuzm62roDA=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
openssl
|
||||
dbus
|
||||
];
|
||||
buildFeatures = [ "bin" ];
|
||||
|
||||
meta = {
|
||||
description = "Package manager for the Luau programming language, supporting multiple runtimes including Roblox and Lune.";
|
||||
homepage = "https://github.com/pesde-pkg/pesde";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ vokinn ];
|
||||
mainProgram = "pesde";
|
||||
};
|
||||
}
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
gitUpdater,
|
||||
pkg-config,
|
||||
cmake,
|
||||
arpa2cm,
|
||||
@@ -12,18 +13,17 @@
|
||||
libkrb5,
|
||||
libev,
|
||||
e2fsprogs,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "quick-sasl";
|
||||
version = "0.13.2";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "arpa2";
|
||||
repo = "quick-sasl";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-kMKZRromm/hb9PZwvWAzmJorSqTB8xMIbWASfSjajiQ=";
|
||||
hash = "sha256-RVk44Ioaennw088HFxdAMU744aqw3ii8v8cJqjlVmno=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
e2fsprogs
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
|
||||
|
||||
meta = {
|
||||
description = "Gentle wrapper around any SASL implementation";
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
python3,
|
||||
cmake,
|
||||
doxygen,
|
||||
gitUpdater,
|
||||
graphviz,
|
||||
quickmem,
|
||||
arpa2common,
|
||||
@@ -35,13 +36,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "quickder";
|
||||
version = "1.7.1";
|
||||
version = "1.7.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "arpa2";
|
||||
repo = "quick-der";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-f+ph5PL+uWRkswpOLDwZFWjh938wxoJ6xocJZ2WZLEk=";
|
||||
hash = "sha256-IxoE9h+ISExNys2egvjSEb3phkrf4ices7k5oYgOL4A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -67,15 +68,19 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace 'pyparsing==' 'pyparsing>='
|
||||
substituteInPlace setup.py --replace-fail 'pyparsing==' 'pyparsing>='
|
||||
rm python/__init__.py
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
|
||||
|
||||
meta = {
|
||||
description = "Quick (and Easy) DER, a Library for parsing ASN.1";
|
||||
homepage = "https://gitlab.com/arpa2/quick-der/";
|
||||
license = lib.licenses.bsd2;
|
||||
platforms = lib.platforms.linux;
|
||||
teams = with lib.teams; [ ngi ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
fetchFromGitLab,
|
||||
cmake,
|
||||
doxygen,
|
||||
gitUpdater,
|
||||
graphviz,
|
||||
arpa2common,
|
||||
arpa2cm,
|
||||
@@ -11,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "quickmem";
|
||||
version = "0.3.0";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "arpa2";
|
||||
repo = "Quick-MEM";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-cqg8QN4/I+zql7lVDDAgFA05Dmg4ylBTvPSPP7WATdc=";
|
||||
hash = "sha256-I6WTBzY275a82YM+qsH9k2Zbb8SqAIF3qboxv9o3f4Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -33,11 +34,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
|
||||
|
||||
meta = {
|
||||
description = "Memory pooling for ARPA2 projects";
|
||||
homepage = "https://gitlab.com/arpa2/Quick-MEM/";
|
||||
license = lib.licenses.bsd2;
|
||||
platforms = lib.platforms.linux;
|
||||
teams = with lib.teams; [ ngi ];
|
||||
maintainers = with lib.maintainers; [ leungbk ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "randomX";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "tevador";
|
||||
repo = "randomX";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-dfImzwbEfJQcaPZCoWypHiI6dishVRdqS/r+n3tfjvM=";
|
||||
sha256 = "sha256-15hRPPEo48SL09gYpGtdpXqsVlOTQuMRn4AoXQJWEMI=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -4,15 +4,17 @@
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
pkgsStatic,
|
||||
rc,
|
||||
byacc,
|
||||
ed,
|
||||
ncurses,
|
||||
readline,
|
||||
editline,
|
||||
installShellFiles,
|
||||
historySupport ? true,
|
||||
readlineSupport ? true,
|
||||
lineEditingLibrary ?
|
||||
if (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isStatic) then "null" else "readline",
|
||||
editlineSupport ? false,
|
||||
lineEditingLibrary ? if stdenv.hostPlatform.isDarwin then "null" else "readline",
|
||||
}:
|
||||
|
||||
assert lib.elem lineEditingLibrary [
|
||||
@@ -25,10 +27,10 @@ assert lib.elem lineEditingLibrary [
|
||||
assert
|
||||
!(lib.elem lineEditingLibrary [
|
||||
"edit"
|
||||
"editline"
|
||||
"vrl"
|
||||
]); # broken
|
||||
assert (lineEditingLibrary == "readline") -> readlineSupport;
|
||||
assert (lineEditingLibrary == "editline") -> editlineSupport;
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rc";
|
||||
version = "unstable-2025-10-01";
|
||||
@@ -61,9 +63,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildInputs = [
|
||||
ncurses
|
||||
]
|
||||
++ lib.optionals readlineSupport [
|
||||
readline
|
||||
];
|
||||
++ lib.optional readlineSupport readline
|
||||
++ lib.optional editlineSupport editline;
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -73,7 +74,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"MANPREFIX=${placeholder "man"}/share/man"
|
||||
"CPPFLAGS=\"-DSIGCLD=SIGCHLD\""
|
||||
"EDIT=${lineEditingLibrary}"
|
||||
];
|
||||
]
|
||||
# Required to fix static build, harmless for dynamic builds.
|
||||
++ lib.optional (lineEditingLibrary == "readline") "LDLIBS=-lncurses";
|
||||
|
||||
buildFlags = [
|
||||
"all"
|
||||
@@ -88,7 +91,21 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
passthru = {
|
||||
shellPath = "/bin/rc";
|
||||
tests.static = pkgsStatic.rc;
|
||||
tests = {
|
||||
static = pkgsStatic.rc;
|
||||
readline = lib.optionalDrvAttr (!stdenv.hostPlatform.isDarwin) (
|
||||
rc.override {
|
||||
readlineSupport = true;
|
||||
lineEditingLibrary = "readline";
|
||||
}
|
||||
);
|
||||
editline = lib.optionalDrvAttr (!stdenv.hostPlatform.isDarwin) (
|
||||
rc.override {
|
||||
editlineSupport = true;
|
||||
lineEditingLibrary = "editline";
|
||||
}
|
||||
);
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -14,13 +14,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "skills";
|
||||
version = "1.5.16";
|
||||
version = "1.5.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vercel-labs";
|
||||
repo = "skills";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-gL8uNkS3gsRGXIunIsYLYykLYs2c1gO9PFVTE69nWKU=";
|
||||
hash = "sha256-lxf2ODxgwin83JHRrDynMccTFtCo+tYFb053XrS1IqA=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sqlite-vec";
|
||||
version = "0.1.6";
|
||||
version = "0.1.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "asg017";
|
||||
repo = "sqlite-vec";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-CgeSoRoQRMb/V+RzU5NQuIk/3OonYjAfolWD2hqNuXU=";
|
||||
hash = "sha256-bM0IYcI84PSKBVHKlY+j+dK6bnqO9UPHJixgb/1+Cow=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gettext ];
|
||||
|
||||
@@ -51,7 +51,7 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "stalwart" + (lib.optionalString stalwartEnterprise "-enterprise");
|
||||
version = "0.16.13";
|
||||
version = "0.16.14";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -59,10 +59,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "stalwartlabs";
|
||||
repo = "stalwart";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Uc1dUuu4TnpTKB17GArlo/hYT2gdUUnl3NxWalSB50k=";
|
||||
hash = "sha256-FggCbIgn/7ncbuE02miIfwJh3Adaj0xcTTaOyYRHeQY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-C+BwUqeYzutGcX13YgR1ngfUtuk+S12/k/xAYz68b3s=";
|
||||
cargoHash = "sha256-pdwXJ5/Ko+UloTYHEkXOcyw5gVuHmyAAHDfWoTFZ8FY=";
|
||||
|
||||
env = {
|
||||
# https://docs.rs/openssl/latest/openssl/#manual
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
diffutils,
|
||||
writeScriptBin,
|
||||
bzip2,
|
||||
runtimeShellPackage,
|
||||
}:
|
||||
|
||||
# quick usage:
|
||||
@@ -22,18 +23,29 @@
|
||||
|
||||
let
|
||||
dummyMount = writeScriptBin "mount" "#!${stdenv.shell}";
|
||||
|
||||
perl' = perl.withPackages (p: [ p.DBFile ]);
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
version = "3.5.2";
|
||||
pname = "storebackup";
|
||||
|
||||
pname = "store-backup";
|
||||
|
||||
__structuredAttrs = true;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ perl ];
|
||||
nativeInstallCheckInputs = [
|
||||
diffutils
|
||||
perl'
|
||||
];
|
||||
buildInputs = [
|
||||
perl'
|
||||
which
|
||||
bzip2
|
||||
runtimeShellPackage
|
||||
];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://savannah/storebackup/storeBackup-${finalAttrs.version}.tar.bz2";
|
||||
@@ -46,15 +58,20 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/scripts
|
||||
mv * $out
|
||||
mv $out/_ATTENTION_ $out/doc
|
||||
mv $out/{correct.sh,cron-storebackup} $out/scripts
|
||||
|
||||
find $out -name "*.pl" | xargs sed -i \
|
||||
-e 's@/bin/pwd@${coreutils}/bin/pwd@' \
|
||||
-e 's@/bin/sync@${coreutils}/bin/sync@' \
|
||||
-e '1 s@/usr/bin/env perl@${perl.withPackages (p: [ p.DBFile ])}/bin/perl@'
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
find $out -name "*.pl" -print0 | xargs --null sed -i \
|
||||
-e 's@/bin/pwd@${coreutils}/bin/pwd@g' \
|
||||
-e 's@/bin/sync@${coreutils}/bin/sync@g'
|
||||
|
||||
for p in $out/bin/*
|
||||
do wrapProgram "$p" --prefix PATH ":" "${
|
||||
@@ -64,8 +81,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
]
|
||||
}"
|
||||
done
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
|
||||
patchShebangs $out
|
||||
# do a dummy test ensuring this works
|
||||
|
||||
PATH=$PATH:${dummyMount}/bin
|
||||
@@ -85,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
$out/bin/storeBackup.pl --sourceDir "$source" --backupDir backup
|
||||
latestBackup=backup/default/$(ls -1 backup/default | sort | tail -n 1)
|
||||
$out/bin/storeBackupRecover.pl -b "$latestBackup" -t restored -r /
|
||||
${diffutils}/bin/diff -r "$source" restored
|
||||
diff -r "$source" restored
|
||||
|
||||
# storeBackupCheckSource should return 0
|
||||
$out/bin/storeBackupCheckSource.pl -s "$source" -b "$latestBackup"
|
||||
@@ -99,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
rm -fr restored
|
||||
}
|
||||
|
||||
testDir=$TMP/testDir
|
||||
testDir=$HOME/testDir
|
||||
|
||||
mkdir $testDir
|
||||
echo X > $testDir/X
|
||||
@@ -121,6 +142,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
backupRestore 'test 3: backup, restore' $out
|
||||
backupRestore 'test 4: backup diffutils to same backup locations, restore' ${diffutils}
|
||||
}
|
||||
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
meta = {
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "stremio-linux-shell";
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
@@ -35,10 +35,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "Stremio";
|
||||
repo = "stremio-linux-shell";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-jo+9KDX/a46jPTmYhiFNgp5fDKhoAsML/+m7u3ituEQ=";
|
||||
hash = "sha256-8WJB4t4Fq5WEV1nxKRpnfFwUSiXExsyXRZkvnfsq11k=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-hZ9neZD+aB7bth4UTsWJXIKGSbo/c3wZRtfOIp7LvwY=";
|
||||
cargoHash = "sha256-zg0ExdzoujcRT1SLKACxekYXH52L8dufOvMM085jcNw=";
|
||||
|
||||
patches = [
|
||||
./out-path.patch
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "vault-ssh-plus";
|
||||
version = "0.7.9";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "isometry";
|
||||
repo = "vault-ssh-plus";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-soz4xXVLyR479d+qcLuHq06CZ5afy+jqyIEZblyRlC0=";
|
||||
hash = "sha256-6XJHtsvQinOr45fuLQeWtH41zK1S9HX35CTUgn1sEHU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-eHhs+6sPKkAdMWzh51ICfuejxwqEGeTNSI3P0X4BFSY=";
|
||||
vendorHash = "sha256-GBledtKjPSUOFRtriPykTN2Bo2c/DMexMmu73z+dz/Q=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "wakatime-cli";
|
||||
version = "2.15.0";
|
||||
version = "2.22.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wakatime";
|
||||
repo = "wakatime-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-jEQ9c0dejAEAgIyUeJ/PSsAFDUkNPsaU0FW3AVDmL7g=";
|
||||
hash = "sha256-9OeWTjWoda8Hbiaej+UuNSvWtgEEK2MKy3PUqguyZ0U=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xrIvtUfOFOgcKJ+2VgUgOzF2Cwp3NPBf39yXgAHN/cQ=";
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "wasm-component-ld";
|
||||
version = "0.5.26";
|
||||
version = "0.5.27";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -14,10 +14,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "bytecodealliance";
|
||||
repo = "wasm-component-ld";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-4hKHChIxVpTo18sfeUd8GzjQeb2ONAGeg4I7vKTAhSI=";
|
||||
hash = "sha256-AXMJRKWFcd9tcyxKasRY/k/WT4K/3FlY9nJ6M/jv6VI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-IQe4TLWbjlB/h7K5qH5ANxoqG8A2D3RF+UVDj4u6qFQ=";
|
||||
cargoHash = "sha256-yFNxNV/rS+P2PtX2ktWdBl2S9Z0/gsZv77wkgWErgic=";
|
||||
|
||||
# Tests require a rustc that can target wasm32-wasip1, including std. This is awkward for
|
||||
# Nixpkgs to provide at the same time as providing a rustc that's targetting the actual target.
|
||||
|
||||
@@ -5,12 +5,12 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.22.0";
|
||||
version = "2.23.0";
|
||||
pname = "wowup-cf";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/WowUp/WowUp.CF/releases/download/v${version}/WowUp-CF-${version}.AppImage";
|
||||
hash = "sha256-X5gDnj4YBZRBwJEeb8sVMNoGmWUI9iVdWOmsA20bWig=";
|
||||
hash = "sha256-596j+i2TTbzpGfdWwzzoQKpB6AD2rqT0hvF4nvbD32A=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType1 { inherit pname version src; };
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wxmaxima";
|
||||
version = "26.07.0";
|
||||
version = "26.07.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wxMaxima-developers";
|
||||
repo = "wxmaxima";
|
||||
rev = "Version-${finalAttrs.version}";
|
||||
hash = "sha256-rrXYSW3PU4CvtmBH0dU/sBwe1sVel9IkI89HTj0YEqc=";
|
||||
hash = "sha256-pSo6I2U8yOf083/fNYQzPJtTexnQGt0rRsoMcBl67Ik=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
fetchurl,
|
||||
fetchDebianPatch,
|
||||
pkg-config,
|
||||
bashNonInteractive,
|
||||
curl,
|
||||
libxml2,
|
||||
}:
|
||||
@@ -12,6 +13,9 @@ stdenv.mkDerivation rec {
|
||||
pname = "xmlrpc-c";
|
||||
version = "1.60.05";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/xmlrpc-c/xmlrpc-c-${version}.tgz";
|
||||
hash = "sha256-Z9hgBiRZ6ieEwHtNeRMxnZU5+nKfU0N46OQciRjyrfY=";
|
||||
@@ -31,6 +35,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
bashNonInteractive
|
||||
pkg-config
|
||||
];
|
||||
|
||||
@@ -43,12 +48,24 @@ stdenv.mkDerivation rec {
|
||||
"--enable-libxml2-backend"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
export PATH="${
|
||||
lib.makeBinPath [
|
||||
(lib.getDev curl)
|
||||
(lib.getDev libxml2)
|
||||
]
|
||||
}:$PATH"
|
||||
'';
|
||||
|
||||
# Build and install the "xmlrpc" tool (like the Debian package)
|
||||
postInstall = ''
|
||||
(cd tools/xmlrpc && make && make install)
|
||||
patchShebangs --build $out/bin/xmlrpc-c-config
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
# parallel make sometimes fails with:
|
||||
# ln: failed to create symbolic link 'libxmlrpc_util.so.4': File exists
|
||||
enableParallelBuilding = false;
|
||||
|
||||
# ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration";
|
||||
@@ -56,6 +73,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "Lightweight RPC library based on XML and HTTP";
|
||||
homepage = "https://xmlrpc-c.sourceforge.net/";
|
||||
changelog = "https://xmlrpc-c.sourceforge.io/change.html";
|
||||
# <xmlrpc-c>/doc/COPYING also lists "ABYSS Web Server License" and "Python 1.5.2 License"
|
||||
license = lib.licenses.bsd3;
|
||||
platforms = lib.platforms.unix;
|
||||
|
||||
@@ -15,16 +15,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zeroclaw";
|
||||
version = "0.8.2";
|
||||
version = "0.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zeroclaw-labs";
|
||||
repo = "zeroclaw";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-mTH7DRaCHmYw3m9DguceP+nGGMYff7vsoIe3J0XNb/Q=";
|
||||
hash = "sha256-H1512vayE35bLxlFpWExT6u/z3rMKsrv6gs5un9IPaA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-6tLLt8cblYABOTli1LrrWbyTOJYGmmewHJgTxBAhJlE=";
|
||||
cargoHash = "sha256-zLj2ItDp8tbldBvFNxlrcoqcE0J5Ce19NDlV+lCu/BY=";
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit (finalAttrs) src;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"hash": "sha256-Szed0lCe3parouN7VjBrKY7FcocyIuA4umuDqurbM4Y=",
|
||||
"hash": "sha256-0cmzR5KZY6q+ZhoF90HkiIqHJsEdMeLOt4bmV8ID5so=",
|
||||
"owner": "openjdk",
|
||||
"repo": "jdk17u",
|
||||
"rev": "refs/tags/jdk-17.0.20+2"
|
||||
"rev": "refs/tags/jdk-17.0.20+8"
|
||||
}
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
bip32,
|
||||
coincurve,
|
||||
typing-extensions,
|
||||
hidapi,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
@@ -29,6 +30,7 @@ buildPythonPackage (finalAttrs: {
|
||||
bip32
|
||||
coincurve
|
||||
typing-extensions
|
||||
hidapi
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "ledger_bitcoin" ];
|
||||
|
||||
@@ -5,26 +5,30 @@
|
||||
gitUpdater,
|
||||
pytestCheckHook,
|
||||
fonttools,
|
||||
hatch-vcs,
|
||||
hatchling,
|
||||
biplist,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "opentype-feature-freezer";
|
||||
version = "1.0.1";
|
||||
version = "1.32.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "twardoch";
|
||||
repo = "fonttools-opentype-feature-freezer";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-8aJYQyUpcEOyzVHZ0LXfGJ1Tsxe5HICcfkFUdsI+/GI=";
|
||||
hash = "sha256-uwU9lsTK6XlKwar46DLTzjwtD/zQDJnC+Kq/sVNCNE0=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
hatch-vcs
|
||||
hatchling
|
||||
];
|
||||
|
||||
env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
dependencies = [ fonttools ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
@@ -41,15 +45,6 @@ buildPythonPackage rec {
|
||||
"app/OTFeatureFreezer.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# File not found
|
||||
"test_freeze"
|
||||
# AssertionError: assert '' == '# Scripts an...m,pnum,tnum\n'
|
||||
"test_report"
|
||||
# assert False
|
||||
"test_warn_substituting_glyphs_without_unicode"
|
||||
];
|
||||
|
||||
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "rcon";
|
||||
version = "2.4.9";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-1BqDEdwTNS2jUWP0ajzBPrIPXN4Sl7dbVudkXvdtCkg=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/conqp/rcon/releases/tag/v${finalAttrs.version}";
|
||||
description = "Python RCON client library";
|
||||
homepage = "https://pypi.org/project/rcon/";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ jack-avery ];
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,33 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
poetry-core,
|
||||
}:
|
||||
buildPythonPackage (finalAttrs: {
|
||||
name = "runtype";
|
||||
version = "0.5.3";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "erezsh";
|
||||
repo = "runtype";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-HGYQsunqewuxmdj9kaRZDZxUOf6hRqBySCq4bdxQ3v4=";
|
||||
};
|
||||
|
||||
pyproject = true;
|
||||
build-system = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "runtype" ];
|
||||
|
||||
meta = {
|
||||
description = "Utilities for run-time type validation and multiple dispatch";
|
||||
homepage = "https://github.com/erezsh/runtype";
|
||||
maintainers = with lib.maintainers; [ BrockoliniMorgan ];
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
})
|
||||
@@ -8,12 +8,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sabctools";
|
||||
version = "9.6.1";
|
||||
version = "9.6.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-7hiLzmhaB5btSw5OVWcGpWAvsnKKamybRvwDQMrdigM=";
|
||||
hash = "sha256-yxbU4pkYiKAcSEC6VOoVc48iWTzfdPJHkXt48SgAyBo=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -39,14 +39,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "uiprotect";
|
||||
version = "15.12.2";
|
||||
version = "15.14.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uilibs";
|
||||
repo = "uiprotect";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-YyIzDl0qSCoXs7k3lda3/q89gtXf2Do7EgXeTSmunoo=";
|
||||
hash = "sha256-9OhlCehyCscJR5MjZPyQEVDas4z1608Ph9ktktfeJbQ=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -8,12 +8,12 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.17.1";
|
||||
version = "0.18.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "elbywan";
|
||||
repo = "crystalline";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-SIfInDY6KhEwEPZckgobOrpKXBDDd0KhQt/IjdGBhWo=";
|
||||
hash = "sha256-Z5qVm1ovhMUccS9KSp8i7UowxxgEr9OvnJRYREaNmnM=";
|
||||
};
|
||||
in
|
||||
crystal.buildCrystalPackage {
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildFishPlugin {
|
||||
pname = "bass";
|
||||
version = "1.0-unstable-2021-02-18";
|
||||
version = "1.0-unstable-2023-12-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "edc";
|
||||
repo = "bass";
|
||||
rev = "2fd3d2157d5271ca3575b13daec975ca4c10577a";
|
||||
sha256 = "0mb01y1d0g8ilsr5m8a71j6xmqlyhf8w4xjf00wkk8k41cz3ypky";
|
||||
rev = "79b62958ecf4e87334f24d6743e5766475bcf4d0";
|
||||
hash = "sha256-3d/qL+hovNA4VMWZ0n1L+dSM1lcz7P5CQJyy+/8exTc=";
|
||||
};
|
||||
|
||||
#buildFishplugin will only move the .fish files, but bass also relies on python
|
||||
|
||||
@@ -2178,6 +2178,7 @@ mapAliases {
|
||||
steamPackages.steam-fhsenv = throw "'steamPackages.steam-fhsenv' has been renamed to/replaced by 'steam'"; # Converted to throw 2025-10-27
|
||||
steamPackages.steam-fhsenv-small = throw "'steamPackages.steam-fhsenv-small' has been renamed to/replaced by 'steam'"; # Converted to throw 2025-10-27
|
||||
steamPackages.steamcmd = throw "'steamPackages.steamcmd' has been renamed to/replaced by 'steamcmd'"; # Converted to throw 2025-10-27
|
||||
storeBackup = storebackup; # Added 2026-07-05
|
||||
StormLib = throw "'StormLib' has been renamed to/replaced by 'stormlib'"; # Converted to throw 2025-10-27
|
||||
strawberry-qt5 = throw "strawberry-qt5 has been replaced by strawberry"; # Converted to throw 2025-07-19
|
||||
strawberry-qt6 = throw "strawberry-qt6 has been replaced by strawberry"; # Added 2025-07-19
|
||||
|
||||
@@ -17414,6 +17414,8 @@ self: super: with self; {
|
||||
|
||||
rclone-python = callPackage ../development/python-modules/rclone-python { };
|
||||
|
||||
rcon = callPackage ../development/python-modules/rcon { };
|
||||
|
||||
rcssmin = callPackage ../development/python-modules/rcssmin { };
|
||||
|
||||
rctclient = callPackage ../development/python-modules/rctclient { };
|
||||
@@ -18014,6 +18016,8 @@ self: super: with self; {
|
||||
|
||||
runstats = callPackage ../development/python-modules/runstats { };
|
||||
|
||||
runtype = callPackage ../development/python-modules/runtype { };
|
||||
|
||||
russound = callPackage ../development/python-modules/russound { };
|
||||
|
||||
rustworkx = callPackage ../development/python-modules/rustworkx { };
|
||||
|
||||
Reference in New Issue
Block a user