Merge master into staging-nixos

This commit is contained in:
nixpkgs-ci[bot]
2025-12-17 12:08:45 +00:00
committed by GitHub
49 changed files with 500 additions and 220 deletions
+12
View File
@@ -6612,6 +6612,12 @@
github = "dietmarw";
githubId = 9332;
};
Dietr1ch = {
name = "Dietrich Daroch";
github = "Dietr1ch";
githubId = 2096594;
email = "Dietrich@Daroch.me";
};
different-name = {
name = "different-name";
email = "hello@different-name.dev";
@@ -18643,6 +18649,12 @@
githubId = 151337;
name = "Nick Novitski";
};
nickthegroot = {
name = "Nick DeGroot";
email = "nick@nickthegroot.com";
github = "nickthegroot";
githubId = 1966472;
};
nico202 = {
email = "anothersms@gmail.com";
github = "nico202";
@@ -1969,7 +1969,7 @@ in
after = [ "network.target" ];
serviceConfig = {
ExecStart =
"${cfg.package}/bin/prometheus"
"${lib.getExe cfg.package}"
+ optionalString (length cmdlineArgs != 0) (" \\\n " + concatStringsSep " \\\n " cmdlineArgs);
ExecReload = mkIf cfg.enableReload "+${reload}/bin/reload-prometheus";
User = "prometheus";
@@ -1980,6 +1980,7 @@ in
StateDirectory = cfg.stateDir;
StateDirectoryMode = "0700";
# Hardening
CapabilityBoundingSet = [ "" ];
DeviceAllow = [ "/dev/null rw" ];
DevicePolicy = "strict";
LockPersonality = true;
+1 -1
View File
@@ -421,7 +421,7 @@ in
# this file is expected in /etc/qemu and not sysconfdir (/var/lib)
etc."qemu/bridge.conf".text = lib.concatMapStringsSep "\n" (e: "allow ${e}") cfg.allowedBridges;
systemPackages = with pkgs; [
libressl.nc
netcat
config.networking.firewall.package
cfg.package
cfg.qemu.package
+1 -1
View File
@@ -53,7 +53,7 @@ let
sudo
ceph
xfsprogs
libressl.nc
netcat
];
boot.kernelModules = [ "xfs" ];
+1 -1
View File
@@ -14,7 +14,7 @@
nodes.client = _: {
environment.systemPackages = [
pkgs.sshpass
pkgs.libressl.nc
pkgs.netcat
];
};
+1 -1
View File
@@ -24,7 +24,7 @@ let
printf 'HTTP/1.0 200 OK\n'
printf 'Content-Length: ${toString (1 + builtins.stringLength msg)}\n'
printf '\n${msg}\n\n'
} | ${pkgs.libressl.nc}/bin/nc -${toString ip}nvl 80
} | ${pkgs.netcat}/bin/nc -${toString ip}nvl 80
done
'';
};
+1 -1
View File
@@ -40,7 +40,7 @@
server_wsdd.wait_for_unit("samba-wsdd")
client_wsdd.wait_until_succeeds(
"echo list | ${pkgs.libressl.nc}/bin/nc -N -U /run/wsdd/wsdd.sock | grep -i SERVER-WSDD"
"echo list | ${pkgs.netcat}/bin/nc -N -U /run/wsdd/wsdd.sock | grep -i SERVER-WSDD"
)
'';
}
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "claude-code";
publisher = "anthropic";
version = "2.0.70";
hash = "sha256-ed2oYB6G9EuSRqgt18W69JS73+uf6vqXtwQ1ZY+eWy8=";
version = "2.0.72";
hash = "sha256-nfzcm8lEtZl3vD129rtpV4Oc5vKW7SKyZHfFg1jd8hU=";
};
meta = {
-105
View File
@@ -1,105 +0,0 @@
{
mkDerivation,
lib,
fetchFromGitHub,
fetchpatch,
brotli,
lz4,
pyotherside,
python3,
python3Packages,
qtbase,
qtcharts,
qmake,
qttools,
rdbtools,
snappy,
wrapQtAppsHook,
zstd,
}:
let
rdbtools-patched = rdbtools.overridePythonAttrs (oldAttrs: {
# Add required additional flag for resp-app
patches = oldAttrs.patches or [ ] ++ [
(fetchpatch {
name = "Add-flag-to-parse-only-key-names.patch";
url = "https://github.com/uglide/redis-rdb-tools/commit/b74946e6fbca589947ef0186429d5ce45a074b87.patch";
hash = "sha256-1gjqB/IDSsAbrwzWSezlAW/2SYr6BFm1QJ2HAHK2fFs=";
})
];
});
in
mkDerivation rec {
pname = "RESP.app";
version = "2022.5";
src = fetchFromGitHub {
owner = "RedisInsight";
repo = "RedisDesktopManager";
fetchSubmodules = true;
rev = version;
hash = "sha256-5eI3J2RsYE5Ejb1r8YkgzmGX2FyaCLFD0lc10J+fOT4=";
};
nativeBuildInputs = [
python3Packages.wrapPython
qmake
wrapQtAppsHook
];
buildInputs = [
brotli
lz4
pyotherside
python3
qtbase
qtcharts
qttools
snappy
zstd
]
++ pythonPath;
pythonPath = with python3Packages; [
bitstring
cbor
msgpack
phpserialize
rdbtools-patched
python-lzf
];
postPatch = ''
substituteInPlace src/resp.pro \
--replace 'which ccache' "false" \
--replace 'target.files = $$DESTDIR/resp' "${placeholder "src"}/bin/linux/release/resp" \
--replace '/opt/resp_app' "${placeholder "out"}" \
--replace 'target.path = $$LINUX_INSTALL_PATH' 'target.path = $$LINUX_INSTALL_PATH/bin' \
--replace '/usr/' "$out/"
rm -r 3rdparty/snappy
'';
qmakeFlags = [
"SYSTEM_LZ4=1"
"SYSTEM_ZSTD=1"
"SYSTEM_SNAPPY=1"
"SYSTEM_BROTLI=1"
"VERSION=${version}"
"src/resp.pro"
];
preFixup = ''
buildPythonPath "$pythonPath"
qtWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH")
'';
meta = {
description = "Cross-platform Developer GUI for Redis";
mainProgram = "resp";
homepage = "https://resp.app/";
license = lib.licenses.gpl3Only;
platforms = lib.platforms.linux;
maintainers = [ ];
};
}
+2 -2
View File
@@ -19,13 +19,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "bella";
version = "0.1.3";
version = "0.1.7";
src = fetchFromGitHub {
owner = "josephmawa";
repo = "Bella";
tag = "v${finalAttrs.version}";
hash = "sha256-JSzgh56Ph8LjVY2uPfu1tacdr7BBbBzRfdWtcTRga7I=";
hash = "sha256-ePzDnaoGPa5Hku7Rpced989QB6uOXN/jfXgTwtlE7rQ=";
};
strictDeps = true;
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "buildkit";
version = "0.26.2";
version = "0.26.3";
src = fetchFromGitHub {
owner = "moby";
repo = "buildkit";
rev = "v${version}";
hash = "sha256-AMsql+b5yUnkw6KkJte2qjN+MadJn06/0HohXP4N47c=";
hash = "sha256-2Utxan85hHmyt+7anfbjFxBHhKzmZb7k9K025vA76Ys=";
};
vendorHash = null;
+6 -6
View File
@@ -10,15 +10,15 @@
testers,
cerberus,
}:
ocamlPackages.buildDunePackage rec {
ocamlPackages.buildDunePackage (finalAttrs: {
pname = "cerberus";
version = "0-unstable-2025-11-26";
version = "0-unstable-2025-12-15";
src = fetchFromGitHub {
owner = "rems-project";
repo = "cerberus";
rev = "6d60ef25944ebcdab892158c949a8e05501557dc";
hash = "sha256-RucW01xuW5b6F9/O1OL99YJn3rSMCP7l7Cwjuv4PNIc=";
rev = "50621977ba282ac527e9259f7e9334d2c5bef41c";
hash = "sha256-CAZeLG1M9oBzl/5EsIYwyV3St5fdwmfkPApACbsIYAc=";
};
patches = [
@@ -35,7 +35,7 @@ ocamlPackages.buildDunePackage rec {
# our version since git is impure
postPatch = ''
substituteInPlace tools/gen_version.ml \
--replace-fail '"unknown"' '"${version}"'
--replace-fail '"unknown"' '"${finalAttrs.version}"'
'';
minimalOCamlVersion = "4.12";
@@ -136,4 +136,4 @@ ocamlPackages.buildDunePackage rec {
];
platforms = lib.platforms.unix;
};
}
})
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "@anthropic-ai/claude-code",
"version": "2.0.70",
"version": "2.0.71",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@anthropic-ai/claude-code",
"version": "2.0.70",
"version": "2.0.71",
"license": "SEE LICENSE IN README.md",
"bin": {
"claude": "cli.js"
+3 -3
View File
@@ -11,14 +11,14 @@
}:
buildNpmPackage (finalAttrs: {
pname = "claude-code";
version = "2.0.70";
version = "2.0.71";
src = fetchzip {
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
hash = "sha256-RTMhrFhbamO8Ow5iKd3IiLoKoLF5cz279ArjPZymE9o=";
hash = "sha256-krbaIy1KfmbwroQRZpGR6bOYNc2l/GZKjhavmiwVCms=";
};
npmDepsHash = "sha256-coTUQVOOT/jonVtnmY/zenv1PI93JFlpFEqlUlhssJM=";
npmDepsHash = "sha256-cio+ZkVIPIkxRXXQzwFYXr08OUEBVJpRjtvmJLcH3Ag=";
postPatch = ''
cp ${./package-lock.json} package-lock.json
+2 -2
View File
@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "dbcsr";
version = "2.8.0";
version = "2.9.0";
src = fetchFromGitHub {
owner = "cp2k";
repo = "dbcsr";
rev = "v${version}";
hash = "sha256-YXySNw3+DiY7E57W1ypeWLyawwcWVGlmTM4Kgj7Nnmo=";
hash = "sha256-ZhcatDG0bbl75P3YI5Kqg8lhbDZ8EHYaZSixky6KJyo=";
};
postPatch = ''
+3 -3
View File
@@ -15,13 +15,13 @@
buildGoModule rec {
pname = "fulcio";
version = "1.8.3";
version = "1.8.4";
src = fetchFromGitHub {
owner = "sigstore";
repo = "fulcio";
tag = "v${version}";
hash = "sha256-yR8Q1ksz1fB8sc8NA6Hr4dwe5VXerEgIQYiIpNTOEf8=";
hash = "sha256-+5aYfHR8v7A5U73rTkXoUInWDt044JcPDwQt2iKaqBw=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -33,7 +33,7 @@ buildGoModule rec {
find "$out" -name .git -print0 | xargs -0 rm -rf
'';
};
vendorHash = "sha256-G+vtNCm9Ecpj5IzxXojzcjGEQL47R5gNMFI/JCs7C0w=";
vendorHash = "sha256-EtanisQJclkIh2m+M51kGrWvOP/4Y+Y2zbxfSJ25cLk=";
nativeBuildInputs = [ installShellFiles ];
+80
View File
@@ -0,0 +1,80 @@
{
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
dbus,
glib,
wrapGAppsHook4,
glib-networking,
gst_all_1,
gtk4,
libadwaita,
libseccomp,
openssl,
bubblewrap,
glycin-loaders,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "gelly";
version = "0.11.0";
src = fetchFromGitHub {
owner = "Fingel";
repo = "gelly";
tag = "v${finalAttrs.version}";
hash = "sha256-fZrSfxbWkHX5yUwC4NkDmXcNDTvsdwceEBkmUmxWcoQ=";
};
cargoHash = "sha256-vnFbRvq+EPIcJ4w+QKpkXrl5BLr/KbELbmpRGQwcaUE=";
nativeBuildInputs = [
pkg-config
glib # for `glib-compile-schemas` and `glib-compile-resources` (used in upstream's `build.rs`)
wrapGAppsHook4
];
buildInputs = [
dbus
# Very important, so that gstreamer supports TLS
glib-networking
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-ugly
gst_all_1.gst-plugins-rs
gtk4
libadwaita
libseccomp
openssl
];
# Adapted from upstream's `justfile`
postInstall = ''
install -Dm644 resources/io.m51.Gelly.desktop $out/share/applications/io.m51.Gelly.desktop
install -Dm644 resources/io.m51.Gelly.metainfo.xml $out/share/metainfo/io.m51.Gelly.metainfo.xml
install -Dm644 resources/io.m51.Gelly.svg $out/share/icons/hicolor/scalable/apps/io.m51.Gelly.svg
# Use the gschemas location as specified in the glib hook
install -Dm644 resources/io.m51.Gelly.gschema.xml $out/share/gsettings-schemas/$name/glib-2.0/schemas/io.m51.Gelly.gschema.xml
glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas/
'';
preFixup = ''
gappsWrapperArgs+=(
--prefix PATH : "$out/bin:${lib.makeBinPath [ bubblewrap ]}"
--prefix XDG_DATA_DIRS : "${glycin-loaders}/share"
)
'';
meta = {
description = "A Jellyfin GTK client for Linux focused on music";
homepage = "https://github.com/Fingel/gelly";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ minijackson ];
mainProgram = "gelly";
platforms = lib.platforms.linux;
};
})
+2 -2
View File
@@ -17,11 +17,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gkrellm";
version = "2.4.0";
version = "2.5.0";
src = fetchurl {
url = "http://gkrellm.srcbox.net/releases/gkrellm-${finalAttrs.version}.tar.bz2";
hash = "sha256-b4NmV2C5Nq1LVfkYKx7HYB+vOKDyXqHkvdyZZQiPAy0=";
hash = "sha256-aMdaA6Brk1r6k9MzHKHC2GLB1Qw+nfGdmo1Ilw12a1U=";
};
nativeBuildInputs = [
+1
View File
@@ -27,6 +27,7 @@ appimageTools.wrapType2 {
install -m 444 -D ${appimageContents}/HiFile.png $out/share/icons/hicolor/512x512/apps/HiFile.png
substituteInPlace $out/share/applications/HiFile.desktop \
--replace-fail 'Exec=HiFile' 'Exec=hifile'
echo "StartupWMClass=app.hifile.www.HiFile" >> $out/share/applications/HiFile.desktop
'';
passthru.updateScript = ./update.sh;
+2 -2
View File
@@ -38,7 +38,7 @@
mdbook,
foreman,
python3,
libressl,
netcat,
cacert,
glibcLocales,
meson,
@@ -210,7 +210,7 @@ stdenv.mkDerivation (finalAttrs: {
foreman
glibcLocales
python3
libressl.nc
netcat
nix-eval-jobs
openldap
postgresql
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "mdfried";
version = "0.14.6";
version = "0.15.0";
src = fetchFromGitHub {
owner = "benjajaja";
repo = "mdfried";
tag = "v${finalAttrs.version}";
hash = "sha256-Ys/CoyaIKVVRtQfmjc4XOABdrktZ1lIPNqw0V8jlY5I=";
hash = "sha256-V++xkJBnTlqzcsw6BDkrqScIV+phzxyDqQXcV34L4ps=";
};
cargoHash = "sha256-ipNhqxcc+Kfr6XtF3QtFh896YK5v1u4kXapiMUjC9n8=";
cargoHash = "sha256-qnsJkwAmBcakYcoqGdYRqfN6e46PG5IH6SAXLvy3mM8=";
doCheck = true;
+3 -3
View File
@@ -8,18 +8,18 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "meilisearch";
version = "1.28.2";
version = "1.30.0";
src = fetchFromGitHub {
owner = "meilisearch";
repo = "meiliSearch";
tag = "v${finalAttrs.version}";
hash = "sha256-Sp3YAAOgkBoBIz4Yj0AKJ0aI0HBAIg75E9BjtzGxXLM=";
hash = "sha256-oq/jP+b4KwjpVvj/yBmzIOm+TM13dup40dAD0ID2Juc=";
};
cargoBuildFlags = [ "--package=meilisearch" ];
cargoHash = "sha256-W6nTVgD0U4bZ0ybGU6wTQmp+SVvorZCqKOJnf1GG1gU=";
cargoHash = "sha256-ooggvDUSrtY6X+GGHjU/rsP/q9Br2OUMTvVYUfVdAtk=";
# Default features include mini dashboard which downloads something from the internet.
buildNoDefaultFeatures = true;
+3 -3
View File
@@ -9,12 +9,12 @@
}:
let
pname = "models-dev";
version = "0-unstable-2025-12-11";
version = "0-unstable-2025-12-15";
src = fetchFromGitHub {
owner = "sst";
repo = "models.dev";
rev = "0c66fc84a2deb49500b9bb67e37d87428f544119";
hash = "sha256-HAGUVpdW0gLXCo3jCU7pnjvh1cTp8xnU59MXgCwQkGs=";
rev = "14c7777ca5952619b9dcf46e5bf60a7dd25080be";
hash = "sha256-+JJtaUmjwNXPnBP2jCc/r+Yswa+xViH9CVZzdmyXo+A=";
};
node_modules = stdenvNoCC.mkDerivation {
+4 -3
View File
@@ -13,12 +13,12 @@
}:
let
pname = "opencode";
version = "1.0.150";
version = "1.0.164";
src = fetchFromGitHub {
owner = "sst";
repo = "opencode";
tag = "v${version}";
hash = "sha256-8mFmFFk378g93MbFRwMOJkjuXqq3PVPdCuGVLPn6D44=";
hash = "sha256-bz20/y6zVhEWQZB17HocvYg0F9XNwy6EKg3LHSkmvLE=";
};
node_modules = stdenvNoCC.mkDerivation {
@@ -70,7 +70,7 @@ let
# NOTE: Required else we get errors that our fixed-output derivation references store paths
dontFixup = true;
outputHash = "sha256-3swARfDhEfLoaucjiUfse3px40ZBfQsEE8DPgUk/5K0=";
outputHash = "sha256-I7y6e+ODXShbMCmKOvC48+Y3wyrLKH0IES4S6gOnMiE=";
outputHashAlgo = "sha256";
outputHashMode = "recursive";
};
@@ -211,6 +211,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
'';
homepage = "https://github.com/sst/opencode";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ delafthi ];
platforms = [
"aarch64-linux"
"x86_64-linux"
+30
View File
@@ -0,0 +1,30 @@
{
lib,
buildNpmPackage,
fetchFromGitHub,
}:
buildNpmPackage rec {
pname = "playball";
version = "3.2.0";
src = fetchFromGitHub {
owner = "paaatrick";
repo = "playball";
tag = "v${version}";
hash = "sha256-xgAhzNWCLNmbrwaYAGmXMercoRgXWPjjV5dcnXunmeA=";
};
npmDepsHash = "sha256-s0JKBJnVYkeXOE62F6BZRKwd0Hg3IOuMai6rmKUi6TI=";
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
meta = {
changelog = "https://github.com/paaatrick/playball/releases/tag/v${version}";
description = "Watch MLB games from the comfort of your own terminal";
mainProgram = "playball";
homepage = "https://github.com/paaatrick/playball";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ nickthegroot ];
};
}
+3 -2
View File
@@ -15,14 +15,14 @@
python3Packages.buildPythonApplication rec {
pname = "pmbootstrap";
version = "3.6.0";
version = "3.7.0";
pyproject = true;
src = fetchFromGitLab {
owner = "postmarketOS";
repo = "pmbootstrap";
tag = version;
hash = "sha256-sO042kmozpGbiojkivs4xbYDgVV4nVbiWkfxnbJFOJg=";
hash = "sha256-l8y1GoNZd6JeWzO2TI0GIVc/WlMv9EunFGH94pZ7ibk=";
domain = "gitlab.postmarketos.org";
};
@@ -84,6 +84,7 @@ python3Packages.buildPythonApplication rec {
maintainers = with lib.maintainers; [
onny
lucasew
ungeskriptet
];
mainProgram = "pmbootstrap";
};
@@ -0,0 +1,10 @@
--- ./build_ui.sh 2025-10-22 23:32:08.739188520 +0100
+++ ./build_ui.sh 2025-10-22 23:32:23.753242986 +0100
@@ -50,7 +50,6 @@ for i in "$@"; do
case ${i} in
--all)
buildModule
- buildReactApp
buildMantineUI
shift
;;
+82 -25
View File
@@ -1,11 +1,10 @@
{
stdenv,
buildPackages,
lib,
go,
buildGoModule,
buildNpmPackage,
fetchFromGitHub,
fetchurl,
nixosTests,
enableAWS ? true,
enableAzure ? true,
@@ -30,11 +29,65 @@
enableVultr ? true,
enableXDS ? true,
enableZookeeper ? true,
versionCheckHook,
}:
buildGoModule (finalAttrs: {
let
source = import ./source.nix;
inherit (source) version vendorHash;
pname = "prometheus";
version = "3.8.0";
src = fetchFromGitHub {
owner = "prometheus";
repo = "prometheus";
tag = "v${version}";
hash = source.hash;
};
assets = buildNpmPackage {
pname = "${pname}-assets";
inherit version;
src = "${src}/web/ui";
npmDepsHash = source.npmDepsHash;
patches = [
# Disable old React app as it depends on deprecated create-react-apps
# script
./disable-react-app.diff
];
env.CI = true;
doCheck = true;
checkPhase = ''
runHook preCheck
npm test
runHook postCheck
'';
postInstall = ''
mkdir -p $out/static
cp -r $out/lib/node_modules/prometheus-io/static/* $out/static
find $out/static -type f -exec gzip -f9 {} \;
# Remove node_modules
rm -rf $out/lib
'';
};
in
buildGoModule (finalAttrs: {
inherit
pname
version
vendorHash
src
;
outputs = [
"out"
@@ -42,22 +95,6 @@ buildGoModule (finalAttrs: {
"cli"
];
src = fetchFromGitHub {
owner = "prometheus";
repo = "prometheus";
tag = "v${finalAttrs.version}";
hash = "sha256-hRuZxwPPDLxQvy5MPKEyfmanNabcSjLRO+XbNKugPtk=";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];
vendorHash = "sha256-5wDaG01vcTtGzrS/S33U5XWXoSWM+N9z3dzXZlILxD8=";
webUiStatic = fetchurl {
url = "https://github.com/prometheus/prometheus/releases/download/v${finalAttrs.version}/prometheus-web-ui-${finalAttrs.version}.tar.gz";
hash = "sha256-oOEvNZFlYtTNBsn+B2pAWXi0A2oJ6IAo7V8bOLtjfCM=";
};
excludedPackages = [
"documentation/prometheus-mixin"
"internal/tools"
@@ -65,7 +102,7 @@ buildGoModule (finalAttrs: {
];
postPatch = ''
tar -C web/ui -xzf ${finalAttrs.webUiStatic}
cp -r ${assets}/static web/ui/static/
patchShebangs scripts
@@ -99,9 +136,18 @@ buildGoModule (finalAttrs: {
'';
preBuild = ''
if [[ -d vendor ]]; then
GOARCH= CC="$CC_FOR_BUILD" LD="$LD_FOR_BUILD" make -o assets assets-compress plugins
fi
if [[ -d vendor ]]; then GOARCH= make -o assets plugins; fi
# Recreate the `make assets-compress` target here - workaround permissions
# errors
cp web/ui/embed.go.tmpl web/ui/embed.go
find web/ui/static -type f -name '*.gz' -print0 | sort -z | xargs -0 echo //go:embed >> web/ui/embed.go
echo 'var EmbedFS embed.FS' >> web/ui/embed.go
# EmbedFS requires relative paths
substituteInPlace web/ui/embed.go --replace-fail "web/ui/" ""
'';
tags = [ "builtinassets" ];
@@ -141,15 +187,26 @@ buildGoModule (finalAttrs: {
"-skip=TestEvaluations/testdata/aggregators.test"
];
passthru.tests = { inherit (nixosTests) prometheus; };
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru = {
tests = { inherit (nixosTests) prometheus; };
updateScript = ./update.sh;
};
meta = {
description = "Service monitoring system and time series database";
homepage = "https://prometheus.io";
license = lib.licenses.asl20;
changelog = "https://github.com/prometheus/prometheus/blob/v${version}/CHANGELOG.md";
maintainers = with lib.maintainers; [
fpletz
Frostman
jpds
];
mainProgram = "prometheus";
};
+6
View File
@@ -0,0 +1,6 @@
{
version = "3.8.1";
hash = "sha256-mb1aMWpIELyZaqjYX1teYdtAK/+W9jzdPwzgbT7AVj4=";
npmDepsHash = "sha256-wmxvlQWQO2gP2apupMJssqAPr1ntWWIazduQU3AuodU=";
vendorHash = "sha256-35pVMl1Hu970BQE6jMzT1xaz/3FaIFWUtel0cl/uBdw=";
}
+77
View File
@@ -0,0 +1,77 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p nix coreutils curl jq nix-prefetch-git prefetch-npm-deps
set -euo pipefail
OWNER=prometheus
REPO=prometheus
# Current version.
LATEST_NIXPKGS_VERSION=$(nix eval --raw .#prometheus.version 2>/dev/null)
UPDATE_NIX_OLD_VERSION=${UPDATE_NIX_OLD_VERSION:-$LATEST_NIXPKGS_VERSION}
TARGET_TAG="$(curl -L -s ${GITHUB_TOKEN:+-u ":${GITHUB_TOKEN}"} "https://api.github.com/repos/$OWNER/$REPO/releases/latest" | jq -r '.tag_name')"
TARGET_VERSION="$(echo "$TARGET_TAG" | sed -e 's/^v//')"
if [[ "$UPDATE_NIX_OLD_VERSION" == "$TARGET_VERSION" ]]; then
# prometheus is up-to-date
if [[ -n "$UPDATE_NIX_ATTR_PATH" ]]; then
echo "[{}]";
fi
exit 0
fi
extractVendorHash() {
original="${1?original hash missing}"
result="$(nix-build -A prometheus.goModules 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true)"
[ -z "$result" ] && { echo "$original"; } || { echo "$result"; }
}
TMP=$(mktemp -d)
trap 'rm -rf "$TMP"' EXIT
NIXPKGS_PROMETHEUS_PATH=$(cd $(dirname ${BASH_SOURCE[0]}); pwd -P)/
SOURCE_NIX="$NIXPKGS_PROMETHEUS_PATH/source.nix"
PREFETCH_JSON=$TMP/prefetch.json
nix-prefetch-git --rev "$TARGET_TAG" --url "https://github.com/$OWNER/$REPO" > "$PREFETCH_JSON"
PREFETCH_HASH="$(jq '.hash' -r < "$PREFETCH_JSON")"
PREFETCH_PATH="$(jq '.path' -r < "$PREFETCH_JSON")"
NPM_DEPS_HASH="$(prefetch-npm-deps "$PREFETCH_PATH/web/ui/package-lock.json")"
FAKE_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
cat > "$SOURCE_NIX" <<-EOF
{
version = "$TARGET_VERSION";
hash = "$PREFETCH_HASH";
npmDepsHash = "$NPM_DEPS_HASH";
vendorHash = "$FAKE_HASH";
}
EOF
GO_HASH="$(nix-instantiate --eval -A prometheus.vendorHash | tr -d '"')"
VENDOR_HASH=$(extractVendorHash "$GO_HASH")
cat > "$SOURCE_NIX" <<-EOF
{
version = "$TARGET_VERSION";
hash = "$PREFETCH_HASH";
npmDepsHash = "$NPM_DEPS_HASH";
vendorHash = "$VENDOR_HASH";
}
EOF
if [[ -z "$UPDATE_NIX_ATTR_PATH" ]]; then
exit 0
fi
cat <<-EOF
[{
"attrPath": "$UPDATE_NIX_ATTR_PATH",
"oldVersion": "$UPDATE_NIX_OLD_VERSION",
"newVersion": "$TARGET_VERSION",
"files": ["$SOURCE_NIX"]
}]
EOF
+2 -2
View File
@@ -19,11 +19,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "qownnotes";
appname = "QOwnNotes";
version = "25.12.5";
version = "25.12.6";
src = fetchurl {
url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
hash = "sha256-LS1R5+wCkv/IvgC8RMqhvoIrrMmNlS0Hg+IgMViRJys=";
hash = "sha256-zlTyh0D7FXB4LDGQXi4Hb8WeujaM7F7hoO9TccZfzFg=";
};
nativeBuildInputs = [
+37
View File
@@ -0,0 +1,37 @@
{
lib,
rustPlatform,
fetchFromGitHub,
nix-update-script,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "ron-lsp";
version = "0.1.1";
src = fetchFromGitHub {
owner = "jasonjmcghee";
repo = "ron-lsp";
tag = "v${finalAttrs.version}";
hash = "sha256-c+cJrXINuoK+NR1rMSrOeZqZzrEcg/brSTKSTu5mNr4=";
};
cargoHash = "sha256-eEoxgnfc9s59b0SNozEIj/1wHv+OWDmd4bniBbGsgSQ=";
passthru.updateScript = nix-update-script { };
meta = {
description = "RON, Rusty Object Notation, Language Server";
longDescription = ''
An LSP and CLI for RON files that provides autocomplete,
diagnostics, go to definition, code actions, and hover support
based on Rust type annotations
'';
homepage = "https://github.com/jasonjmcghee/ron-lsp";
license = with lib.licenses; [ mit ];
maintainers = with lib.maintainers; [
Dietr1ch
];
mainProgram = "ron-lsp";
};
})
+31
View File
@@ -0,0 +1,31 @@
diff --git a/setserial.c b/setserial.c
index fef6532768..b7cde26ac2 100644
--- a/setserial.c
+++ b/setserial.c
@@ -10,11 +10,14 @@
* Last modified: [tytso:19940520.0036EDT]
*/
+#include <errno.h>
+#include <fcntl.h>
#include <stdio.h>
-#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
#include <termios.h>
-#include <string.h>
-#include <errno.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
#ifdef HAVE_ASM_IOCTLS_H
#include <asm/ioctls.h>
@@ -714,7 +717,7 @@
exit(1);
}
-main(int argc, char **argv)
+int main(int argc, char **argv)
{
int get_flag = 0, wild_intr_flag = 0;
int c;
+43
View File
@@ -0,0 +1,43 @@
{
lib,
stdenv,
fetchurl,
groff,
autoreconfHook,
}:
stdenv.mkDerivation rec {
pname = "setserial";
version = "2.17";
src = fetchurl {
url = "mirror://sourceforge/setserial/${pname}-${version}.tar.gz";
sha256 = "0jkrnn3i8gbsl48k3civjmvxyv9rbm1qjha2cf2macdc439qfi3y";
};
patches = [ ./gcc-fixes.patch ];
nativeBuildInputs = [
autoreconfHook
groff
];
postConfigure = ''
substituteInPlace Makefile \
--replace-fail /usr/man/ /share/man/ \
--replace-fail DESTDIR out
'';
preInstall = ''
mkdir -p "$out/bin" "$out/share/man/man8"
'';
meta = {
description = "Serial port configuration utility";
homepage = "https://setserial.sourceforge.net";
platforms = lib.platforms.linux;
license = lib.licenses.gpl2Only;
mainProgram = "setserial";
maintainers = [ lib.maintainers.mmlb ];
};
}
+2 -2
View File
@@ -21,13 +21,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "shader-slang";
version = "2025.24";
version = "2025.24.1";
src = fetchFromGitHub {
owner = "shader-slang";
repo = "slang";
tag = "v${finalAttrs.version}";
hash = "sha256-lOvPEUsweyBIf/ryoCDnwBTkvz4J9xatkNSWDvM8zWc=";
hash = "sha256-w99pRi03HyI8xlvxbJL+i5k6Sr0ITkh28qB9nRY2iiU=";
fetchSubmodules = true;
};
+2 -2
View File
@@ -53,13 +53,13 @@ assert enablePython -> pythonPackages != null;
stdenv.mkDerivation (finalAttrs: {
pname = "SIRIUS";
version = "7.9.0";
version = "7.10.0";
src = fetchFromGitHub {
owner = "electronic-structure";
repo = "SIRIUS";
tag = "v${finalAttrs.version}";
hash = "sha256-/bhY+LCxOikS1at0ONFAhmvfnWhAVHsRQ4GfXJOZbBA=";
hash = "sha256-cq4ajtAJXfIH1B866FYhgROMSwd7nsbXf/6kbSwJAso=";
};
outputs = [
+10 -10
View File
@@ -1,26 +1,26 @@
# Generated by ./update.sh - do not update manually!
# Last updated: 2025-11-14
# Last updated: 2025-12-15
{ fetchurl }:
{
aarch64-darwin = {
version = "4.47.59";
version = "4.47.72";
src = fetchurl {
url = "https://downloads.slack-edge.com/desktop-releases/mac/arm64/4.47.59/Slack-4.47.59-macOS.dmg";
hash = "sha256-q6rNYr2wCN/a50fCZMxNiM2R7PKC+DBxJ5KJy9Wnb/Y=";
url = "https://downloads.slack-edge.com/desktop-releases/mac/arm64/4.47.72/Slack-4.47.72-macOS.dmg";
hash = "sha256-AihMQAjMMRWJftQOp9gnIC/df8nnrKnkpRym8sdtUkA=";
};
};
x86_64-darwin = {
version = "4.47.59";
version = "4.47.72";
src = fetchurl {
url = "https://downloads.slack-edge.com/desktop-releases/mac/x64/4.47.59/Slack-4.47.59-macOS.dmg";
hash = "sha256-CIESzdXIHeDelIos7ZW9Z2/mnrltk7o92oqS1yM2MnY=";
url = "https://downloads.slack-edge.com/desktop-releases/mac/x64/4.47.72/Slack-4.47.72-macOS.dmg";
hash = "sha256-H1Dqtlqz1FxDqq4iAZJsTkugLp+WVU9fKB+H19l+vug=";
};
};
x86_64-linux = {
version = "4.47.59";
version = "4.47.72";
src = fetchurl {
url = "https://downloads.slack-edge.com/desktop-releases/linux/x64/4.47.59/slack-desktop-4.47.59-amd64.deb";
hash = "sha256-R+WmtvIw6FLqsskG/hOdEdwZgsCZwWprGhbE7/Xpr1s=";
url = "https://downloads.slack-edge.com/desktop-releases/linux/x64/4.47.72/slack-desktop-4.47.72-amd64.deb";
hash = "sha256-o1WOTBG5u4jL+NGbTEZq+afM2UwUJZ0gtsWKsnsOkvE=";
};
};
}
+3 -3
View File
@@ -19,16 +19,16 @@ let
television = rustPlatform.buildRustPackage (finalAttrs: {
pname = "television";
version = "0.13.12";
version = "0.14.0";
src = fetchFromGitHub {
owner = "alexpasmantier";
repo = "television";
tag = finalAttrs.version;
hash = "sha256-zAaTVKSE0OBcrpg/XKXC8aY3NXawe9RbC4i6pPJK1Nw=";
hash = "sha256-3xzgLG4iHd4SvBgMu3MgpOPD0saVDaC8gXy+Y/wJ4q4=";
};
cargoHash = "sha256-ZUaaVVGZzxVDPltZ4B5UHQFU7lyuzRzoQ/2upwS7njQ=";
cargoHash = "sha256-3Ttar63EffTmU4pnwgZb/Zl9zIN9T9hAcV/uFUjypeQ=";
strictDeps = true;
nativeBuildInputs = [
+3 -3
View File
@@ -14,14 +14,14 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "ty";
version = "0.0.1-alpha.35";
version = "0.0.2";
src = fetchFromGitHub {
owner = "astral-sh";
repo = "ty";
tag = finalAttrs.version;
fetchSubmodules = true;
hash = "sha256-dx6zZnThnkQHQbi5SXkKCnpkfw2kcrRDg0QEvb4WBqk=";
hash = "sha256-4Kv3UUn2QbOOOaQ/uzJB2KOUx++Gb+cKpZg4kGx99Q0=";
};
# For Darwin platforms, remove the integration test for file notifications,
@@ -81,7 +81,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
);
passthru = {
updateScript = nix-update-script { extraArgs = [ "--version=unstable" ]; };
updateScript = nix-update-script { };
};
meta = {
+3 -3
View File
@@ -13,16 +13,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "xh";
version = "0.25.0";
version = "0.25.3";
src = fetchFromGitHub {
owner = "ducaale";
repo = "xh";
tag = "v${finalAttrs.version}";
hash = "sha256-UuWNLsJAoSjDPs/8VzW2vics3A/nsXWR5xmjMqTmYvQ=";
hash = "sha256-WRYClBIjw67lVrzvnIMqVHd6toi5yU7nClViqfXahKA=";
};
cargoHash = "sha256-SsJSBkOdQSpbEbFPK+qscSBePUKMLM1UpajpvpR2ZEo=";
cargoHash = "sha256-T2ZaijWXyH8ZJKFTTngGtQsdRWL9re4i3nKHp8srWSI=";
buildFeatures = lib.optional withNativeTls "native-tls";
+2 -2
View File
@@ -25,11 +25,11 @@ let
in
appimageTools.wrapType2 rec {
pname = "xnviewmp";
version = "1.9.7";
version = "1.9.8";
src = fetchurl {
url = "https://download.xnview.com/old_versions/XnView_MP/XnView_MP-${version}.glibc2.17-x86_64.AppImage";
hash = "sha256-PUV46AmzFBtBh361dS84rtZM5N7mKBG9aLkoyvz16R0=";
hash = "sha256-BO5gFVy2rKqK8Xwtvh9ZNY2XRgc/+ewNFUkKlFqK1KA=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -106,7 +106,7 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "zed-editor";
version = "0.216.1";
version = "0.217.1";
outputs = [
"out"
@@ -119,7 +119,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
owner = "zed-industries";
repo = "zed";
tag = "v${finalAttrs.version}";
hash = "sha256-7rLrPXnPvKTE4w9FYs4RHSs3wBbmwbaWtTdvC2iC6yY=";
hash = "sha256-4A2uiHeqnvJF1lLzUQsTMZ30v7iWp8MZTla5R1/AVFg=";
};
postPatch = ''
@@ -139,7 +139,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
rm -r $out/git/*/candle-book/
'';
cargoHash = "sha256-cnjLwoes71/M0vMB01dLBB7pujlVHT82hfQxwr/Z4XQ=";
cargoHash = "sha256-OsIau0R00zHWvaepXDyU3JMrMJUQbHdoYAilG95lvp4=";
nativeBuildInputs = [
cmake
+3 -3
View File
@@ -11,18 +11,18 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "zerofs";
version = "0.22.1";
version = "0.22.4";
src = fetchFromGitHub {
owner = "Barre";
repo = "ZeroFS";
tag = "v${finalAttrs.version}";
hash = "sha256-YdqZV8TdodSKP3h2Qa0+Xi7bfGKrtGq625Oco+UjIpU=";
hash = "sha256-17KYkB5TtD+JYXhLVj09gcvETlpG1yC/U2Ql04Ur57g=";
};
sourceRoot = "${finalAttrs.src.name}/zerofs";
cargoHash = "sha256-rPa8XmApLClhJ2oAQxEoQL2Hd+8QlJAOZVw+kzS70KY=";
cargoHash = "sha256-5Yn4aaYo34NnwSnZ5kVPMe0xfkvu9fGk9OHje9q1oLw=";
nativeBuildInputs = [ cmake ];
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "disposable-email-domains";
version = "0.0.152";
version = "0.0.153";
pyproject = true;
# No tags on GitHub
src = fetchPypi {
pname = "disposable_email_domains";
inherit version;
hash = "sha256-5F3ZC9tZ1cpX6qTvDm74bTEJQRYWEn1+QI0d04Yry8M=";
hash = "sha256-b4C/OKBMR48lJ5+e1Mx7PJO2ZvITvar213qYkrFnmV0=";
};
build-system = [
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "edge-tts";
version = "7.2.3";
version = "7.2.7";
pyproject = true;
src = fetchFromGitHub {
owner = "rany2";
repo = "edge-tts";
tag = version;
hash = "sha256-JnwfvSa60oEbSEyD6q88Ey6IyGOwVWO0T75VrUKZmos=";
hash = "sha256-KlQJ9U5RgifpqVKw5BrPwBFJYZHKibMUlyb3aX+4qf8=";
};
build-system = [
@@ -30,14 +30,14 @@
buildPythonPackage rec {
pname = "lance-namespace";
version = "0.2.1";
version = "0.3.2";
pyproject = true;
src = fetchFromGitHub {
owner = "lancedb";
repo = "lance-namespace";
tag = "v${version}";
hash = "sha256-1SCsKjFd//1y28eR5MC2/M7cIMTRa083iDyuvWxLekw=";
hash = "sha256-tBInz9BEl6u7E8cAmtlHBqIG65kifPR+iv5/jNV3204=";
};
sourceRoot = "${src.name}/python/lance_namespace";
@@ -21,14 +21,14 @@
buildPythonPackage rec {
pname = "unstructured-client";
version = "0.42.4";
version = "0.42.5";
pyproject = true;
src = fetchFromGitHub {
owner = "Unstructured-IO";
repo = "unstructured-python-client";
tag = "v${version}";
hash = "sha256-gSUjv6LghlrSkwFxUqrnFeSSL5V7ryxI0IPRWkEGZ84=";
hash = "sha256-BLzWdiDLY4VTeaZnbaleUYSHR9bs62pnos6jJpzHzIg=";
};
preBuild = ''
+1 -1
View File
@@ -1402,6 +1402,7 @@ mapAliases {
redpanda = throw "'redpanda' has been renamed to/replaced by 'redpanda-client'"; # Converted to throw 2025-10-27
redshift-plasma-applet = throw "'redshift-plasma-applet' has been removed as it is obsolete and lacks maintenance upstream."; # Added 2025-11-09
remotebox = throw "remotebox has been removed because it was unmaintained and broken for a long time"; # Added 2025-09-11
resp-app = throw "'resp-app' has been replaced by 'redisinsight'"; # Added 2025-12-17
responsively-app = throw "'responsively-app' has been removed due to lack of maintenance upstream."; # Added 2025-06-25
retroarchBare = throw "'retroarchBare' has been renamed to/replaced by 'retroarch-bare'"; # Converted to throw 2025-10-27
retroarchFull = throw "'retroarchFull' has been renamed to/replaced by 'retroarch-full'"; # Converted to throw 2025-10-27
@@ -1449,7 +1450,6 @@ mapAliases {
sequoia = throw "'sequoia' has been renamed to/replaced by 'sequoia-sq'"; # Converted to throw 2025-10-27
serverless = throw "'serverless' has been removed because version 3.x is unmaintained upstream and vulnerable, and version 4.x lacks a suitable binary or source download."; # Added 2025-11-22
session-desktop-appimage = throw "'session-desktop-appimage' has been renamed to/replaced by 'session-desktop'"; # Converted to throw 2025-10-27
setserial = throw "'setserial' has been removed as it had been abandoned upstream"; # Added 2025-05-18
sexp = throw "'sexp' has been renamed to/replaced by 'sexpp'"; # Converted to throw 2025-10-27
shadered = throw "shadered has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
shared_desktop_ontologies = throw "'shared_desktop_ontologies' has been removed as it had been abandoned upstream"; # Added 2025-11-09
-2
View File
@@ -13871,8 +13871,6 @@ with pkgs;
}
);
resp-app = libsForQt5.callPackage ../applications/misc/resp-app { };
pgadmin4-desktopmode = pgadmin4.override { server-mode = false; };
philipstv = with python3Packages; toPythonApplication philipstv;