Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'NixOS:master' into master
Browse files Browse the repository at this point in the history
prinzdezibel authored Dec 5, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents 807be0c + 839585c commit c018a96
Showing 36 changed files with 635 additions and 223 deletions.
12 changes: 12 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
@@ -537,6 +537,13 @@
githubId = 749381;
name = "Adam Tulinius";
};
adda = {
email = "[email protected]";
matrix = "@adda0:matrix.org";
github = "adda0";
githubId = 52529234;
name = "David Chocholatý";
};
addict3d = {
email = "[email protected]";
matrix = "@nbathum:matrix.org";
@@ -16804,6 +16811,11 @@
githubId = 686076;
name = "Vitalii Voloshyn";
};
pancaek = {
github = "pancaek";
githubId = 20342389;
name = "paneku";
};
panda2134 = {
email = "[email protected]";
github = "panda2134";
2 changes: 1 addition & 1 deletion nixos/modules/services/hardware/asusd.nix
Original file line number Diff line number Diff line change
@@ -88,7 +88,7 @@ in
"asusd/anime.ron" = maybeConfig "anime.ron" cfg.animeConfig;
"asusd/asusd.ron" = maybeConfig "asusd.ron" cfg.asusdConfig;
"asusd/aura.ron" = maybeConfig "aura.ron" cfg.auraConfig;
"asusd/profile.conf" = maybeConfig "profile.ron" cfg.profileConfig;
"asusd/profile.ron" = maybeConfig "profile.ron" cfg.profileConfig;
"asusd/fan_curves.ron" = maybeConfig "fan_curves.ron" cfg.fanCurvesConfig;
"asusd/asusd_user_ledmodes.ron" = maybeConfig "asusd_user_ledmodes.ron" cfg.userLedModesConfig;
};
7 changes: 7 additions & 0 deletions nixos/modules/services/monitoring/prometheus/exporters.nix
Original file line number Diff line number Diff line change
@@ -333,6 +333,13 @@ in
Config file specified in `services.prometheus.exporters.ipmi.webConfigFile' must
not reside within /tmp - it won't be visible to the systemd service.
'';
} {
assertion =
cfg.restic.enable -> ((cfg.restic.repository == null) != (cfg.restic.repositoryFile == null));
message = ''
Please specify either 'services.prometheus.exporters.restic.repository'
or 'services.prometheus.exporters.restic.repositoryFile'.
'';
} {
assertion = cfg.snmp.enable -> (
(cfg.snmp.configurationPath == null) != (cfg.snmp.configuration == null)
23 changes: 20 additions & 3 deletions nixos/modules/services/monitoring/prometheus/exporters/restic.nix
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@ let
mapAttrs'
splitString
toUpper
optional
optionalAttrs
nameValuePair
;
@@ -18,13 +19,22 @@ in
port = 9753;
extraOpts = {
repository = mkOption {
type = types.str;
type = with lib.types; nullOr str;
default = null;
description = ''
URI pointing to the repository to monitor.
'';
example = "sftp:[email protected]:/backups/example";
};

repositoryFile = mkOption {
type = with lib.types; nullOr path;
default = null;
description = ''
Path to the file containing the URI for the repository to monitor.
'';
};

passwordFile = mkOption {
type = types.path;
description = ''
@@ -103,13 +113,21 @@ in

serviceOpts = {
script = ''
export RESTIC_REPOSITORY=${
if cfg.repositoryFile != null
then "$(cat $CREDENTIALS_DIRECTORY/RESTIC_REPOSITORY)"
else "${cfg.repository}"
}
export RESTIC_PASSWORD_FILE=$CREDENTIALS_DIRECTORY/RESTIC_PASSWORD_FILE
${pkgs.prometheus-restic-exporter}/bin/restic-exporter.py \
${concatStringsSep " \\\n " cfg.extraFlags}
'';
serviceConfig = {
EnvironmentFile = mkIf (cfg.environmentFile != null) cfg.environmentFile;
LoadCredential = [ "RESTIC_PASSWORD_FILE:${cfg.passwordFile}" ];
LoadCredential =
[ "RESTIC_PASSWORD_FILE:${cfg.passwordFile}" ]
++ optional (cfg.repositoryFile != null)
[ "RESTIC_REPOSITORY:${cfg.repositoryFile}" ];
};
environment =
let
@@ -119,7 +137,6 @@ in
toRcloneVal = v: if lib.isBool v then lib.boolToString v else v;
in
{
RESTIC_REPOSITORY = cfg.repository;
LISTEN_ADDRESS = cfg.listenAddress;
LISTEN_PORT = toString cfg.port;
REFRESH_INTERVAL = toString cfg.refreshInterval;
4 changes: 2 additions & 2 deletions pkgs/applications/audio/qpwgraph/default.nix
Original file line number Diff line number Diff line change
@@ -13,14 +13,14 @@

stdenv.mkDerivation (finalAttrs: {
pname = "qpwgraph";
version = "0.7.9";
version = "0.8.0";

src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "rncbc";
repo = "qpwgraph";
rev = "v${finalAttrs.version}";
sha256 = "sha256-VEJbjrXSMERGUyfIo43hg7v/S7lRzzvQ4gmwlqOMgAQ=";
sha256 = "sha256-jB2mMLwJ1e/fIsf1R9Wd0stwp/RQH6f9pkF1qQX72Aw=";
};

nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
4 changes: 2 additions & 2 deletions pkgs/applications/audio/youtube-music/default.nix
Original file line number Diff line number Diff line change
@@ -78,8 +78,8 @@ stdenv.mkDerivation (finalAttrs: {
name = "youtube-music";
exec = "youtube-music %u";
icon = "youtube-music";
desktopName = "Youtube Music";
startupWMClass = "Youtube Music";
desktopName = "YouTube Music";
startupWMClass = "YouTube Music";
categories = [ "AudioVideo" ];
})
];
8 changes: 4 additions & 4 deletions pkgs/applications/virtualization/qemu/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, fetchpatch, python3Packages, zlib, pkg-config, glib, overrideSDK, buildPackages
, pixman, vde2, alsa-lib, flex, pcre2
, bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, dtc, ninja, meson
, bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, dtc, ninja, meson, perl
, sigtool
, makeWrapper, removeReferencesTo
, attr, libcap, libcap_ng, socat, libslirp
@@ -87,22 +87,22 @@ stdenv.mkDerivation (finalAttrs: {

nativeBuildInputs = [
makeWrapper removeReferencesTo
pkg-config flex bison meson ninja
pkg-config flex bison meson ninja perl

# Don't change this to python3 and python3.pkgs.*, breaks cross-compilation
python3Packages.python
]
++ lib.optionals gtkSupport [ wrapGAppsHook3 ]
++ lib.optionals enableDocs [ python3Packages.sphinx python3Packages.sphinx-rtd-theme ]
++ lib.optionals hexagonSupport [ glib ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool rez setfile ]
++ lib.optionals (!userOnly) [ dtc ];

buildInputs = [ glib zlib ]
++ lib.optionals (!minimal) [ dtc pixman vde2 lzo snappy libtasn1 gnutls nettle libslirp ]
++ lib.optionals (!userOnly) [ curl ]
++ lib.optionals ncursesSupport [ ncurses ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Cocoa Hypervisor Kernel rez setfile vmnet ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Cocoa Hypervisor Kernel vmnet ]
++ lib.optionals seccompSupport [ libseccomp ]
++ lib.optionals numaSupport [ numactl ]
++ lib.optionals alsaSupport [ alsa-lib ]
2 changes: 2 additions & 0 deletions pkgs/build-support/dotnet/add-nuget-deps/default.nix
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@
lib,
substituteAll,
nuget-to-nix,
nixfmt-rfc-style,
cacert,
fetchNupkg,
callPackage,
@@ -67,6 +68,7 @@ attrs
isExecutable = true;
inherit cacert;
nugetToNix = nuget-to-nix;
nixfmt = nixfmt-rfc-style;
};

defaultDepsFile =
2 changes: 2 additions & 0 deletions pkgs/build-support/dotnet/add-nuget-deps/fetch-deps.sh
Original file line number Diff line number Diff line change
@@ -7,5 +7,7 @@ genericBuild
@nugetToNix@/bin/nuget-to-nix "${NUGET_PACKAGES%/}"
) > deps.nix

@nixfmt@/bin/nixfmt deps.nix

mv deps.nix "$1"
echo "Succesfully wrote lockfile to $1"
6 changes: 3 additions & 3 deletions pkgs/by-name/bu/burpsuite/package.nix
Original file line number Diff line number Diff line change
@@ -9,20 +9,20 @@
}:

let
version = "2024.10.1";
version = "2024.11.1";

product =
if proEdition then
{
productName = "pro";
productDesktop = "Burp Suite Professional Edition";
hash = "sha256-r/j7nATyd8GbfoLNby5x1/5BVeRv5B/8Ri1fPUwaCoQ=";
hash = "sha256-T2mihC/E9P2ARDs3aN6Acg62W86zNR4rTjngriGl3aU=";
}
else
{
productName = "community";
productDesktop = "Burp Suite Community Edition";
hash = "sha256-uvX1LTe2slPINrn+ywY3nyu/K+FTczvsW/FnP0z43Q8=";
hash = "sha256-feTqtqnYtT7i+HtJAERcKK3QAdPkXm+JUtl6JZLEHJA=";
};

src = fetchurl {
29 changes: 29 additions & 0 deletions pkgs/by-name/fl/flirt/package.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
rustPlatform,
fetchFromSourcehut,
lib,
}:

rustPlatform.buildRustPackage rec {
pname = "flirt";
version = "0.2";

src = fetchFromSourcehut {
owner = "~hadronized";
repo = "flirt";
rev = "v${version}";
hash = "sha256-NV6UP7fPTcn0WrZwIfe1zuZW6hJDuxrfATM2Gpx0yr0=";
};

cargoHash = "sha256-gVtRU+tjwf3rTei/TjUFYSMvLB9g6gNeGYO+9NBxgYQ=";

meta = {
description = "FiLe InteRacT, the file interaction tool for your command line";
homepage = "https://git.sr.ht/~hadronized/flirt";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [
adda
];
mainProgram = "flirt";
};
}
Loading

0 comments on commit c018a96

Please sign in to comment.