Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2026-01-23 06:07:00 +00:00
committed by GitHub
58 changed files with 233 additions and 303 deletions
+1 -1
View File
@@ -504,7 +504,7 @@ pkgs/development/interpreters/elixir/ @NixOS/beam
pkgs/development/interpreters/lfe/ @NixOS/beam
# Authelia
pkgs/servers/authelia/ @06kellyjac @dit7ya @nicomem
pkgs/by-name/au/authelia/ @06kellyjac @dit7ya @nicomem
# OctoDNS
pkgs/by-name/oc/octodns/ @anthonyroussel
+2
View File
@@ -72,6 +72,8 @@
- `forgejo` has been updated to major version 14. For more information, see the [release blog post](https://forgejo.org/2026-01-release-v14-0/) and [full release notes](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/release-notes-published/14.0.0.md)
- `lima` has been updated from `1.x` to `2.x`. This major update includes several breaking changes, such as `/tmp/lima` no longer being mounted by default.
- `n8n` has been updated to version 2. You can find the breaking changes here: https://docs.n8n.io/2-0-breaking-changes/.
- `gurk-rs` has been updated from `0.6.4` to `0.8.0`. Version `0.8.0` includes breaking changes. For more information read the [release notes for 0.8.0](https://github.com/boxdot/gurk-rs/releases/tag/v0.8.0).
@@ -15,6 +15,7 @@ let
in
runCommand "${alsa-lib.pname}-${alsa-lib.version}"
{
inherit (alsa-lib) pname version;
meta = {
description = "Wrapper to ease access to ALSA plugins";
mainProgram = "aserver";
+2 -2
View File
@@ -17,10 +17,10 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "archipelago";
version = "0.6.5";
version = "0.6.6";
src = fetchurl {
url = "https://github.com/ArchipelagoMW/Archipelago/releases/download/${finalAttrs.version}/Archipelago_${finalAttrs.version}_linux-x86_64.AppImage";
hash = "sha256-06EFpnMMz+yqqHDuUDw9AMBd0a0Ay7oVkzD4mna7XeM=";
hash = "sha256-mJ0bPBBou3BRqEW5QierjD0ohDBQ9J0jnoV4TCf9XOM=";
};
dontUnpack = true;
@@ -16,8 +16,7 @@
optipng,
imagemagick,
withCrashReporter ? !stdenv.hostPlatform.isDarwin,
qtbase ? null,
wrapQtAppsHook ? null,
qt5,
curl ? null,
gdb ? null,
}:
@@ -49,7 +48,7 @@ stdenv.mkDerivation rec {
imagemagick
optipng
]
++ optionals withCrashReporter [ wrapQtAppsHook ];
++ optionals withCrashReporter [ qt5.wrapQtAppsHook ];
buildInputs = [
zlib
@@ -62,7 +61,7 @@ stdenv.mkDerivation rec {
libepoxy
]
++ optionals withCrashReporter [
qtbase
qt5.qtbase
curl
]
++ optionals stdenv.hostPlatform.isLinux [ gdb ];
@@ -6,7 +6,7 @@
pnpmConfigHook,
pnpm,
fetchFromGitHub,
buildGoModule,
buildGo124Module,
installShellFiles,
callPackage,
nixosTests,
@@ -22,6 +22,8 @@
}:
let
buildGoModule = buildGo124Module;
inherit (import ./sources.nix { inherit fetchFromGitHub; })
pname
version
+1 -1
View File
@@ -13,7 +13,7 @@
installShellFiles,
}:
stdenv.mkDerivation (finalAttrs: {
name = "autotier";
pname = "autotier";
version = "1.2.0";
src = fetchFromGitHub {
owner = "45Drives";
+1 -1
View File
@@ -7,7 +7,7 @@
}:
runCommand "calamares-wrapped"
{
inherit (calamares) version meta;
inherit (calamares) pname version meta;
nativeBuildInputs = [ makeWrapper ];
}
@@ -1,17 +1,14 @@
{
lib,
qt5,
fetchFromGitHub,
mkDerivation,
cmake,
protobuf,
qtbase,
qtmultimedia,
qttools,
qtwebsockets,
wrapQtAppsHook,
protobuf_21,
}:
mkDerivation rec {
let
protobuf = protobuf_21;
in
qt5.mkDerivation rec {
pname = "cockatrice";
version = "2025-04-03-Release-2.10.2";
@@ -22,17 +19,17 @@ mkDerivation rec {
sha256 = "sha256-zXAK830SdGT3xN3ST8h9LLy/oWr4MH6TZf57gLfI0e8=";
};
buildInputs = [
qtbase
qtmultimedia
protobuf
qttools
qtwebsockets
];
nativeBuildInputs = [
cmake
wrapQtAppsHook
qt5.wrapQtAppsHook
];
buildInputs = [
qt5.qtbase
qt5.qtmultimedia
protobuf
qt5.qttools
qt5.qtwebsockets
];
meta = {
@@ -13,7 +13,7 @@
yarn,
python3,
esbuild,
nodejs,
nodejs_20,
node-gyp,
libsecret,
xorg,
@@ -27,7 +27,7 @@
let
system = stdenv.hostPlatform.system;
python = python3;
nodejs = nodejs_20;
yarn' = yarn.override { inherit nodejs; };
defaultYarnOpts = [ ];
@@ -126,7 +126,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
nodejs
yarn'
python
python3
pkg-config
makeWrapper
git
@@ -5,9 +5,12 @@
libX11,
zlib,
xorgproto,
libGL ? null,
libGLU ? null,
libglut ? null,
withLibGL ? !stdenv.hostPlatform.isDarwin,
libGL,
withLibGLU ? !stdenv.hostPlatform.isDarwin,
libGLU,
withLibglut ? !stdenv.hostPlatform.isDarwin,
libglut,
}:
stdenv.mkDerivation rec {
@@ -24,9 +27,9 @@ stdenv.mkDerivation rec {
zlib
xorgproto
]
++ lib.optional (libGL != null) libGL
++ lib.optional (libGLU != null) libGLU
++ lib.optional (libglut != null) libglut;
++ lib.optional withLibGL libGL
++ lib.optional withLibGLU libGLU
++ lib.optional withLibglut libglut;
preConfigure = ''
substituteInPlace src/Makefile.in \
@@ -38,5 +41,6 @@ stdenv.mkDerivation rec {
mainProgram = "construo.x11";
homepage = "http://fs.fsf.org/construo/";
license = lib.licenses.gpl3;
priority = 10;
};
}
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
withSDL ? false,
ncurses,
SDL,
}:
@@ -19,10 +20,10 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
ncurses
SDL
(if withSDL then SDL else null)
];
makeFlags = (lib.optionals (SDL != null) [ "SDL=yes" ]) ++ [
makeFlags = (lib.optional withSDL "SDL=yes") ++ [
"PREFIX=$(out)"
# force platform's cc on darwin, otherwise gcc is used
"CC=${stdenv.cc.targetPrefix}cc"
@@ -32,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Fast-paced action strategy game";
homepage = "https://a-nikolaev.github.io/curseofwar/";
license = lib.licenses.gpl3;
mainProgram = if SDL != null then "curseofwar-sdl" else "curseofwar";
mainProgram = if withSDL then "curseofwar-sdl" else "curseofwar";
maintainers = with lib.maintainers; [ fgaz ];
platforms = lib.platforms.all;
};
@@ -2,11 +2,9 @@
stdenv,
lib,
fetchurl,
wrapQtAppsHook,
qt5,
dpkg,
autoPatchelfHook,
qtserialport,
qtwebsockets,
openssl,
libredirect,
makeWrapper,
@@ -28,12 +26,12 @@ stdenv.mkDerivation rec {
dpkg
autoPatchelfHook
makeWrapper
wrapQtAppsHook
qt5.wrapQtAppsHook
];
buildInputs = [
qtserialport
qtwebsockets
qt5.qtserialport
qt5.qtwebsockets
openssl
];
@@ -5,12 +5,14 @@
autoreconfHook,
pkg-config,
munge,
lua,
lua5_1,
libcap,
perl,
ncurses,
}:
let
lua = lua5_1;
in
stdenv.mkDerivation rec {
pname = "diod";
version = "1.1.0";
@@ -24,13 +24,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "edmarketconnector";
version = "6.0.2";
version = "6.1.0";
src = fetchFromGitHub {
owner = "EDCD";
repo = "EDMarketConnector";
tag = "Release/${finalAttrs.version}";
hash = "sha256-/Te7PTM/t+uN5v1DDa7zgQsVcy4CDMRSxvPqt1OwcW4=";
hash = "sha256-MBbm6537HEYKql42//EzEy1Iwi6W3rX/4hFYrRVaAbw=";
};
nativeBuildInputs = [ makeWrapper ];
+2 -2
View File
@@ -140,7 +140,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "ejabberd";
version = "25.10";
version = "26.01";
nativeBuildInputs = [
makeWrapper
@@ -170,7 +170,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "processone";
repo = "ejabberd";
tag = finalAttrs.version;
hash = "sha256-dTu3feSOakSHdk+hMDvYQwog64O3e/z5NOsGM3Rq7WY=";
hash = "sha256-xhqH1hELosYC7dtHnyrlkCRlbgbM2SU7SLkowGVG9SI=";
};
passthru.tests = {
+15 -15
View File
@@ -54,11 +54,11 @@ let
};
xmpp = builder {
name = "xmpp";
version = "1.11.2";
version = "1.12.0";
src = fetchHex {
pkg = "xmpp";
version = "1.11.2";
sha256 = "sha256-u2gWROFePvwACKs6cXlE1nz2EaS340Q4KqY2dEe9UtI=";
version = "1.12.0";
sha256 = "sha256-AUuuc2WfuiVncesAe8U0hhiscn3R0QuasVqf74cWIsg=";
};
beamDeps = [
ezlib
@@ -124,11 +124,11 @@ let
};
p1_pgsql = builder {
name = "p1_pgsql";
version = "1.1.36";
version = "1.1.38";
src = fetchHex {
pkg = "p1_pgsql";
version = "1.1.36";
sha256 = "sha256-gryouJXIT0YA641gmjLLX91yp/W9k437KReeCMZD/Qk=";
version = "1.1.38";
sha256 = "";
};
beamDeps = [ xmpp ];
};
@@ -144,21 +144,21 @@ let
};
p1_mysql = builder {
name = "p1_mysql";
version = "1.0.26";
version = "1.0.27";
src = fetchHex {
pkg = "p1_mysql";
version = "1.0.26";
sha256 = "sha256-6hOAg/LFRxm5z1Sdv1gCooiwAZ6j5USbNUx0zAP6/ew=";
version = "1.0.27";
sha256 = "";
};
beamDeps = [ ];
};
p1_acme = builder {
name = "p1_acme";
version = "1.0.29";
version = "1.0.30";
src = fetchHex {
pkg = "p1_acme";
version = "1.0.29";
sha256 = "sha256-CP049/vi3CiiN6obOLMGtzRVaVzIiBo93WoRt8Ufe8c=";
version = "1.0.30";
sha256 = "sha256-KTXiCRa4BtOxFmlTpNkKaQ/YB4EJYUD+XKH2XVnr1oo=";
};
beamDeps = [
base64url
@@ -190,11 +190,11 @@ let
};
jose = builder {
name = "jose";
version = "1.11.10";
version = "1.11.12";
src = fetchHex {
pkg = "jose";
version = "1.11.10";
sha256 = "sha256-DWzTb/i6F02ykUj8EStYQhhraKkM6fwrPsOv52WT5hQ=";
version = "1.11.12";
sha256 = "sha256-MekrZT6SELaWdlzdiFQ3RX3hrdKpAR2S+M9j5GQbq3s=";
};
beamDeps = [ ];
};
@@ -2,8 +2,7 @@
lib,
stdenv,
fetchFromGitLab,
gcc-arm-embedded,
binutils-arm-embedded,
pkgsCross,
makeWrapper,
python3Packages,
@@ -26,8 +25,8 @@ stdenv.mkDerivation (finalAttrs: {
};
nativeBuildInputs = [
gcc-arm-embedded
binutils-arm-embedded
pkgsCross.arm-embedded.buildPackages.gcc
pkgsCross.arm-embedded.buildPackages.binutils
makeWrapper
];
@@ -10,7 +10,7 @@
texinfo,
fetchpatch,
pkgsStatic,
withNcurses ? true,
withNcurses ? false,
ncurses,
}:
@@ -1,17 +1,14 @@
{
stdenv,
lib,
fetchFromGitHub,
hockeypuck,
nixosTests,
}:
let
sources = (import ./sources.nix) { inherit fetchFromGitHub; };
in
stdenv.mkDerivation {
pname = "${sources.pname}-web";
pname = "hockeypuck-web";
inherit (sources) version src;
inherit (hockeypuck) version src;
dontBuild = true; # We should just copy the web templates
@@ -5,11 +5,16 @@
nixosTests,
}:
let
sources = (import ./sources.nix) { inherit fetchFromGitHub; };
in
buildGoModule {
inherit (sources) pname version src;
buildGoModule (finalAttrs: {
pname = "hockeypuck";
version = "2.1.0";
src = fetchFromGitHub {
owner = "hockeypuck";
repo = "hockeypuck";
rev = finalAttrs.version;
sha256 = "0da3ffbqck0dr7d89gy2yillp7g9a4ziyjlvrm8vgkkg2fs8dlb1";
};
modRoot = "src/hockeypuck/";
vendorHash = null;
@@ -23,4 +28,4 @@ buildGoModule {
license = lib.licenses.agpl3Plus;
maintainers = [ ];
};
}
})
@@ -20,14 +20,14 @@ let
in
stdenv.mkDerivation rec {
pname = "incus-ui-canonical";
version = "0.19.0";
version = "0.19.1";
src = fetchFromGitHub {
owner = "zabbly";
repo = "incus-ui-canonical";
# only use tags prefixed by incus- they are the tested fork versions
tag = "incus-${version}";
hash = "sha256-d9L/6GtSBqa/H+KgK0iheNvS2BFazNWKGA94Lv99kr8=";
hash = "sha256-S/X/knSin3DRfpFGl4uvYtVJrozrBfiN8cfFH/RO10U=";
};
offlineCache = fetchYarnDeps {
+19 -17
View File
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (8.1.1)
activesupport (8.1.2)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -15,19 +15,19 @@ GEM
tzinfo (~> 2.0, >= 2.0.5)
uri (>= 0.13.1)
base64 (0.3.0)
bcrypt_pbkdf (1.1.1)
bcrypt_pbkdf (1.1.1-arm64-darwin)
bcrypt_pbkdf (1.1.1-x86_64-darwin)
bigdecimal (3.3.1)
concurrent-ruby (1.3.5)
connection_pool (2.5.4)
dotenv (3.1.8)
bcrypt_pbkdf (1.1.2)
bcrypt_pbkdf (1.1.2-arm64-darwin)
bcrypt_pbkdf (1.1.2-x86_64-darwin)
bigdecimal (4.0.1)
concurrent-ruby (1.3.6)
connection_pool (3.0.2)
dotenv (3.2.0)
drb (2.2.3)
ed25519 (1.4.0)
i18n (1.14.7)
i18n (1.14.8)
concurrent-ruby (~> 1.0)
json (2.15.2)
kamal (2.8.2)
json (2.18.0)
kamal (2.10.1)
activesupport (>= 7.0)
base64 (~> 0.2)
bcrypt_pbkdf (~> 1.0)
@@ -39,26 +39,28 @@ GEM
thor (~> 1.3)
zeitwerk (>= 2.6.18, < 3.0)
logger (1.7.0)
minitest (5.26.0)
minitest (6.0.1)
prism (~> 1.5)
net-scp (4.1.0)
net-ssh (>= 2.6.5, < 8.0.0)
net-sftp (4.0.0)
net-ssh (>= 5.0.0, < 8.0.0)
net-ssh (7.3.0)
ostruct (0.6.3)
prism (1.7.0)
securerandom (0.4.1)
sshkit (1.24.0)
sshkit (1.25.0)
base64
logger
net-scp (>= 1.1.2)
net-sftp (>= 2.1.2)
net-ssh (>= 2.8.0)
ostruct
thor (1.4.0)
thor (1.5.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uri (1.1.0)
zeitwerk (2.7.3)
uri (1.1.1)
zeitwerk (2.7.4)
PLATFORMS
arm64-darwin
@@ -69,4 +71,4 @@ DEPENDENCIES
kamal
BUNDLED WITH
2.6.9
2.7.2
+39 -28
View File
@@ -18,10 +18,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0rzadiafj8llldqry9jjnzbw2rgavdlrqy0nddg8p2qcim7574jy";
sha256 = "1bpxnr83z1x78h3jxvmga7vrmzmc8b4fic49h9jhzm6hriw2b148";
type = "gem";
};
version = "8.1.1";
version = "8.1.2";
};
base64 = {
groups = [ "default" ];
@@ -38,50 +38,50 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "04rb3rp9bdxn1y3qiflfpj7ccwb8ghrfbydh5vfz1l9px3fpg41g";
sha256 = "1xjcp484qc4j4z42b087npgj50sd6yixchznp4z9p1k6rqilqhf2";
type = "gem";
};
version = "1.1.1";
version = "1.1.2";
};
bigdecimal = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0612spks81fvpv2zrrv3371lbs6mwd7w6g5zafglyk75ici1x87a";
sha256 = "19y406nx17arzsbc515mjmr6k5p59afprspa1k423yd9cp8d61wb";
type = "gem";
};
version = "3.3.1";
version = "4.0.1";
};
concurrent-ruby = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1";
sha256 = "1aymcakhzl83k77g2f2krz07bg1cbafbcd2ghvwr4lky3rz86mkb";
type = "gem";
};
version = "1.3.5";
version = "1.3.6";
};
connection_pool = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "02p7l47gvchbvnbag6kb4x2hg8n28r25ybslyvrr2q214wir5qg9";
sha256 = "02ifws3c4x7b54fv17sm4cca18d2pfw1saxpdji2lbd1f6xgbzrk";
type = "gem";
};
version = "2.5.4";
version = "3.0.2";
};
dotenv = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1hwjsddv666wpp42bip3fqx7c5qq6s8lwf74dj71yn7d1h37c4cy";
sha256 = "17b1zr9kih0i3wb7h4yq9i8vi6hjfq07857j437a8z7a44qvhxg3";
type = "gem";
};
version = "3.1.8";
version = "3.2.0";
};
drb = {
groups = [ "default" ];
@@ -109,20 +109,20 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "03sx3ahz1v5kbqjwxj48msw3maplpp2iyzs22l4jrzrqh4zmgfnf";
sha256 = "1994i044vdmzzkyr76g8rpl1fq1532wf0sb21xg5r1ilj5iphmr8";
type = "gem";
};
version = "1.14.7";
version = "1.14.8";
};
json = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "09zss44bw5sx8c619qy1ci611r1h5nfd1biyjnpxrl6jcvcy2s0h";
sha256 = "01fmiz052cvnxgdnhb3qwcy88xbv7l3liz0fkvs5qgqqwjp0c1di";
type = "gem";
};
version = "2.15.2";
version = "2.18.0";
};
kamal = {
dependencies = [
@@ -141,10 +141,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1j22m04xhrpbqlqaf658x401b3qj96ml7ai719xypj45pskdg4si";
sha256 = "0h335ginqk2q1pbm59aq6ackby2rq38sqypwxld3pn1xqfsfrdsk";
type = "gem";
};
version = "2.8.2";
version = "2.10.1";
};
logger = {
groups = [ "default" ];
@@ -157,14 +157,15 @@
version = "1.7.0";
};
minitest = {
dependencies = [ "prism" ];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0c1c9lr7h0bnf48xj5sylg2cs2awrb0hfxwimiz4yfl6kz87m0gm";
sha256 = "1fslin1vyh60snwygx8jnaj4kwhk83f3m0v2j2b7bsg2917wfm3q";
type = "gem";
};
version = "5.26.0";
version = "6.0.1";
};
net-scp = {
dependencies = [ "net-ssh" ];
@@ -208,6 +209,16 @@
};
version = "0.6.3";
};
prism = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "00silqnlzzm97gn21lm39q95hjn058waqky44j25r67p9drjy1hh";
type = "gem";
};
version = "1.7.0";
};
securerandom = {
groups = [ "default" ];
platforms = [ ];
@@ -231,20 +242,20 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0v4fc9yaqljwax370438p3ps59jpimvkkj1d5xsfk2kphkww35wm";
sha256 = "0i37z4gk3r1752bv1sj4rdja1dhivn2xa1kk4wfizyb0vcy59in8";
type = "gem";
};
version = "1.24.0";
version = "1.25.0";
};
thor = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0gcarlmpfbmqnjvwfz44gdjhcmm634di7plcx2zdgwdhrhifhqw7";
sha256 = "0wsy88vg2mazl039392hqrcwvs5nb9kq8jhhrrclir2px1gybag3";
type = "gem";
};
version = "1.4.0";
version = "1.5.0";
};
tzinfo = {
dependencies = [ "concurrent-ruby" ];
@@ -262,19 +273,19 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "09g6p7r8kl6ybhgm7xnpq1kcirw8z0bza5ihrjify979q5hj0fp2";
sha256 = "1ijpbj7mdrq7rhpq2kb51yykhrs2s54wfs6sm9z3icgz4y6sb7rp";
type = "gem";
};
version = "1.1.0";
version = "1.1.1";
};
zeitwerk = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "119ypabas886gd0n9kiid3q41w76gz60s8qmiak6pljpkd56ps5j";
sha256 = "12zcvhzfnlghzw03czy2ifdlyfpq0kcbqcmxqakfkbxxavrr1vrb";
type = "gem";
};
version = "2.7.3";
version = "2.7.4";
};
}
+1 -1
View File
@@ -5,7 +5,7 @@
lib,
}:
stdenv.mkDerivation (finalAttrs: {
name = "lib45d";
pname = "lib45d";
version = "0.3.6";
src = fetchFromGitHub {
owner = "45Drives";
+1 -1
View File
@@ -5,7 +5,7 @@
unstableGitUpdater,
}:
stdenv.mkDerivation (finalAttrs: {
name = "csa";
pname = "csa";
version = "1.26-unstable-2024-03-22";
src = fetchFromGitHub {
-6
View File
@@ -4,7 +4,6 @@
buildGoModule,
callPackage,
installShellFiles,
procps,
qemu,
darwin,
makeWrapper,
@@ -41,11 +40,6 @@ buildGoModule (finalAttrs: {
substituteInPlace Makefile \
--replace-fail 'codesign -f -v --entitlements vz.entitlements -s -' 'codesign -f --entitlements vz.entitlements -s -' \
--replace-fail 'rm -rf _output vendor' 'rm -rf _output'
''
# fixed upstream, remove when version >=2.0.0
+ lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
substituteInPlace pkg/networks/usernet/recoincile.go \
--replace-fail '/usr/bin/pkill' '${lib.getExe' procps "pkill"}'
'';
# It attaches entitlements with codesign and strip removes those,
+3 -3
View File
@@ -3,7 +3,7 @@
}:
let
version = "1.2.2";
version = "2.0.3";
in
{
inherit version;
@@ -12,8 +12,8 @@ in
owner = "lima-vm";
repo = "lima";
tag = "v${version}";
hash = "sha256-bIYF/bsOMuWTkjD6fe6by220/WQGL+VWEBXmUzyXU98=";
hash = "sha256-NoHNmJ6z7eZTzjl8ps3wFY2e68FcoBsu5ZhE0NXt95g=";
};
vendorHash = "sha256-8S5tAL7GY7dxNdyC+WOrOZ+GfTKTSX84sG8WcSec2Os=";
vendorHash = "sha256-SeLYVQI+ZIbR9qVaNyF89VUvXdfv1M5iM+Cbas6e2E0=";
}
+2 -2
View File
@@ -53,11 +53,11 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "mysql-workbench";
version = "8.0.45";
version = "8.0.46";
src = fetchurl {
url = "https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-${finalAttrs.version}-src.tar.gz";
hash = "sha256-00sswmBIBtNmxMrJBDqzOhPLErXuXGs634JRHML/aKE=";
hash = "sha256-sP7GYSagPpcBhmdCynvQsxJexe54Bgu6RI7apCSb9TE=";
};
patches = [
+2 -2
View File
@@ -30,11 +30,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "netatalk";
version = "4.4.0";
version = "4.4.1";
src = fetchurl {
url = "mirror://sourceforge/netatalk/netatalk/netatalk-${finalAttrs.version}.tar.xz";
hash = "sha256-GMoy3Gwl57o1KFlLeEN58BOIj6mED/xHjNH+9VUTglw=";
hash = "sha256-j8qwvzs5zYqU/j7nqCZMYABRWjrzd9o0FmlmCasTMW0=";
};
nativeBuildInputs = [
+7 -4
View File
@@ -7,26 +7,29 @@
}:
rustPlatform.buildRustPackage {
pname = "nufmt";
version = "0-unstable-2025-06-19";
version = "0-unstable-2025-12-29";
src = fetchFromGitHub {
owner = "nushell";
repo = "nufmt";
rev = "35962223fbd4c1a924b4ccfb8c7ad81fe2863b86";
hash = "sha256-2WgqKQBZRMqUyWq0qm+d8TUT/iAQ1LZjhllBKqimp+Q=";
rev = "c03e166babe7b77f1a80a7916ab1e8e2437bba06";
hash = "sha256-VZiRmo9/jxAFCSr2bHrf89qb6o1Obwt2+O3NrIrokZo=";
};
nativeBuildInputs = [
rustPlatform.bindgenHook
];
cargoHash = "sha256-KDXC2/1GcJL6qH+L/FzzQCA7kJigtKOfxVDLv5qXYao=";
cargoHash = "sha256-BpKhgF3LUQRL1mNCR5Iq4/Q+eRaOf+JgQCuUfloRhzk=";
# NOTE: Patch follows similar intention upstream https://github.com/nushell/nufmt/commit/35962223fbd4c1a924b4ccfb8c7ad81fe2863b86
postPatch = ''
substituteInPlace tests/main.rs --replace-fail \
'const TEST_BINARY: &str = "target/debug/nufmt";' \
'const TEST_BINARY: &str = "target/${stdenv.hostPlatform.rust.rustcTarget}/release/nufmt";'
substituteInPlace tests/ground_truth.rs --replace-fail \
'const TEST_BINARY: &str = "target/debug/nufmt";' \
'const TEST_BINARY: &str = "target/${stdenv.hostPlatform.rust.rustcTarget}/release/nufmt";'
'';
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
@@ -2,7 +2,6 @@
fetchFromGitHub,
openttd,
zstd,
...
}:
openttd.overrideAttrs (oldAttrs: rec {
@@ -8,6 +8,7 @@
SDL2,
libpng,
zlib,
zlib' ? zlib.override { static = true; },
xz,
freetype,
fontconfig,
@@ -87,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
SDL2
libpng
xz
zlib
zlib'
freetype
fontconfig
curl
@@ -1,6 +1,6 @@
{
lib,
stdenv,
gccStdenv,
fetchFromGitHub,
gitUpdater,
cmake,
@@ -15,7 +15,11 @@
pcre,
makeWrapper,
}:
let
# Builds with Clang, but hits an assertion failure unless GCC is used
# https://github.com/OpenXRay/xray-16/issues/1224
stdenv = gccStdenv;
in
stdenv.mkDerivation (finalAttrs: {
pname = "openxray";
version = "2921-january-2025-rc1";
@@ -1,22 +1,15 @@
{
lib,
mkDerivation,
qt5,
appstream,
fetchFromGitHub,
cmake,
gettext,
libxslt,
librsvg,
itstool,
qtbase,
qtquickcontrols2,
qtsvg,
qttools,
qtwebview,
docbook_xsl,
}:
mkDerivation rec {
qt5.mkDerivation rec {
version = "20.0";
pname = "pentobi";
@@ -30,14 +23,14 @@ mkDerivation rec {
nativeBuildInputs = [
cmake
docbook_xsl
qttools
qt5.qttools
];
buildInputs = [
appstream
qtbase
qtsvg
qtquickcontrols2
qtwebview
qt5.qtbase
qt5.qtsvg
qt5.qtquickcontrols2
qt5.qtwebview
itstool
librsvg
];
@@ -1,10 +1,8 @@
{
lib,
mkDerivation,
qt5,
fetchFromGitHub,
fetchpatch,
qmake,
qtbase,
SDL,
SDL_mixer,
boost181,
@@ -12,18 +10,18 @@
gsasl,
libgcrypt,
libircclient,
protobuf,
protobuf_21,
sqlite,
wrapQtAppsHook,
tinyxml,
target ? "client",
}:
let
boost = boost181;
protobuf = protobuf_21;
in
mkDerivation rec {
qt5.mkDerivation rec {
pname = "pokerth-${target}";
version = "1.1.2";
@@ -62,8 +60,8 @@ mkDerivation rec {
'';
nativeBuildInputs = [
qmake
wrapQtAppsHook
qt5.qmake
qt5.wrapQtAppsHook
];
buildInputs = [
@@ -75,7 +73,7 @@ mkDerivation rec {
libgcrypt
libircclient
protobuf
qtbase
qt5.qtbase
sqlite
tinyxml
];
+3 -3
View File
@@ -5,11 +5,11 @@
}:
appimageTools.wrapType2 rec {
pname = "railway-wallet";
version = "5.22.4";
version = "5.24.13";
src = fetchurl {
url = "https://github.com/Railway-Wallet/Railway-Wallet/releases/download/v${version}/Railway-v${version}-linux-x86_64.AppImage";
hash = "sha256-ikVDbUQOAx1626qtmzObu5Uzppz/PZPTPB4/LWoWZmI=";
url = "https://github.com/Railway-Wallet/Railway-Wallet/releases/download/v${version}/Railway.linux.x86_64.AppImage";
hash = "sha256-e1itj0wxlX2WqyDynxBeLi06bzxwz2/cR9RuOfCLxF8=";
};
meta = {
+4 -4
View File
@@ -36,13 +36,13 @@ lib.checkListOfEnum "raylib: platform"
__structuredAttrs = true;
pname = "raylib";
version = "5.5";
version = "5.5-unstable-2026-01-20";
src = fetchFromGitHub {
owner = "raysan5";
repo = "raylib";
rev = finalAttrs.version;
hash = "sha256-J99i4z4JF7d6mJNuJIB0rHNDhXJ5AEkG0eBvvuBLHrY=";
rev = "c610d228a244f930ad53492604640f39584c66da";
hash = "sha256-7Lhgqb7QJwz94M1ZxWgueTwIgSVclGCvHklZXGzoJgQ=";
};
# autoPatchelfHook is needed for appendRunpaths
@@ -83,7 +83,7 @@ lib.checkListOfEnum "raylib: platform"
maintainers = [ lib.maintainers.diniamo ];
teams = [ lib.teams.ngi ];
platforms = lib.platforms.all;
changelog = "https://github.com/raysan5/raylib/blob/${finalAttrs.version}/CHANGELOG";
changelog = "https://github.com/raysan5/raylib/blob/${finalAttrs.src.rev}/CHANGELOG";
};
})
)
+3 -3
View File
@@ -26,14 +26,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "s7";
version = "11.7-unstable-2026-01-15";
version = "11.7-unstable-2026-01-22";
src = fetchFromGitLab {
domain = "cm-gitlab.stanford.edu";
owner = "bil";
repo = "s7";
rev = "6a37e688266eb5bcea0959b297b352fcaa75976c";
hash = "sha256-rTocm8AADnDoeMas4/cwQBv7LTMUgo2+SvNwR3oWNXA=";
rev = "583c1eeb8e154b4c87f095a146cfde91b0c7570c";
hash = "sha256-+rgYv8D4w/xK/UgZzO+YZU1VgaaDR9fXcz0bheygrt0=";
};
buildInputs =
+3 -3
View File
@@ -7,11 +7,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "shen-sbcl";
version = "39.2";
version = "40";
src = fetchzip {
url = "https://www.shenlanguage.org/Download/S${finalAttrs.version}.zip";
hash = "sha256-V6op0G4aEdKifP6L0ho6cy1FPNax+0aE5ltWxT7Xniw=";
hash = "sha256-Ldz4NV+1Hf7FCDis+oeDt8mNuMe37jpaBMJlQ1XQaa0=";
};
nativeBuildInputs = [ sbcl ];
@@ -40,7 +40,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
# remove interactive prompt during image creation
substituteInPlace install.lsp \
--replace-fail '(Y-OR-N-P "Load Shen Library? ")' '${
--replace-fail '(Y-OR-N-P "Load Shen Standard Library? ")' '${
if installStandardLibrary then "T" else "NIL"
}'
'';
+1 -1
View File
@@ -10,7 +10,7 @@
# with older documents/templates/etc.
stdenvNoCC.mkDerivation rec {
name = "source-sans-pro-${version}";
pname = "source-sans-pro";
version = "3.006";
src = fetchzip {
+3 -3
View File
@@ -10,16 +10,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "surrealdb";
version = "2.4.1";
version = "2.5.0";
src = fetchFromGitHub {
owner = "surrealdb";
repo = "surrealdb";
tag = "v${finalAttrs.version}";
hash = "sha256-woItGD998p8EWerkrWESqGON0HQp7Vrbl/kiQi+IT7g=";
hash = "sha256-SDzj/viDcuGbJ8HM0/KXBOjpc5vnreobTx0U3eNeKo8=";
};
cargoHash = "sha256-RbmhhJ+bJcCM8h2mkc2dK2Xlm+izESXwvbNvxuVC7vg=";
cargoHash = "sha256-alxRXeeeIxi9lb5sIOU15nCD6A/B3ba5iouOTKRTe+w=";
# error: linker `aarch64-linux-gnu-gcc` not found
postPatch = ''
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "watchlog";
version = "1.250.0";
version = "1.252.0";
src = fetchFromGitLab {
owner = "kevincox";
repo = "watchlog";
rev = "v${version}";
hash = "sha256-a8x1fEYuHZu2Z/CE835HEqkNr7Mtbdtuq1vDRKfEl5U=";
hash = "sha256-ZDT98pxtpoEenJPwz4Ws2kkTqJ0lTWvxv3LfjBsCvZo=";
};
cargoHash = "sha256-b+xuMUt9btrfKLUluxtSFXdFKtOHmKVV0m1fPM5cNRA=";
cargoHash = "sha256-n1Pzuyf9EKHgvHqVlOO6bZNcD4KMHSh3jN9REtLulck=";
meta = {
description = "Easier monitoring of live logs";
+2 -2
View File
@@ -13,7 +13,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "zapret";
version = "72.8";
version = "72.9";
src = fetchFromGitHub {
owner = "bol-van";
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
tag = "v${finalAttrs.version}";
hash = "sha256-W0rDCSdlBvcgXf/plYkJPORmZ+7t0qmQr4+Y17WLUp8=";
hash = "sha256-w2HpEoEAhdk1tOS8IM3K56FqpMW2VgqB+iwISCNB7n4=";
};
buildInputs = [
@@ -21,14 +21,14 @@
testers,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "apprise";
version = "1.9.6";
version = "1.9.7";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-Qga+nLVpSj0I3Y4Dk7u5s2ISrDp3acJjNiAFXnXGyu8=";
inherit (finalAttrs) pname version;
hash = "sha256-L3PMHgJk+xGf25t83oLo/eQKD1MayIXYxvDPD24TrsI=";
};
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
@@ -68,16 +68,16 @@ buildPythonPackage rec {
passthru = {
tests.version = testers.testVersion {
package = apprise;
version = "v${version}";
version = "v${finalAttrs.version}";
};
};
meta = {
description = "Push Notifications that work with just about every platform";
homepage = "https://github.com/caronc/apprise";
changelog = "https://github.com/caronc/apprise/releases/tag/v${version}";
homepage = "https://appriseit.com/";
changelog = "https://github.com/caronc/apprise/releases/tag/v${finalAttrs.version}";
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [ getchoo ];
mainProgram = "apprise";
};
}
})
@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "getjump";
version = "2.8.0";
version = "2.10.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-FfAwPCbj+0wL+Lgk17peco/ogrsaa6Js+Ay5fqgPUPw=";
hash = "sha256-AX8WffzcqBYqo8DzXXbhfqOMd7U5VpWx4MTKhUXLJeQ=";
};
pythonRelaxDeps = [
@@ -11,12 +11,12 @@
buildPythonPackage (finalAttrs: {
pname = "publicsuffixlist";
version = "1.0.2.20260117";
version = "1.0.2.20260121";
pyproject = true;
src = fetchPypi {
inherit (finalAttrs) pname version;
hash = "sha256-JOESMNtP5Nfmi7QyA/gL9Sf2FMBiWn3CdJ17BETYWOU=";
hash = "sha256-3CjU0m330GWrQksBe7d9W8PZfAIyzZ80MlDNewgWC78=";
};
postPatch = ''
-16
View File
@@ -1,16 +0,0 @@
{ fetchFromGitHub }:
let
pname = "hockeypuck";
version = "2.1.0";
in
{
inherit version pname;
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "0da3ffbqck0dr7d89gy2yillp7g9a4ziyjlvrm8vgkkg2fs8dlb1";
};
}
+10 -76
View File
@@ -1450,10 +1450,6 @@ with pkgs;
arpack-mpi = arpack.override { useMpi = true; };
authelia = callPackage ../servers/authelia {
buildGoModule = buildGo124Module;
};
authentik-outposts = recurseIntoAttrs (callPackages ../by-name/au/authentik/outposts.nix { });
autoflake = with python3.pkgs; toPythonApplication autoflake;
@@ -2798,10 +2794,6 @@ with pkgs;
lua = lua5;
};
hockeypuck = callPackage ../servers/hockeypuck/server.nix { };
hockeypuck-web = callPackage ../servers/hockeypuck/web.nix { };
host = bind.host;
hotdoc = python3Packages.callPackage ../development/tools/hotdoc { };
@@ -8587,8 +8579,6 @@ with pkgs;
dcnnt = python3Packages.callPackage ../servers/dcnnt { };
deconz = qt5.callPackage ../servers/deconz { };
dict = callPackage ../servers/dict {
flex = flex_2_5_35;
libmaa = callPackage ../servers/dict/libmaa.nix { };
@@ -8598,8 +8588,6 @@ with pkgs;
dictDBCollector = callPackage ../servers/dict/dictd-db-collector.nix { };
diod = callPackage ../servers/diod { lua = lua5_1; };
dodgy = with python3Packages; toPythonApplication dodgy;
prosody = callPackage ../servers/xmpp/prosody {
@@ -8607,10 +8595,6 @@ with pkgs;
withExtraLuaPackages = _: [ ];
};
felix = callPackage ../servers/felix { };
felix_remoteshell = callPackage ../servers/felix/remoteshell.nix { };
inherit (callPackages ../servers/firebird { })
firebird_4
firebird_3
@@ -9341,10 +9325,6 @@ with pkgs;
fuse2 = lowPrio (if stdenv.hostPlatform.isDarwin then macfuse-stubs else fusePackages.fuse_2);
fuse3 = fusePackages.fuse_3;
gpm = callPackage ../servers/gpm {
withNcurses = false; # Keep curses disabled for lack of value
};
gpm-ncurses = gpm.override { withNcurses = true; };
btop-cuda = btop.override { cudaSupport = true; };
@@ -11904,10 +11884,6 @@ with pkgs;
vscode-generic = ../applications/editors/vscode/generic.nix;
};
code-server = callPackage ../servers/code-server {
nodejs = nodejs_20;
};
kiro = callPackage ../by-name/ki/kiro/package.nix {
vscode-generic = ../applications/editors/vscode/generic.nix;
};
@@ -12229,8 +12205,6 @@ with pkgs;
anki-utils = callPackage ../by-name/an/anki/addons/anki-utils.nix { };
ankiAddons = recurseIntoAttrs (callPackage ../by-name/an/anki/addons { });
arx-libertatis = libsForQt5.callPackage ../games/arx-libertatis { };
beancount-ing-diba = callPackage ../applications/office/beancount/beancount-ing-diba.nix {
inherit (python3Packages) beancount beangulp;
};
@@ -12245,28 +12219,20 @@ with pkgs;
cataclysm-dda-git = cataclysmDDA.git.tiles;
cockatrice = libsForQt5.callPackage ../games/cockatrice {
protobuf = protobuf_21;
};
construoBase = lowPrio (
callPackage ../games/construo {
libGL = null;
libGLU = null;
libglut = null;
}
);
construo = construoBase.override {
inherit libGL libGLU libglut;
construoBase = construo.override {
withLibGL = false;
withLibGLU = false;
withLibglut = false;
};
crawlTiles = callPackage ../by-name/cr/crawl/package.nix {
tileMode = true;
};
curseofwar = callPackage ../games/curseofwar { SDL = null; };
curseofwar-sdl = callPackage ../games/curseofwar { ncurses = null; };
curseofwar-sdl = curseofwar.override {
withSDL = true;
ncurses = null;
};
ddnet-server = ddnet.override { buildClient = false; };
@@ -12399,39 +12365,11 @@ with pkgs;
openra = openraPackages.engines.release;
openttd = callPackage ../games/openttd {
zlib = zlib.override {
static = true;
};
};
openttd-jgrpp = callPackage ../games/openttd/jgrpp.nix {
zlib = zlib.override {
static = true;
};
};
openttd-grfcodec = callPackage ../games/openttd/grfcodec.nix { };
openttd-nml = callPackage ../games/openttd/nml.nix { };
openxray = callPackage ../games/openxray {
# Builds with Clang, but hits an assertion failure unless GCC is used
# https://github.com/OpenXRay/xray-16/issues/1224
stdenv = gccStdenv;
};
papermcServers = callPackages ../games/papermc { };
papermc = papermcServers.papermc;
pentobi = libsForQt5.callPackage ../games/pentobi { };
pokerth = libsForQt5.callPackage ../games/pokerth {
protobuf = protobuf_21;
};
pokerth-server = libsForQt5.callPackage ../games/pokerth {
target = "server";
protobuf = protobuf_21;
};
pokerth-server = pokerth.override { target = "server"; };
inherit (import ../games/quake3 pkgs.callPackage)
quake3wrapper
@@ -13150,11 +13088,6 @@ with pkgs;
gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; };
};
gnuk = callPackage ../misc/gnuk {
gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc;
binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils;
};
helmfile-wrapped = helmfile.override {
inherit (kubernetes-helm-wrapped.passthru) pluginsDir;
};
@@ -13471,6 +13404,7 @@ with pkgs;
vaultwarden-sqlite = vaultwarden;
vaultwarden-mysql = vaultwarden.override { dbBackend = "mysql"; };
vaultwarden-postgresql = vaultwarden.override { dbBackend = "postgresql"; };
vaultwarden-webvault = vaultwarden.webvault;
vimUtils = callPackage ../applications/editors/vim/plugins/utils/vim-utils.nix { };