Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-04-22 12:01:17 +00:00 committed by GitHub
commit 56aa87374a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
56 changed files with 262 additions and 180 deletions

View File

@ -185,6 +185,7 @@ rec {
pulseSupport = false; pulseSupport = false;
smbdSupport = false; smbdSupport = false;
seccompSupport = false; seccompSupport = false;
enableDocs = false;
hostCpuTargets = [ "${final.qemuArch}-linux-user" ]; hostCpuTargets = [ "${final.qemuArch}-linux-user" ];
}; };
wine = (pkgs.winePackagesFor "wine${toString final.parsed.cpu.bits}").minimal; wine = (pkgs.winePackagesFor "wine${toString final.parsed.cpu.bits}").minimal;

View File

@ -201,6 +201,7 @@ in
nativeMessagingHosts = mapAttrs (_: v: mkEnableOption (mdDoc v)) { nativeMessagingHosts = mapAttrs (_: v: mkEnableOption (mdDoc v)) {
browserpass = "Browserpass support"; browserpass = "Browserpass support";
bukubrow = "Bukubrow support"; bukubrow = "Bukubrow support";
euwebid = "Web eID support";
ff2mpv = "ff2mpv support"; ff2mpv = "ff2mpv support";
fxCast = "fx_cast support"; fxCast = "fx_cast support";
gsconnect = "GSConnect support"; gsconnect = "GSConnect support";
@ -217,6 +218,8 @@ in
extraPrefs = cfg.autoConfig; extraPrefs = cfg.autoConfig;
extraNativeMessagingHosts = with pkgs; optionals nmh.ff2mpv [ extraNativeMessagingHosts = with pkgs; optionals nmh.ff2mpv [
ff2mpv ff2mpv
] ++ optionals nmh.euwebid [
web-eid-app
] ++ optionals nmh.gsconnect [ ] ++ optionals nmh.gsconnect [
gnomeExtensions.gsconnect gnomeExtensions.gsconnect
] ++ optionals nmh.jabref [ ] ++ optionals nmh.jabref [
@ -230,6 +233,7 @@ in
nixpkgs.config.firefox = { nixpkgs.config.firefox = {
enableBrowserpass = nmh.browserpass; enableBrowserpass = nmh.browserpass;
enableBukubrow = nmh.bukubrow; enableBukubrow = nmh.bukubrow;
enableEUWebID = nmh.euwebid;
enableTridactylNative = nmh.tridactyl; enableTridactylNative = nmh.tridactyl;
enableUgetIntegrator = nmh.ugetIntegrator; enableUgetIntegrator = nmh.ugetIntegrator;
enableFXCastBridge = nmh.fxCast; enableFXCastBridge = nmh.fxCast;

View File

@ -185,6 +185,10 @@ in
assertion = cfg.loginAll -> cfg.target == null; assertion = cfg.loginAll -> cfg.target == null;
message = "iSCSI target name is set while login on all portals is enabled."; message = "iSCSI target name is set while login on all portals is enabled.";
} }
{
assertion = !config.boot.initrd.systemd.enable;
message = "systemd stage 1 does not support iscsi yet.";
}
]; ];
}; };
} }

View File

@ -17,6 +17,11 @@ with lib;
config = mkIf config.boot.growPartition { config = mkIf config.boot.growPartition {
assertions = [{
assertion = !config.boot.initrd.systemd.enable;
message = "systemd stage 1 does not support 'boot.growPartition' yet.";
}];
boot.initrd.extraUtilsCommands = '' boot.initrd.extraUtilsCommands = ''
copy_bin_and_libs ${pkgs.gawk}/bin/gawk copy_bin_and_libs ${pkgs.gawk}/bin/gawk
copy_bin_and_libs ${pkgs.gnused}/bin/sed copy_bin_and_libs ${pkgs.gnused}/bin/sed

View File

@ -2944,9 +2944,9 @@ let
value.source = "${cfg.units.${name}.unit}/${name}"; value.source = "${cfg.units.${name}.unit}/${name}";
}) (attrNames cfg.units)); }) (attrNames cfg.units));
commonOptions = { commonOptions = visible: {
systemd.network.enable = mkOption { enable = mkOption {
default = false; default = false;
type = types.bool; type = types.bool;
description = lib.mdDoc '' description = lib.mdDoc ''
@ -2954,31 +2954,35 @@ let
''; '';
}; };
systemd.network.links = mkOption { links = mkOption {
default = {}; default = {};
inherit visible;
type = with types; attrsOf (submodule [ { options = linkOptions; } ]); type = with types; attrsOf (submodule [ { options = linkOptions; } ]);
description = lib.mdDoc "Definition of systemd network links."; description = lib.mdDoc "Definition of systemd network links.";
}; };
systemd.network.netdevs = mkOption { netdevs = mkOption {
default = {}; default = {};
inherit visible;
type = with types; attrsOf (submodule [ { options = netdevOptions; } ]); type = with types; attrsOf (submodule [ { options = netdevOptions; } ]);
description = lib.mdDoc "Definition of systemd network devices."; description = lib.mdDoc "Definition of systemd network devices.";
}; };
systemd.network.networks = mkOption { networks = mkOption {
default = {}; default = {};
inherit visible;
type = with types; attrsOf (submodule [ { options = networkOptions; } networkConfig ]); type = with types; attrsOf (submodule [ { options = networkOptions; } networkConfig ]);
description = lib.mdDoc "Definition of systemd networks."; description = lib.mdDoc "Definition of systemd networks.";
}; };
systemd.network.config = mkOption { config = mkOption {
default = {}; default = {};
inherit visible;
type = with types; submodule [ { options = networkdOptions; } networkdConfig ]; type = with types; submodule [ { options = networkdOptions; } networkdConfig ];
description = lib.mdDoc "Definition of global systemd network config."; description = lib.mdDoc "Definition of global systemd network config.";
}; };
systemd.network.units = mkOption { units = mkOption {
description = lib.mdDoc "Definition of networkd units."; description = lib.mdDoc "Definition of networkd units.";
default = {}; default = {};
internal = true; internal = true;
@ -2991,7 +2995,7 @@ let
})); }));
}; };
systemd.network.wait-online = { wait-online = {
enable = mkOption { enable = mkOption {
type = types.bool; type = types.bool;
default = true; default = true;
@ -3225,8 +3229,9 @@ let
in in
{ {
options = commonOptions // { options = {
boot.initrd = commonOptions; systemd.network = commonOptions true;
boot.initrd.systemd.network = commonOptions "shallow";
}; };
config = mkMerge [ config = mkMerge [

View File

@ -1,4 +1,4 @@
{ lib, config, utils, pkgs, ... }: { lib, options, config, utils, pkgs, ... }:
with lib; with lib;
@ -126,18 +126,20 @@ in {
options.boot.initrd.systemd = { options.boot.initrd.systemd = {
enable = mkEnableOption (lib.mdDoc "systemd in initrd") // { enable = mkEnableOption (lib.mdDoc "systemd in initrd") // {
description = lib.mdDoc '' description = lib.mdDoc ''
Whether to enable systemd in initrd. Whether to enable systemd in initrd. The unit options such as
{option}`boot.initrd.systemd.services` are the same as their
stage 2 counterparts such as {option}`systemd.services`,
except that `restartTriggers` and `reloadTriggers` are not
supported.
Note: This is in very early development and is highly Note: This is experimental. Some of the `boot.initrd` options
experimental. Most of the features NixOS supports in initrd are are not supported when this is enabled, and the options under
not yet supported by the intrd generated with this option. `boot.initrd.systemd` are subject to change.
''; '';
}; };
package = (mkPackageOptionMD pkgs "systemd" { package = mkPackageOptionMD pkgs "systemd" {
default = "systemdStage1"; default = "systemdStage1";
}) // {
visible = false;
}; };
extraConfig = mkOption { extraConfig = mkOption {
@ -167,7 +169,6 @@ in {
"/etc/hostname".text = "mymachine"; "/etc/hostname".text = "mymachine";
} }
''; '';
visible = false;
default = {}; default = {};
type = utils.systemdUtils.types.initrdContents; type = utils.systemdUtils.types.initrdContents;
}; };
@ -217,7 +218,6 @@ in {
emergencyAccess = mkOption { emergencyAccess = mkOption {
type = with types; oneOf [ bool (nullOr (passwdEntry str)) ]; type = with types; oneOf [ bool (nullOr (passwdEntry str)) ];
visible = false;
description = lib.mdDoc '' description = lib.mdDoc ''
Set to true for unauthenticated emergency access, and false for Set to true for unauthenticated emergency access, and false for
no emergency access. no emergency access.
@ -231,7 +231,6 @@ in {
initrdBin = mkOption { initrdBin = mkOption {
type = types.listOf types.package; type = types.listOf types.package;
default = []; default = [];
visible = false;
description = lib.mdDoc '' description = lib.mdDoc ''
Packages to include in /bin for the stage 1 emergency shell. Packages to include in /bin for the stage 1 emergency shell.
''; '';
@ -240,7 +239,6 @@ in {
additionalUpstreamUnits = mkOption { additionalUpstreamUnits = mkOption {
default = [ ]; default = [ ];
type = types.listOf types.str; type = types.listOf types.str;
visible = false;
example = [ "debug-shell.service" "systemd-quotacheck.service" ]; example = [ "debug-shell.service" "systemd-quotacheck.service" ];
description = lib.mdDoc '' description = lib.mdDoc ''
Additional units shipped with systemd that shall be enabled. Additional units shipped with systemd that shall be enabled.
@ -251,7 +249,6 @@ in {
default = [ ]; default = [ ];
type = types.listOf types.str; type = types.listOf types.str;
example = [ "systemd-backlight@.service" ]; example = [ "systemd-backlight@.service" ];
visible = false;
description = lib.mdDoc '' description = lib.mdDoc ''
A list of units to skip when generating system systemd configuration directory. This has A list of units to skip when generating system systemd configuration directory. This has
priority over upstream units, {option}`boot.initrd.systemd.units`, and priority over upstream units, {option}`boot.initrd.systemd.units`, and
@ -264,13 +261,12 @@ in {
units = mkOption { units = mkOption {
description = lib.mdDoc "Definition of systemd units."; description = lib.mdDoc "Definition of systemd units.";
default = {}; default = {};
visible = false; visible = "shallow";
type = systemdUtils.types.units; type = systemdUtils.types.units;
}; };
packages = mkOption { packages = mkOption {
default = []; default = [];
visible = false;
type = types.listOf types.package; type = types.listOf types.package;
example = literalExpression "[ pkgs.systemd-cryptsetup-generator ]"; example = literalExpression "[ pkgs.systemd-cryptsetup-generator ]";
description = lib.mdDoc "Packages providing systemd units and hooks."; description = lib.mdDoc "Packages providing systemd units and hooks.";
@ -278,7 +274,7 @@ in {
targets = mkOption { targets = mkOption {
default = {}; default = {};
visible = false; visible = "shallow";
type = systemdUtils.types.initrdTargets; type = systemdUtils.types.initrdTargets;
description = lib.mdDoc "Definition of systemd target units."; description = lib.mdDoc "Definition of systemd target units.";
}; };
@ -286,35 +282,35 @@ in {
services = mkOption { services = mkOption {
default = {}; default = {};
type = systemdUtils.types.initrdServices; type = systemdUtils.types.initrdServices;
visible = false; visible = "shallow";
description = lib.mdDoc "Definition of systemd service units."; description = lib.mdDoc "Definition of systemd service units.";
}; };
sockets = mkOption { sockets = mkOption {
default = {}; default = {};
type = systemdUtils.types.initrdSockets; type = systemdUtils.types.initrdSockets;
visible = false; visible = "shallow";
description = lib.mdDoc "Definition of systemd socket units."; description = lib.mdDoc "Definition of systemd socket units.";
}; };
timers = mkOption { timers = mkOption {
default = {}; default = {};
type = systemdUtils.types.initrdTimers; type = systemdUtils.types.initrdTimers;
visible = false; visible = "shallow";
description = lib.mdDoc "Definition of systemd timer units."; description = lib.mdDoc "Definition of systemd timer units.";
}; };
paths = mkOption { paths = mkOption {
default = {}; default = {};
type = systemdUtils.types.initrdPaths; type = systemdUtils.types.initrdPaths;
visible = false; visible = "shallow";
description = lib.mdDoc "Definition of systemd path units."; description = lib.mdDoc "Definition of systemd path units.";
}; };
mounts = mkOption { mounts = mkOption {
default = []; default = [];
type = systemdUtils.types.initrdMounts; type = systemdUtils.types.initrdMounts;
visible = false; visible = "shallow";
description = lib.mdDoc '' description = lib.mdDoc ''
Definition of systemd mount units. Definition of systemd mount units.
This is a list instead of an attrSet, because systemd mandates the names to be derived from This is a list instead of an attrSet, because systemd mandates the names to be derived from
@ -325,7 +321,7 @@ in {
automounts = mkOption { automounts = mkOption {
default = []; default = [];
type = systemdUtils.types.automounts; type = systemdUtils.types.automounts;
visible = false; visible = "shallow";
description = lib.mdDoc '' description = lib.mdDoc ''
Definition of systemd automount units. Definition of systemd automount units.
This is a list instead of an attrSet, because systemd mandates the names to be derived from This is a list instead of an attrSet, because systemd mandates the names to be derived from
@ -336,12 +332,31 @@ in {
slices = mkOption { slices = mkOption {
default = {}; default = {};
type = systemdUtils.types.slices; type = systemdUtils.types.slices;
visible = false; visible = "shallow";
description = lib.mdDoc "Definition of slice configurations."; description = lib.mdDoc "Definition of slice configurations.";
}; };
}; };
config = mkIf (config.boot.initrd.enable && cfg.enable) { config = mkIf (config.boot.initrd.enable && cfg.enable) {
assertions = map (name: {
assertion = config.boot.initrd.${name} == "";
message = ''
systemd stage 1 does not support 'boot.initrd.${name}'. Please
convert it to analogous systemd units in 'boot.initrd.systemd'.
Definitions:
${lib.concatMapStringsSep "\n" ({ file, ... }: "- ${file}") options.boot.initrd.${name}.definitionsWithLocations}
'';
}) [
"preFailCommands"
"preDeviceCommands"
"preLVMCommands"
"postDeviceCommands"
"postMountCommands"
"extraUtilsCommands"
"extraUtilsCommandsTest"
];
system.build = { inherit initialRamdisk; }; system.build = { inherit initialRamdisk; };
boot.initrd.availableKernelModules = [ boot.initrd.availableKernelModules = [

View File

@ -32,13 +32,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "musikcube"; pname = "musikcube";
version = "0.99.7"; version = "3.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "clangen"; owner = "clangen";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-bsvq48zTNafsQGFXVApCEWIL8H2RXiowalEu/W3DUu0="; hash = "sha512-W+Zug1SiOGJ+o6FBf2jeDGHFj87vudR4drtjyXiOzdoM8fUCnCj4pp7+70eZGilg6CvBi7CYkbVn53LXJf5qWA==";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -86,9 +86,9 @@ stdenv.mkDerivation rec {
''; '';
meta = with lib; { meta = with lib; {
description = "A fully functional terminal-based music player, library, and streaming audio server"; description = "Terminal-based music player, library, and streaming audio server";
homepage = "https://musikcube.com/"; homepage = "https://musikcube.com/";
maintainers = with maintainers; [ aanderse srapenne ]; maintainers = with maintainers; [ aanderse srapenne afh ];
license = licenses.bsd3; license = licenses.bsd3;
platforms = platforms.all; platforms = platforms.all;
}; };

View File

@ -5,7 +5,7 @@
## various stuff that can be plugged in ## various stuff that can be plugged in
, ffmpeg_5, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify, opensc , ffmpeg_5, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify, opensc
, gnome/*.gnome-shell*/ , gnome/*.gnome-shell*/
, browserpass, gnome-browser-connector, uget-integrator, plasma5Packages, bukubrow, pipewire , browserpass, gnome-browser-connector, uget-integrator, plasma5Packages, bukubrow, web-eid-app, pipewire
, tridactyl-native , tridactyl-native
, fx_cast_bridge , fx_cast_bridge
, udev , udev
@ -65,6 +65,7 @@ let
[ ] [ ]
++ lib.optional (cfg.enableBrowserpass or false) (lib.getBin browserpass) ++ lib.optional (cfg.enableBrowserpass or false) (lib.getBin browserpass)
++ lib.optional (cfg.enableBukubrow or false) bukubrow ++ lib.optional (cfg.enableBukubrow or false) bukubrow
++ lib.optional (cfg.enableEUWebID or false) web-eid-app
++ lib.optional (cfg.enableTridactylNative or false) tridactyl-native ++ lib.optional (cfg.enableTridactylNative or false) tridactyl-native
++ lib.optional (cfg.enableGnomeExtensions or false) gnome-browser-connector ++ lib.optional (cfg.enableGnomeExtensions or false) gnome-browser-connector
++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator

View File

@ -7,16 +7,16 @@
buildGoModule rec { buildGoModule rec {
pname = "cloudflared"; pname = "cloudflared";
version = "2023.4.0"; version = "2023.4.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cloudflare"; owner = "cloudflare";
repo = "cloudflared"; repo = "cloudflared";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-+lmSztMstz8tYFP9rPmh99bkbCVea6wbiCrpbJUI/qc="; hash = "sha256-PG2+rEn3X1EdMUDbfrtfEjYclErMGAGTcP2g7Jz+s1A=";
}; };
vendorSha256 = null; vendorHash = null;
ldflags = [ ldflags = [
"-s" "-s"

View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "civo"; pname = "civo";
version = "1.0.48"; version = "1.0.49";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "civo"; owner = "civo";
repo = "cli"; repo = "cli";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-KoW+XKEFoe2QNJPu97MYYZnxbU0Wat8slJjQm/vtmew="; sha256 = "sha256-j9fnOM7OLnu42LM/LaO/Sw9TJtPFHjAC+QzqywbxKKo=";
}; };
vendorHash = "sha256-QzTu6/iFK+CS8UXoXSVq3OTuwk/xcHnAX4UpCU/Scpk="; vendorHash = "sha256-7I4V4DVdHSvr/1ic/YT+Vttreg0tFasRNT/aFe4/0OY=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View File

@ -73,11 +73,11 @@
"vendorHash": "sha256-DqAHkNxfI1txtW9PadHzgWuRCiuV/CVqq/qba+e0O7M=" "vendorHash": "sha256-DqAHkNxfI1txtW9PadHzgWuRCiuV/CVqq/qba+e0O7M="
}, },
"argocd": { "argocd": {
"hash": "sha256-IDPX+j9bxQGoBpG/XpLpsFx48iDLcCUzDso08xAsOf0=", "hash": "sha256-3WhbyMqIlncD7UmmfJBFrb9FmmbC/a4CWesmjo0jzoU=",
"homepage": "https://registry.terraform.io/providers/oboukili/argocd", "homepage": "https://registry.terraform.io/providers/oboukili/argocd",
"owner": "oboukili", "owner": "oboukili",
"repo": "terraform-provider-argocd", "repo": "terraform-provider-argocd",
"rev": "v5.1.0", "rev": "v5.2.0",
"spdx": "MPL-2.0", "spdx": "MPL-2.0",
"vendorHash": "sha256-mKefDPwWPlUleoAkJpTvJwQeOb7pA80cZQ7fpwir6kk=" "vendorHash": "sha256-mKefDPwWPlUleoAkJpTvJwQeOb7pA80cZQ7fpwir6kk="
}, },
@ -182,13 +182,13 @@
"vendorHash": "sha256-dm+2SseBeS49/QoepRwJ1VFwPCtU+6VymvyEH/sLkvI=" "vendorHash": "sha256-dm+2SseBeS49/QoepRwJ1VFwPCtU+6VymvyEH/sLkvI="
}, },
"buildkite": { "buildkite": {
"hash": "sha256-gITbMnNrqkef+giXXm9RVSLZJdWpKkqPT0rifF+0l1U=", "hash": "sha256-/LTUDnE5XB8Gwbs+CroJW+3pM7opNSVQFWvRQWQjFqc=",
"homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite",
"owner": "buildkite", "owner": "buildkite",
"repo": "terraform-provider-buildkite", "repo": "terraform-provider-buildkite",
"rev": "v0.15.0", "rev": "v0.16.0",
"spdx": "MIT", "spdx": "MIT",
"vendorHash": "sha256-X79ZrkKWhbyozSr3fhMmIRKZnB5dY/T1oQ7haaXuhEI=" "vendorHash": "sha256-ZXjmR1maiiLeWipXGOAGfLEuot9TsrzAX4EPRNQ5Gbo="
}, },
"checkly": { "checkly": {
"hash": "sha256-tdimESlkfRO/kdA6JOX72vQNXFLJZ9VKwPRxsJo5WFI=", "hash": "sha256-tdimESlkfRO/kdA6JOX72vQNXFLJZ9VKwPRxsJo5WFI=",
@ -300,11 +300,11 @@
"vendorHash": "sha256-BpXhKjfxyCLdGRHn1GexW0MoLj4/C6Bn7scZ76JARxQ=" "vendorHash": "sha256-BpXhKjfxyCLdGRHn1GexW0MoLj4/C6Bn7scZ76JARxQ="
}, },
"digitalocean": { "digitalocean": {
"hash": "sha256-fnABnzEMDJBzUl6/K1rgWdW4oCqrKZ+3RSXVvT1sHVk=", "hash": "sha256-n3aem1oP5Pzd5J4Xot7HtixNhdXqKBeGRp8k79bEfr4=",
"homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean", "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean",
"owner": "digitalocean", "owner": "digitalocean",
"repo": "terraform-provider-digitalocean", "repo": "terraform-provider-digitalocean",
"rev": "v2.27.1", "rev": "v2.28.0",
"spdx": "MPL-2.0", "spdx": "MPL-2.0",
"vendorHash": null "vendorHash": null
}, },
@ -327,13 +327,13 @@
"vendorHash": "sha256-wx8BXlobu86Nk9D8o5loKhbO14ANI+shFQ2i7jswKgE=" "vendorHash": "sha256-wx8BXlobu86Nk9D8o5loKhbO14ANI+shFQ2i7jswKgE="
}, },
"dnsimple": { "dnsimple": {
"hash": "sha256-d3kbHf17dBnQC5FOCcqGeZ/6+qV1pxvEJ9IZwXoodFc=", "hash": "sha256-I5TUhq8OZqcLQs/jr8LB22Uc9s5M/WH9LRzV8EsgRnc=",
"homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple", "homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple",
"owner": "dnsimple", "owner": "dnsimple",
"repo": "terraform-provider-dnsimple", "repo": "terraform-provider-dnsimple",
"rev": "v1.0.0", "rev": "v1.1.0",
"spdx": "MPL-2.0", "spdx": "MPL-2.0",
"vendorHash": "sha256-LXRNq5nxoZ6xZdKioT6cjyLaYChRAN28PzKsJ5BRako=" "vendorHash": "sha256-2FZWc+i4mSLDo143CULLmsVhjs2otN8bSqcfZROZPTM="
}, },
"docker": { "docker": {
"hash": "sha256-UyHOI8C0eDV5YllAi9clHp/CEldHjIp3FHHMPy1rK58=", "hash": "sha256-UyHOI8C0eDV5YllAi9clHp/CEldHjIp3FHHMPy1rK58=",
@ -593,13 +593,13 @@
"vendorHash": null "vendorHash": null
}, },
"jetstream": { "jetstream": {
"hash": "sha256-XFJo01AK5UCraIzi/KkOoVbZznJwaA8BrRAIomK3U7Q=", "hash": "sha256-CFjgF02JZJ072mAMvRnObaq3t+SPeT2uXqkRvlRrG5c=",
"homepage": "https://registry.terraform.io/providers/nats-io/jetstream", "homepage": "https://registry.terraform.io/providers/nats-io/jetstream",
"owner": "nats-io", "owner": "nats-io",
"repo": "terraform-provider-jetstream", "repo": "terraform-provider-jetstream",
"rev": "v0.0.34", "rev": "v0.0.35",
"spdx": "Apache-2.0", "spdx": "Apache-2.0",
"vendorHash": "sha256-vSIeSEzyJQzh9Aid/FWsF4xDYXMOhbsaLQ31mtfH7/Y=" "vendorHash": "sha256-OMDMpL9ox6tI9tkoSU0oVuFzRObmUGgGQy6RtsNbyIg="
}, },
"kafka": { "kafka": {
"hash": "sha256-IG0xgMs0j2jRJBa52Wsx7/r4s9DRnw5b+AfYpZAewxI=", "hash": "sha256-IG0xgMs0j2jRJBa52Wsx7/r4s9DRnw5b+AfYpZAewxI=",
@ -1044,13 +1044,13 @@
"vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8=" "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8="
}, },
"spotinst": { "spotinst": {
"hash": "sha256-+vETa0dX9iHgif8Q0dePEQp0JK9XJ+ACEyrR7LlSJT8=", "hash": "sha256-A9YPAIVH7kNQSirvxZYr8L1N4W5b/AJwWmatt3b/vBk=",
"homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
"owner": "spotinst", "owner": "spotinst",
"repo": "terraform-provider-spotinst", "repo": "terraform-provider-spotinst",
"rev": "v1.112.0", "rev": "v1.113.0",
"spdx": "MPL-2.0", "spdx": "MPL-2.0",
"vendorHash": "sha256-HX9UrtefNIVfsREJq6NiV4Zy/PjweQXmVP6HFygwX7s=" "vendorHash": "sha256-pN1GVA63sYs52IKkQ/jfeDOzAlH0fN9a9ZCgRjrQ+8E="
}, },
"stackpath": { "stackpath": {
"hash": "sha256-7KQUddq+M35WYyAIAL8sxBjAaXFcsczBRO1R5HURUZg=", "hash": "sha256-7KQUddq+M35WYyAIAL8sxBjAaXFcsczBRO1R5HURUZg=",
@ -1098,20 +1098,20 @@
"vendorHash": "sha256-GkmUKSnqkabwGCl22/90529BWb0oJaIJHYHlS/h3KNY=" "vendorHash": "sha256-GkmUKSnqkabwGCl22/90529BWb0oJaIJHYHlS/h3KNY="
}, },
"tencentcloud": { "tencentcloud": {
"hash": "sha256-soskWCOJaPzm2m2ocv3N8hb52Jz/T3xw/sW9hCSsf2s=", "hash": "sha256-kIsH+kp+fnYsZatEJOH51lUdQs9cq/8FtpXHZIRzSM0=",
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
"owner": "tencentcloudstack", "owner": "tencentcloudstack",
"repo": "terraform-provider-tencentcloud", "repo": "terraform-provider-tencentcloud",
"rev": "v1.80.4", "rev": "v1.80.5",
"spdx": "MPL-2.0", "spdx": "MPL-2.0",
"vendorHash": null "vendorHash": null
}, },
"tfe": { "tfe": {
"hash": "sha256-y2QBMxn8sXwtL1wASypbARLn80T2eVJuawoQ0XQlK38=", "hash": "sha256-GQPp7od9KM8x82qg88JIITnkMMUzTAEDWeVX2VujKfM=",
"homepage": "https://registry.terraform.io/providers/hashicorp/tfe", "homepage": "https://registry.terraform.io/providers/hashicorp/tfe",
"owner": "hashicorp", "owner": "hashicorp",
"repo": "terraform-provider-tfe", "repo": "terraform-provider-tfe",
"rev": "v0.44.0", "rev": "v0.44.1",
"spdx": "MPL-2.0", "spdx": "MPL-2.0",
"vendorHash": "sha256-vKIbswlWQUIPeaFRAMPGygM/UlWiRIr66NuTNfnpGpc=" "vendorHash": "sha256-vKIbswlWQUIPeaFRAMPGygM/UlWiRIr66NuTNfnpGpc="
}, },

View File

@ -27,6 +27,7 @@
, tpmSupport ? true , tpmSupport ? true
, uringSupport ? stdenv.isLinux, liburing , uringSupport ? stdenv.isLinux, liburing
, canokeySupport ? false, canokey-qemu , canokeySupport ? false, canokey-qemu
, enableDocs ? true
, hostCpuOnly ? false , hostCpuOnly ? false
, hostCpuTargets ? (if hostCpuOnly , hostCpuTargets ? (if hostCpuOnly
then (lib.optional stdenv.isx86_64 "i386-softmmu" then (lib.optional stdenv.isx86_64 "i386-softmmu"
@ -147,7 +148,7 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--disable-strip" # We'll strip ourselves after separating debug info. "--disable-strip" # We'll strip ourselves after separating debug info.
"--enable-docs" (lib.enableFeature enableDocs "docs")
"--enable-tools" "--enable-tools"
"--localstatedir=/var" "--localstatedir=/var"
"--sysconfdir=/etc" "--sysconfdir=/etc"

View File

@ -1,35 +1,24 @@
{ lib, stdenv, fetchFromGitHub, SDL_compat }: { lib, stdenv, fetchFromGitHub, SDL_compat, libX11, libXext }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rvvm"; pname = "rvvm";
version = "unstable-2023-01-25"; version = "0.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "LekKit"; owner = "LekKit";
repo = "RVVM"; repo = "RVVM";
rev = "4de27d7083db34bd074b4f056d6eb3871ccf5c10"; rev = "v${version}";
sha256 = "sha256-FjEcXfweL6FzA6iLxl9XnKaD4Fh/wZuRTJzZzHkc/B4="; sha256 = "sha256-1wAKijRYB0FGBe4cSHUynkO4ePVG4QvVIgSoWzNbqtE=";
}; };
buildInputs = [ SDL_compat ]; buildInputs = if stdenv.isDarwin then [ SDL_compat ] else [ libX11 libXext ];
makeFlags = buildFlags = [ "all" "lib" ];
[ "BUILDDIR=out" "BINARY=rvvm" "USE_SDL=1" "GIT_COMMIT=${src.rev}" "all" "lib" ]
makeFlags = [ "PREFIX=$(out)" ]
# work around https://github.com/NixOS/nixpkgs/issues/19098 # work around https://github.com/NixOS/nixpkgs/issues/19098
++ lib.optional (stdenv.cc.isClang && stdenv.isDarwin) "CFLAGS=-fno-lto"; ++ lib.optional (stdenv.cc.isClang && stdenv.isDarwin) "CFLAGS=-fno-lto";
installPhase = ''
runHook preInstall
install -d $out/{bin,lib,include/devices}
install -m755 out/rvvm -t $out/bin
install -m755 out/librvvm.{a,so} -t $out/lib
install -m644 src/rvvmlib.h -t $out/include
install -m644 src/devices/*.h -t $out/include/devices
runHook postInstall
'';
meta = with lib; { meta = with lib; {
homepage = "https://github.com/LekKit/RVVM"; homepage = "https://github.com/LekKit/RVVM";
description = "The RISC-V Virtual Machine"; description = "The RISC-V Virtual Machine";

View File

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "spleen"; pname = "spleen";
version = "1.9.2"; version = "1.9.3";
src = fetchurl { src = fetchurl {
url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"; url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz";
hash = "sha256-AOGgGJLye0Yg3QTlNZPgRdtRim8atn+ZIm8aPpUnivY="; hash = "sha256-t60e2wKl3a0RfKlPAm64RQtRUE0ugbw6A4deEtTnayU=";
}; };
nativeBuildInputs = [ xorg.mkfontscale ]; nativeBuildInputs = [ xorg.mkfontscale ];

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "v2ray-geoip"; pname = "v2ray-geoip";
version = "202304130041"; version = "202304200041";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "v2fly"; owner = "v2fly";
repo = "geoip"; repo = "geoip";
rev = "0d55816db7bb2489333f38d05e30500a9730bd0b"; rev = "7869655f0a2c9fd81d04e091b1c2657029b6e1f9";
sha256 = "sha256-W/Fcx282YWmxq+kVm5OxgC5a4mJhe0s0/NTROPJGGrw="; sha256 = "sha256-pgQU8gLErC9zo/GtwxHC2+4svFsxkgceV3IZPovVMo4=";
}; };
installPhase = '' installPhase = ''

View File

@ -19,13 +19,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "lobster"; pname = "lobster";
version = "2021.3"; version = "2023.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aardappel"; owner = "aardappel";
repo = "lobster"; repo = "lobster";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-ENs2Jy2l6fogZdCSaIyfV9wQm57qaZfx5HVHOnQBrRk="; sha256 = "sha256-/TVVdBDVx+3ySqa4MrRHFadLkvVhOY0+lw/yGy/X9W8=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

View File

@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-tJuuHSO81gV6gsT/5WE/nNDLz9HpQOnYTEv+nfCowFM="; sha256 = "sha256-tJuuHSO81gV6gsT/5WE/nNDLz9HpQOnYTEv+nfCowFM=";
}; };
enableParallelBuilding = true;
buildInputs = [ boost gputils texinfo zlib ]; buildInputs = [ boost gputils texinfo zlib ];
nativeBuildInputs = [ autoconf bison flex ]; nativeBuildInputs = [ autoconf bison flex ];

View File

@ -2,10 +2,10 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "apache-activemq"; pname = "apache-activemq";
version = "5.17.3"; version = "5.18.1";
src = fetchurl { src = fetchurl {
sha256 = "sha256-pMxMOi8TZwfCxpbzuz7iqG2+/xueteI3sU7cDF5aMo8="; sha256 = "sha256-/t173pr1urrrByv3rrIGXZAhwmFj3tY5yHoy1nN5VHI=";
url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz";
}; };

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "actor-framework"; pname = "actor-framework";
version = "0.18.7"; version = "0.19.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "actor-framework"; owner = "actor-framework";
repo = "actor-framework"; repo = "actor-framework";
rev = version; rev = version;
hash = "sha256-y1RE6AnyOrUN/z4md/xjlVwlIcL97ZEcKEOf8ZsCf+U="; hash = "sha256-pGX8BjDupJb7rmaxig0XX9RCKiIw2GjM4TVmcB5HJ+I=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

View File

@ -11,14 +11,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aioruuvigateway"; pname = "aioruuvigateway";
version = "0.0.2"; version = "0.1.0";
format = "pyproject"; format = "pyproject";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "akx"; owner = "akx";
repo = "aioruuvigateway"; repo = "aioruuvigateway";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-oT5Tlmi9bevOkcVZqg/xvCckIpN7TjbPVQefo9z1RDM="; hash = "sha256-Etv+kPFYEK79hpDeNmDfuyNj1vJ6udry1u+TRO5gLV4=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -9,7 +9,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aioshelly"; pname = "aioshelly";
version = "5.3.1"; version = "5.3.2";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs"; owner = "home-assistant-libs";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-a8zU3xHnYRmoiNiXlCUgrqgVINbhUWkPKGGsHkgHo4w="; hash = "sha256-eqZyCQ96CasBlO++QcQ/HiVWWeB2jQltHXZRbIfub7Q=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -7,7 +7,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "arc4"; pname = "arc4";
version = "0.3.0"; version = "0.4.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "manicmaniac"; owner = "manicmaniac";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-z8zj46/xX/gXtWzlmnHuAsnK3xYCL4NM5/xpYcH+Qlo="; hash = "sha256-DlZIygf5v3ZNY2XFmrKOA15ccMo3Rv0kf6hZJ0CskeQ=";
}; };
nativeCheckInputs = [ nativeCheckInputs = [

View File

@ -8,14 +8,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "atenpdu"; pname = "atenpdu";
version = "0.5.0"; version = "0.6.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-uUi6NtiHt3wWU4hrC6RNVEDBcoBCgkpwKyePq1VxO0c="; hash = "sha256-E/cRjbispHiS38BdIvOKD4jOFrDmpx8L4eAlMV8Re70=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -12,14 +12,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "crate"; pname = "crate";
version = "0.31.0"; version = "0.31.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-HhncnVmUXyHLaLkhIFS89NnKoSY42C1GipOqurIsoZ4="; hash = "sha256-SYjzyPqKR6BpC5z3P/ASDXe0mwi8Hz413b8Fm7cc5zo=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -21,7 +21,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "mautrix"; pname = "mautrix";
version = "0.19.11"; version = "0.19.12";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "mautrix"; owner = "mautrix";
repo = "python"; repo = "python";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-FomD7FecY/FGPxnhqENeerGejnpBkjQSlMpZKNhUylI="; hash = "sha256-XG2uAG5sKGGtnCTQJ2gsAm7jxtvMg+1MXPJLkb+2cPQ=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -2,6 +2,7 @@
, buildPythonPackage , buildPythonPackage
, cssselect , cssselect
, fetchPypi , fetchPypi
, jmespath
, lxml , lxml
, packaging , packaging
, psutil , psutil
@ -12,14 +13,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "parsel"; pname = "parsel";
version = "1.7.0"; version = "1.8.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-AlQTPLAwTeE/zEhXu4IU/3DWmIcnYfpr6DdOG7vVgZI="; hash = "sha256-r/KOaMmz8akB2ypOPxWNhICjhyTXMo7nUcGk4cGAHjk=";
}; };
postPatch = '' postPatch = ''
@ -29,6 +30,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
cssselect cssselect
jmespath
lxml lxml
packaging packaging
w3lib w3lib

View File

@ -9,14 +9,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pysml"; pname = "pysml";
version = "0.0.9"; version = "0.0.10";
format = "pyproject"; format = "pyproject";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mtdcr"; owner = "mtdcr";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-pUbRttH/ksYcE1qZJAQWhuKk4+40w5xsul0TTqq1g3s="; hash = "sha256-vC4iff38WCcdUQITPmxC0XlrA83zCNLTDGgyyXivLEY=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -54,7 +54,7 @@ let
LIBTOOL = lib.optionalString stdenv.isDarwin "${cctools}/bin/libtool"; LIBTOOL = lib.optionalString stdenv.isDarwin "${cctools}/bin/libtool";
fetchAttrs = { fetchAttrs = {
sha256 = "sha256-9i0ExaIeNz7+ddNAoU2ak8JY7lI2aY6eBDiPzJYuJUk="; sha256 = "sha256-kEiwwYAUABcINdSaAyRDSFKtKLPj3axdNvXvkI1k0Uo=";
}; };
buildAttrs = { buildAttrs = {

View File

@ -8,7 +8,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "yara-python"; pname = "yara-python";
version = "4.3.0"; version = "4.3.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "VirusTotal"; owner = "VirusTotal";
repo = "yara-python"; repo = "yara-python";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-r1qsD5PquOVDEVmrgU2QP5bZpsuZuKlfaaHUjY4AHy4="; hash = "sha256-WjH27pOOBXmbj8ghr42TLTp8eAKiTq4eRTYnim56J/8=";
}; };
buildInputs = [ buildInputs = [

View File

@ -10,7 +10,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "youtube-transcript-api"; pname = "youtube-transcript-api";
version = "0.5.0"; version = "0.6.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "jdepoix"; owner = "jdepoix";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-oTKvJt6tyv/ESJ5+Io8M8/KnuW4hN2P7w14sldsKwzw="; hash = "sha256-TJlyWO1knP07gHVgbz1K0pBtvkTYrNJWZsassllko+I=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -24,12 +24,12 @@
}: }:
let let
version = "6.1.1"; version = "6.1.2";
sourceRoot = "."; sourceRoot = ".";
src = fetchurl { src = fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
hash = "sha256-a5APJtZ2x+yh0uff+bcYkNq9P/WcqyotIXi8igOVNCo="; hash = "sha256-b7PuIv6fqG2C4XNXLVBMCJ8Qgl10lyVZJibgkLOMlnk=";
}; };
# Update with # Update with

View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "buildkit"; pname = "buildkit";
version = "0.11.5"; version = "0.11.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "moby"; owner = "moby";
repo = "buildkit"; repo = "buildkit";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-bQqdHSmouZm89sV2GjBrEwYTdTYKttVBfXcm2fN09NI="; hash = "sha256-K0PHnrJwDI4myb7/7zyEsqtL1qQYy3ue+r+9EqTB1Oo=";
}; };
vendorHash = null; vendorHash = null;

View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "hcloud"; pname = "hcloud";
version = "1.33.0"; version = "1.33.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hetznercloud"; owner = "hetznercloud";
repo = "cli"; repo = "cli";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-Itu/VS6wpEHWLmDiGq9m7qyUr6lMr4uQm8SJNAkOPsQ="; sha256 = "sha256-0mbEQwKmhID4luzW1mMThilWR6R8rmF4ZY4/weNkDvs=";
}; };
vendorHash = "sha256-gz8vSVWh9wyM91rjJT102UJXBpeDoU895lTrHHZpj3I="; vendorHash = "sha256-gz8vSVWh9wyM91rjJT102UJXBpeDoU895lTrHHZpj3I=";

View File

@ -10,7 +10,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "blackfire"; pname = "blackfire";
version = "2.14.2"; version = "2.15.0";
src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}"); src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}");
@ -57,23 +57,23 @@ stdenv.mkDerivation rec {
sources = { sources = {
"x86_64-linux" = fetchurl { "x86_64-linux" = fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb";
sha256 = "SnHxJWWCRI/ZwFlxVaghP7rBzSd1Redvgztk/z/UUyM="; sha256 = "eKHP7yOy6hnHi0EomZhsGXWinNy4roQ9qRGn8tah6KI=";
}; };
"i686-linux" = fetchurl { "i686-linux" = fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb";
sha256 = "gXKuZCE81REOlO/TqTQmruaVbS847lnZRlKn2d1DLN0="; sha256 = "sCFVmGz850h9NKoVKUBV+93k913ihpfk+48buzsNOqw=";
}; };
"aarch64-linux" = fetchurl { "aarch64-linux" = fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb";
sha256 = "JKcKC96iRYl3ewgts1nAhD6gTJElsvyufI3Gnq0zKUk="; sha256 = "V6adZVR82Z15fN//wuwHZK6C95hAxXPB9NuA0kx1qPA=";
}; };
"aarch64-darwin" = fetchurl { "aarch64-darwin" = fetchurl {
url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz";
sha256 = "aYNibLHr3XYj4vTNF1ftew8oxfkckr0yehN2hDK+egc="; sha256 = "X0sWPjmVAzJTKHUxVLbhWTdc7ryn2GkNMj9CuRgTb0I=";
}; };
"x86_64-darwin" = fetchurl { "x86_64-darwin" = fetchurl {
url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz";
sha256 = "vZ0klc23JQDAwBGBUziIDx0mIm7KOCsBgoH1mrenazU="; sha256 = "FvoslunTPxmc2KqaxNSb0uK9fP4CV5HR39UDoW3zJfw=";
}; };
}; };

View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "rsonpath"; pname = "rsonpath";
version = "0.3.3"; version = "0.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "v0ldek"; owner = "v0ldek";
repo = "rsonpath"; repo = "rsonpath";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-kbtw8PhUecxIAxBdklbXtzS3P9o2aw8DCCJaC+vkNT0="; hash = "sha256-F52IUTfQ2h5z0+WeLNCCmX8vre58ayncW4/lxIwo/T8=";
}; };
cargoHash = "sha256-ZcnMpGgs/3VLdFsPPYzt2EkHNU26dvLnuOHy8OOtp0k="; cargoHash = "sha256-WY6wXnPh0rgjSkNMWOeOCl//kHlDk0z6Gvnjax33nvE=";
buildNoDefaultFeatures = true; buildNoDefaultFeatures = true;
buildFeatures = [ buildFeatures = [

View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "upbound"; pname = "upbound";
version = "0.15.0"; version = "0.16.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = "up"; repo = "up";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-0nCGBHyaAgSKn+gkiORe3PCuJFiPEN9yRO3vn0tyji8="; sha256 = "sha256-7fR6RiyxPgaf2uK/JY9ydwdUcRRhShFK2ij6WVTA/Vc=";
}; };
vendorSha256 = "sha256-eueYdAlcH1hqE6EKrwpOrchVYhZg76Fgn9oh8sbNuxU="; vendorHash = "sha256-FDwcsf69l8GcMet9zUG2fuyoZgpEujB3A59eWg2GbdI=";
subPackages = [ "cmd/docker-credential-up" "cmd/up" ]; subPackages = [ "cmd/docker-credential-up" "cmd/up" ];

View File

@ -25,11 +25,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "unciv"; pname = "unciv";
version = "4.5.15"; version = "4.6.4-patch2";
src = fetchurl { src = fetchurl {
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
hash = "sha256-tZsWJ3Icd5c+NU0WK1wCz2+0fk5uL6frCEd+nc5VxpQ="; hash = "sha256-LI0PfSQq90f4Ci4np5Z+JgfVgU2b380pSIqNIpm2UKQ=";
}; };
dontUnpack = true; dontUnpack = true;

View File

@ -0,0 +1,51 @@
{ lib
, stdenv
, fetchFromGitHub
, hidapi
, profile ? "/etc/g810-led/profile"
}:
stdenv.mkDerivation rec {
pname = "g810-led";
version = "0.4.3";
src = fetchFromGitHub {
owner = "MatMoul";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-GKHtQ7DinqfhclDdPO94KtTLQhhonAoWS4VOvs6CMhY=";
};
postPatch = ''
substituteInPlace udev/g810-led.rules \
--replace "/usr" $out \
--replace "/etc/g810-led/profile" "${profile}"
'';
buildInputs = [
hidapi
];
installPhase = ''
runHook preInstall
install -D bin/g810-led $out/bin/g810-led
# See https://github.com/MatMoul/g810-led#compatible-keyboards-
for keyboard in {g213,g410,g413,g512,g513,g610,g815,g910,gpro}; do
ln -s \./g810-led $out/bin/$keyboard-led
done
install -D udev/g810-led.rules $out/etc/udev/rules.d/90-g810-led.rules
runHook postInstall
'';
meta = with lib; {
description = "Linux LED controller for some Logitech G Keyboards";
homepage = "https://github.com/MatMoul/g810-led";
license = licenses.gpl3Only;
maintainers = with maintainers; [ fab ];
platforms = platforms.linux;
};
}

View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pdns"; pname = "pdns";
version = "4.7.3"; version = "4.7.4";
src = fetchurl { src = fetchurl {
url = "https://downloads.powerdns.com/releases/pdns-${version}.tar.bz2"; url = "https://downloads.powerdns.com/releases/pdns-${version}.tar.bz2";
hash = "sha256-i601Gy4JQm9tT7A0aIGlFV/lVUl8PYUHHlMefHr+PnY="; hash = "sha256-dGndgft98RGX9JY4+knO/5+XMiX8j5xxYLC/wAoudHE=";
}; };
# redact configure flags from version output to reduce closure size # redact configure flags from version output to reduce closure size
patches = [ ./version.patch ]; patches = [ ./version.patch ];

View File

@ -6,16 +6,16 @@
}: }:
buildGoModule rec { buildGoModule rec {
pname = "headscale"; pname = "headscale";
version = "0.21.0"; version = "0.22.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "juanfont"; owner = "juanfont";
repo = "headscale"; repo = "headscale";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-Y4fTCEKK7iRbfijQAvYgXWVa/6TlPikXnqyBI8b990s="; sha256 = "sha256-6T4wWuhikanoQGGjVvNJak5yvgcEfhGtOmfLc2xKmms=";
}; };
vendorHash = "sha256-R183PDeAUnNwNV8iE3b22S5hGPJG8aZQGdENGqcPCw8="; vendorSha256 = "sha256-+JxS4Q6rTpdBwms2nkVDY/Kluv2qu2T0BaOIjfeX85M=";
ldflags = ["-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}"]; ldflags = ["-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}"];

View File

@ -2,20 +2,20 @@
buildGoModule rec { buildGoModule rec {
pname = "mackerel-agent"; pname = "mackerel-agent";
version = "0.75.1"; version = "0.75.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mackerelio"; owner = "mackerelio";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-haJzhKb0DOMJAlK6tSsx0FMz9ZkYIHT8OGVjwIqzSgU="; sha256 = "sha256-xRujItV8xgIiQZktcEeq+hCDaD7HaHFEOsbtzmWfLQQ=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
nativeCheckInputs = lib.optionals (!stdenv.isDarwin) [ nettools ]; nativeCheckInputs = lib.optionals (!stdenv.isDarwin) [ nettools ];
buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ];
vendorHash = "sha256-VJy9bbVxcekrehq48yaSbZKP8o65IFmFJglYg92HP20="; vendorHash = "sha256-Ow1Ho6+VMvb0hKsAAd8nieFyVqDDX2prHDIkTuy1je8=";
subPackages = [ "." ]; subPackages = [ "." ];

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "plpgsql_check"; pname = "plpgsql_check";
version = "2.3.3"; version = "2.3.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "okbob"; owner = "okbob";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-+ao0J3LpEcyTon4vCRIc5629KpCYMP+xRXNqxZEJYF8="; hash = "sha256-kXci/4o7rK1CiLp8alkAGMhxjiQBIPpavS/1/7BBWI8=";
}; };
buildInputs = [ postgresql ]; buildInputs = [ postgresql ];

View File

@ -8,16 +8,16 @@
buildGoModule rec { buildGoModule rec {
pname = "qovery-cli"; pname = "qovery-cli";
version = "0.58.1"; version = "0.58.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Qovery"; owner = "Qovery";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-+Js39lzJW92EpuIW853k4WdR7/8ba5osUcfKmQT9Uho="; hash = "sha256-1r0ssR5jTvPiR5snhJ+wROISFOz/qIHT51ZrVA+nW5w=";
}; };
vendorHash = "sha256-1krHpwjs4kGhPMBF5j3iqUBo8TGKs1h+nDCmDmviPu4="; vendorHash = "sha256-w40zewXGB76kMgP0GzUtyncBBnCDgxcGJ7EO107WWN0=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "scaleway-cli"; pname = "scaleway-cli";
version = "2.13.0"; version = "2.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "scaleway"; owner = "scaleway";
repo = "scaleway-cli"; repo = "scaleway-cli";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-C8Yeq2Mwyc3oPQSby8NiNrSNHle7Mc7uexg+G17Cl3M="; sha256 = "sha256-NAo+nI4oaWTFqBfIHmkWGVYlFz5WjImvF3pfOFmw+cM=";
}; };
vendorHash = "sha256-1OwzvGngSv8N5IFlB+vOKyPAaPnY4h2i0vKQAcQHt5o="; vendorHash = "sha256-iJLOkwXjfapZHGJ47raxmSW11HYsuB3ahEGDx2hFY10=";
ldflags = [ ldflags = [
"-w" "-w"

View File

@ -26,18 +26,18 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "stratisd"; pname = "stratisd";
version = "3.5.3"; version = "3.5.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stratis-storage"; owner = "stratis-storage";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-/ow5IclJvlMRsEIXUdZLLxVfyWIHFPHn2QEewcW7N1s="; hash = "sha256-V/1gNgjunT11ErXWIa5hDp2+onPCTequCswwXWD5+9E=";
}; };
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit src; inherit src;
hash = "sha256-ryvsAT2Ex0jj+v0Bk9qTWaK270wJhMrtZw99TICpyjo="; hash = "sha256-RljuLL8tep42KNGVsS5CxI7xuhxEjRZ90jVn3jUhVYM=";
}; };
postPatch = '' postPatch = ''

View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "pathvector"; pname = "pathvector";
version = "6.1.0"; version = "6.2.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "natesales"; owner = "natesales";
repo = "pathvector"; repo = "pathvector";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-tMcoL+nvvMBCWSVD+l42e6IlOIj8ERP9pgBHcJBtegY="; sha256 = "sha256-5A5THSBVOAX+VsBbht7HobiHFEdv6dohUwCeegAijYE=";
}; };
vendorHash = "sha256-+GML6a9LzHZfByHv7ODp7fHBauExsZTzUccMEeeOFNg="; vendorHash = "sha256-2G+RqG2i6APvpbOltQeP/Kt7d/LAwbecaYHOFrdnCQo=";
CGO_ENABLED = 0; CGO_ENABLED = 0;

View File

@ -9,16 +9,16 @@
buildGoModule rec { buildGoModule rec {
pname = "sing-box"; pname = "sing-box";
version = "1.2.2"; version = "1.2.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SagerNet"; owner = "SagerNet";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-IHYg3X1LBH7Ne83j0caJHHkBDMy7EcMKSFd0U5sHabI="; hash = "sha256-RSRhxsTbwYEho1+1ar2kX8gmQGOWIULlZcb84qNMMF8=";
}; };
vendorHash = "sha256-J9KGtAZ+J7EJKJOEEH44bhG8Gln8Gv87ryB3nswxDO0="; vendorHash = "sha256-BdM+uK7ouCzDKWlifyaHK+GqbIpODVfjiXnyvmKKKrk=";
tags = [ tags = [
"with_quic" "with_quic"

View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "crowdsec"; pname = "crowdsec";
version = "1.4.4"; version = "1.4.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "crowdsecurity"; owner = "crowdsecurity";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-XzIgkGL/G3nCRX+L5U2gM1ZEzddd6hanwaWJmn9uKzc="; hash = "sha256-+WvpsZjb1pb8WqK0HJYncJUo6wPkKzKvBi/nLKuhSD4=";
}; };
vendorHash = "sha256-FPsoufB9UDgBDIE3yUq4doBse3qgjP19ussYnMAxntk="; vendorHash = "sha256-FPsoufB9UDgBDIE3yUq4doBse3qgjP19ussYnMAxntk=";

View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "exploitdb"; pname = "exploitdb";
version = "2023-04-18"; version = "2023-04-21";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "exploit-database"; owner = "exploit-database";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-0wv9+hTe04JbGjNH3MeTjaHss5oaZ35ubiwsOhxoH8I="; hash = "sha256-zwF6QOm6daQlFP2DJYP9wZ50rb5Z47wIZ9yjHDcIr5M=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -9,13 +9,13 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "feroxbuster"; pname = "feroxbuster";
version = "2.9.3"; version = "2.9.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "epi052"; owner = "epi052";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-Z97CAfGnNTQmJd2zMlvGfk5jW9zHAB/efqYoYgVRfMc="; hash = "sha256-9PLj5tORWE4A6MWU9DF6JUbRebTOswIC/Jg6aq6SUPc=";
}; };
# disable linker overrides on aarch64-linux # disable linker overrides on aarch64-linux
@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
rm .cargo/config rm .cargo/config
''; '';
cargoHash = "sha256-siLyPPSTBaZ4vpfzeKVlrqIdFMI5z3hRA8c2lRsBAGM="; cargoHash = "sha256-Kest8QCfiS0F8pw1PULny7iuYf9oILiZykPsL2ZSskQ=";
OPENSSL_NO_VENDOR = true; OPENSSL_NO_VENDOR = true;

View File

@ -7,13 +7,13 @@
buildGoModule rec { buildGoModule rec {
pname = "grype"; pname = "grype";
version = "0.61.0"; version = "0.61.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "anchore"; owner = "anchore";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-PPCeEhV4+iSGDBUIN89wlEUEX20bkcX3B7LxU7JDZQc="; hash = "sha256-ey0g7iog7PHxqgVaJROA2Myi4hGRe14RuA8tBTSc7Ok=";
# populate values that require us to use git. By doing this in postFetch we # 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. # can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true; leaveDotGit = true;
@ -28,7 +28,7 @@ buildGoModule rec {
proxyVendor = true; proxyVendor = true;
vendorHash = "sha256-L77tzgcshTNAvg6fKkgN6zdDws76wWoJvygAdArscVI="; vendorHash = "sha256-NMKdMW/DRod/C5nL8GZR0pKTRzF58dARoWQD1o+i3Y4=";
nativeBuildInputs = [ nativeBuildInputs = [
installShellFiles installShellFiles

View File

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "nuclei"; pname = "nuclei";
version = "2.9.1"; version = "2.9.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "projectdiscovery"; owner = "projectdiscovery";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-esnq1aQot5NHCQcmCbCnv+7OBqy92f1AhI52zvbmpvY="; hash = "sha256-TGlslIWSV3cOzm+jv0MR2joSS9zpqbcTZDusa//hDRA=";
}; };
vendorHash = "sha256-Ws5wTsz02S3WH16x3APld/eoGzla3E5bAQiNSzStL4o="; vendorHash = "sha256-pSiODP/PYzPuEG/9H+33ZYwJBvI4zBoZNtfV5Fh8Erk=";
modRoot = "./v2"; modRoot = "./v2";
subPackages = [ subPackages = [

View File

@ -5,13 +5,13 @@
buildGoModule rec { buildGoModule rec {
pname = "trufflehog"; pname = "trufflehog";
version = "3.32.0"; version = "3.32.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "trufflesecurity"; owner = "trufflesecurity";
repo = "trufflehog"; repo = "trufflehog";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-88O5G6AMAZm1feDw2fRab/RmDxoywVdafB/OJyO+Hro="; hash = "sha256-CRgGQZf+97gvnMcZF6al4cEnf8ndQwoGBqGRZG865Nw=";
}; };
vendorHash = "sha256-NnYQGbG4R/Ar0goOtymuohHO36t3UQhjg53ufneCFxQ="; vendorHash = "sha256-NnYQGbG4R/Ar0goOtymuohHO36t3UQhjg53ufneCFxQ=";

View File

@ -11,13 +11,13 @@
mkDerivation rec { mkDerivation rec {
pname = "web-eid-app"; pname = "web-eid-app";
version = "2.2.0"; version = "2.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "web-eid"; owner = "web-eid";
repo = "web-eid-app"; repo = "web-eid-app";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-TOzOcPY4m7OdCfaAXyc/joIHe2O2YbyDrXiNytPMKSk="; sha256 = "sha256-ktYToJ8mnDOiqOHf8iEl1CyHkJ4rAn2lbD0ikc2ctXw=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View File

@ -15,13 +15,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "yara"; pname = "yara";
version = "4.3.0"; version = "4.3.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "VirusTotal"; owner = "VirusTotal";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-xjGlK0jUDpkDXnI0odErtF+Xcx0I/orD0v5EZw8mhvs="; hash = "sha256-Q+Q52W/MhurG3x0CIr0nv31qc4bdaLDk9AGGpMxKOcI=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -2220,6 +2220,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;
}; };
g810-led = callPackage ../misc/g810-led { };
gcdemu = callPackage ../applications/emulators/cdemu/gui.nix { }; gcdemu = callPackage ../applications/emulators/cdemu/gui.nix { };
gensgs = pkgsi686Linux.callPackage ../applications/emulators/gens-gs { }; gensgs = pkgsi686Linux.callPackage ../applications/emulators/gens-gs { };