gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2024-10-07 00:15:20 +00:00
committed by GitHub
parent 80da1df184 ab0e8e5be7
commit 7306ea41bd
57 changed files with 828 additions and 2059 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/licenses.nix
+3 -3
View File
@@ -670,7 +670,7 @@ lib.mapAttrs mkLicense ({
# Intel's license, seems free
iasl = {
spdxId = "Intel-ACPI";
fullName = "iASL";
fullName = "Intel ACPI Software License Agreement";
url = "https://old.calculate-linux.org/packages/licenses/iASL";
};
@@ -889,7 +889,7 @@ lib.mapAttrs mkLicense ({
spdxId = "MIT";
fullName = "MIT License";
};
# https://spdx.org/licenses/MIT-feh.html
mit-feh = {
spdxId = "MIT-feh";
fullName = "feh License";
@@ -1097,7 +1097,7 @@ lib.mapAttrs mkLicense ({
};
purdueBsd = {
fullName = " Purdue BSD-Style License"; # also know as lsof license
fullName = "Purdue BSD-Style License"; # also known as lsof license
url = "https://enterprise.dejacode.com/licenses/public/purdue-bsd";
};
maintainers/maintainer-list.nix
+8 -1
View File
@@ -8832,6 +8832,13 @@
name = "Luna Perego";
keys = [ { fingerprint = "09E4 B981 9B93 5B0C 0B91 1274 0578 7332 9217 08FF"; } ];
};
hustlerone = {
email = "nine-ball@tutanota.com";
matrix = "@hustlerone:matrix.org";
github = "hustlerone";
name = "Hustler One";
githubId = 167621692;
};
huyngo = {
email = "huyngo@disroot.org";
github = "Huy-Ngo";
@@ -11192,7 +11199,7 @@
name = "kintrix";
};
kinzoku = {
email = "kinzokudev4869@gmail.com";
email = "kinzoku@the-nebula.xyz";
github = "kinzoku-dev";
githubId = 140647311;
name = "Ayman Hamza";
nixos/doc/manual/release-notes/rl-2411.section.md
+2
View File
@@ -468,6 +468,8 @@
- `programs.vim.defaultEditor` now only works if `programs.vim.enable` is enabled.
- `services.mautrix-meta` was updated to [0.4](https://github.com/mautrix/meta/releases/tag/v0.4.0). This release makes significant changes to the settings format. If you have custom settings you should migrate them to the new format. Unfortunately upstream provides little guidance for how to do this, but [the auto-migration code](https://github.com/mautrix/meta/blob/f5440b05aac125b4c95b1af85635a717cbc6dd0e/cmd/mautrix-meta/legacymigrate.go#L23) may serve as a useful reference. The NixOS module should warn you if you still have any old settings configured.
- The `indi-full` package no longer contains non-free drivers.
To get the old collection of drivers use `indi-full-nonfree` or create your own collection of drivers by overriding indi-with-drivers.
E.g.: `pkgs.indi-with-drivers.override {extraDrivers = with pkgs.indi-3rdparty; [indi-gphoto];}`
nixos/modules/hardware/usb-storage.nix
+7 -4
View File
@@ -1,8 +1,9 @@
{ config, lib, pkgs, ... }:
{
options.hardware.usbStorage.manageStartStop = lib.mkOption {
options.hardware.usbStorage.manageShutdown = lib.mkOption {
type = lib.types.bool;
default = true;
default = false;
description = ''
Enable this option to gracefully spin-down external storage during shutdown.
If you suspect improper head parking after poweroff, install `smartmontools` and check
@@ -10,9 +11,11 @@
'';
};
config = lib.mkIf config.hardware.usbStorage.manageStartStop {
config = lib.mkIf config.hardware.usbStorage.manageShutdown {
services.udev.extraRules = ''
ACTION=="add|change", SUBSYSTEM=="scsi_disk", DRIVERS=="usb-storage", ATTR{manage_system_start_stop}="1"
ACTION=="add|change", SUBSYSTEM=="scsi_disk", DRIVERS=="usb-storage|uas", ATTR{manage_shutdown}="1"
'';
};
imports = [(lib.mkRenamedOptionModule [ "hardware" "usbStorage" "manageStartStop" ] [ "hardware" "usbStorage" "manageShutdown" ])];
}
nixos/modules/services/matrix/mautrix-meta.nix
+62 -45
View File
@@ -69,11 +69,6 @@ in {
appservice = {
id = "";
database = {
type = "sqlite3-fk-wal";
uri = "file:${fullDataDir config}/mautrix-meta.db?_txlock=immediate";
};
bot = {
username = "";
};
@@ -83,37 +78,43 @@ in {
address = "http://${config.settings.appservice.hostname}:${toString config.settings.appservice.port}";
};
meta = {
mode = "";
bridge = {
permissions = {};
};
bridge = {
# Enable encryption by default to make the bridge more secure
encryption = {
allow = true;
default = true;
require = true;
database = {
type = "sqlite3-fk-wal";
uri = "file:${fullDataDir config}/mautrix-meta.db?_txlock=immediate";
};
# Recommended options from mautrix documentation
# for additional security.
delete_keys = {
dont_store_outbound = true;
ratchet_on_decrypt = true;
delete_fully_used_on_decrypt = true;
delete_prev_on_new_session = true;
delete_on_device_delete = true;
periodically_delete_expired = true;
delete_outdated_inbound = true;
};
# Enable encryption by default to make the bridge more secure
encryption = {
allow = true;
default = true;
require = true;
verification_levels = {
receive = "cross-signed-tofu";
send = "cross-signed-tofu";
share = "cross-signed-tofu";
};
# Recommended options from mautrix documentation
# for additional security.
delete_keys = {
dont_store_outbound = true;
ratchet_on_decrypt = true;
delete_fully_used_on_decrypt = true;
delete_prev_on_new_session = true;
delete_on_device_delete = true;
periodically_delete_expired = true;
delete_outdated_inbound = true;
};
permissions = {};
# TODO: This effectively disables encryption. But this is the value provided when a <0.4 config is migrated. Changing it will corrupt the database.
# https://github.com/mautrix/meta/blob/f5440b05aac125b4c95b1af85635a717cbc6dd0e/cmd/mautrix-meta/legacymigrate.go#L24
# If you wish to encrypt the local database you should set this to an environment variable substitution and reset the bridge or somehow migrate the DB.
pickle_key = "mautrix.bridge.e2ee";
verification_levels = {
receive = "cross-signed-tofu";
send = "cross-signed-tofu";
share = "cross-signed-tofu";
};
};
logging = {
@@ -124,6 +125,10 @@ in {
time_format = " ";
};
};
network = {
mode = "";
};
};
defaultText = ''
{
@@ -261,7 +266,7 @@ in {
description = ''
Configuration of multiple `mautrix-meta` instances.
`services.mautrix-meta.instances.facebook` and `services.mautrix-meta.instances.instagram`
come preconfigured with meta.mode, appservice.id, bot username, display name and avatar.
come preconfigured with network.mode, appservice.id, bot username, display name and avatar.
'';
example = ''
@@ -283,7 +288,7 @@ in {
messenger = {
enable = true;
settings = {
meta.mode = "messenger";
network.mode = "messenger";
homeserver.domain = "example.com";
appservice = {
id = "messenger";
@@ -313,9 +318,9 @@ in {
'';
}
{
assertion = builtins.elem cfg.settings.meta.mode [ "facebook" "facebook-tor" "messenger" "instagram" ];
assertion = builtins.elem cfg.settings.network.mode [ "facebook" "facebook-tor" "messenger" "instagram" ];
message = ''
The option `services.mautrix-meta.instances.${name}.settings.meta.mode` has to be set
The option `services.mautrix-meta.instances.${name}.settings.network.mode` has to be set
to one of: facebook, facebook-tor, messenger, instagram.
This configures the mode of the bridge.
'';
@@ -338,6 +343,24 @@ in {
The option `services.mautrix-meta.instances.${name}.settings.appservice.bot.username` has to be set.
'';
}
{
assertion = !(cfg.settings ? bridge.disable_xma);
message = ''
The option `bridge.disable_xma` has been moved to `network.disable_xma_always`. Please [migrate your configuration](https://github.com/mautrix/meta/releases/tag/v0.4.0). You may wish to use [the auto-migration code](https://github.com/mautrix/meta/blob/f5440b05aac125b4c95b1af85635a717cbc6dd0e/cmd/mautrix-meta/legacymigrate.go#L23) for reference.
'';
}
{
assertion = !(cfg.settings ? bridge.displayname_template);
message = ''
The option `bridge.displayname_template` has been moved to `network.displayname_template`. Please [migrate your configuration](https://github.com/mautrix/meta/releases/tag/v0.4.0). You may wish to use [the auto-migration code](https://github.com/mautrix/meta/blob/f5440b05aac125b4c95b1af85635a717cbc6dd0e/cmd/mautrix-meta/legacymigrate.go#L23) for reference.
'';
}
{
assertion = !(cfg.settings ? meta);
message = ''
The options in `meta` have been moved to `network`. Please [migrate your configuration](https://github.com/mautrix/meta/releases/tag/v0.4.0). You may wish to use [the auto-migration code](https://github.com/mautrix/meta/blob/f5440b05aac125b4c95b1af85635a717cbc6dd0e/cmd/mautrix-meta/legacymigrate.go#L23) for reference.
'';
}
]) enabledInstances));
users.users = lib.mapAttrs' (name: cfg: lib.nameValuePair "mautrix-meta-${name}" {
@@ -518,11 +541,7 @@ in {
in {
instagram = {
settings = {
meta.mode = mkDefault "instagram";
bridge = {
username_template = mkDefault "instagram_{{.}}";
};
network.mode = mkDefault "instagram";
appservice = {
id = mkDefault "instagram";
@@ -532,16 +551,13 @@ in {
displayname = mkDefault "Instagram bridge bot";
avatar = mkDefault "mxc://maunium.net/JxjlbZUlCPULEeHZSwleUXQv";
};
username_template = mkDefault "instagram_{{.}}";
};
};
};
facebook = {
settings = {
meta.mode = mkDefault "facebook";
bridge = {
username_template = mkDefault "facebook_{{.}}";
};
network.mode = mkDefault "facebook";
appservice = {
id = mkDefault "facebook";
@@ -551,6 +567,7 @@ in {
displayname = mkDefault "Facebook bridge bot";
avatar = mkDefault "mxc://maunium.net/ygtkteZsXnGJLJHRchUwYWak";
};
username_template = mkDefault "facebook_{{.}}";
};
};
};
@@ -558,5 +575,5 @@ in {
}
];
meta.maintainers = with lib.maintainers; [ rutherther ];
meta.maintainers = with lib.maintainers; [ ];
}
nixos/modules/services/monitoring/scrutiny.nix
+12
View File
@@ -177,6 +177,18 @@ in
SCRUTINY_WEB_DATABASE_LOCATION = "/var/lib/scrutiny/scrutiny.db";
SCRUTINY_WEB_SRC_FRONTEND_PATH = "${cfg.package}/share/scrutiny";
};
postStart = ''
for i in $(seq 300); do
if "${lib.getExe pkgs.curl}" --fail --silent --head "http://${cfg.settings.web.listen.host}:${toString cfg.settings.web.listen.port}" >/dev/null; then
echo "Scrutiny is ready (port is open)"
exit 0
fi
echo "Waiting for Scrutiny to open port..."
sleep 0.2
done
echo "Timeout waiting for Scrutiny to open port" >&2
exit 1
'';
serviceConfig = {
DynamicUser = true;
ExecStart = "${getExe cfg.package} start --config ${settingsFormat.generate "scrutiny.yaml" cfg.settings}";
nixos/modules/system/boot/unl0kr.nix
+63 -7
View File
@@ -1,27 +1,85 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
let
cfg = config.boot.initrd.unl0kr;
settingsFormat = pkgs.formats.ini { };
in
{
options.boot.initrd.unl0kr = {
enable = lib.mkEnableOption "unl0kr in initrd" // {
description = ''Whether to enable the unl0kr on-screen keyboard in initrd to unlock LUKS.'';
};
allowVendorDrivers = lib.mkEnableOption "load optional drivers" // {
description = ''Whether to load additional drivers for certain vendors (I.E: Wacom, Intel, etc.)'';
};
settings = lib.mkOption {
description = ''
Whether to enable the unl0kr on-screen keyboard in initrd to unlock LUKS.
Configuration for `unl0kr`.
See `unl0kr.conf(5)` for supported values.
Alternatively, visit `https://gitlab.com/postmarketOS/buffybox/-/blob/unl0kr-2.0.0/unl0kr.conf`
'';
example = lib.literalExpression ''
{
general.animations = true;
theme = {
default = "pmos-dark";
alternate = "pmos-light";
};
}
'';
default = { };
type = lib.types.submodule { freeformType = settingsFormat.type; };
};
};
config = lib.mkIf cfg.enable {
meta.maintainers = [];
meta.maintainers = with lib.maintainers; [ hustlerone ];
assertions = [
{
assertion = cfg.enable -> config.boot.initrd.systemd.enable;
message = "boot.initrd.unl0kr is only supported with boot.initrd.systemd.";
}
{
assertion = !config.boot.plymouth.enable;
message = "unl0kr will not work if plymouth is enabled.";
}
{
assertion = !config.hardware.amdgpu.initrd.enable;
message = "unl0kr has issues with video drivers that are loaded on stage 1.";
}
];
boot.initrd.availableKernelModules =
lib.optionals cfg.enable [
"hid-multitouch"
"hid-generic"
"usbhid"
"i2c-designware-core"
"i2c-designware-platform"
"i2c-hid-acpi"
"usbtouchscreen"
"evdev"
]
++ lib.optionals cfg.allowVendorDrivers [
"intel_lpss_pci"
"elo"
"wacom"
];
boot.initrd.systemd = {
contents."/etc/unl0kr.conf".source = settingsFormat.generate "unl0kr.conf" cfg.settings;
storePaths = with pkgs; [
"${pkgs.gnugrep}/bin/grep"
libinput
@@ -42,9 +100,7 @@ in
"systemd-vconsole-setup.service"
"udev.service"
];
before = [
"shutdown.target"
];
before = [ "shutdown.target" ];
script = ''
# This script acts as a Password Agent: https://systemd.io/PASSWORD_AGENTS/
@@ -56,7 +112,7 @@ in
do
for file in `ls $DIR/ask.*`; do
socket="$(cat "$file" | ${pkgs.gnugrep}/bin/grep "Socket=" | cut -d= -f2)"
${pkgs.unl0kr}/bin/unl0kr | ${config.boot.initrd.systemd.package}/lib/systemd/systemd-reply-password 1 "$socket"
${pkgs.unl0kr}/bin/unl0kr -v -C "/etc/unl0kr.conf" | ${config.boot.initrd.systemd.package}/lib/systemd/systemd-reply-password 1 "$socket"
done
done
'';
pkgs/applications/misc/inochi2d/creator-dub-lock.json
+20 -24
View File
@@ -21,8 +21,8 @@
"sha256": "01dgvlvwbhwz7822gp6z5xn6w3k51q09i6qzns2i4ixmjh45wscs"
},
"diet-ng": {
"version": "1.8.1",
"sha256": "0kh8haw712xkd3f07s5x5g12nmmkv0y1lk2cqh66298fc5mgj4sv"
"version": "1.8.2",
"sha256": "0hwm8dsyw7xb9d540ks314vzxibn4ri7b4m2gagqbpmzspvd2slv"
},
"dportals": {
"version": "0.1.0",
@@ -37,12 +37,12 @@
"sha256": "0p5vmkw29ksh5wdxz1ijms1wblq288pv15vnbl93z7q2vgnq995w"
},
"eventcore": {
"version": "0.9.30",
"sha256": "1n8wdcjhas0y99pf9fvwwsydkmy9g7gvfjhlwpjh158c7pfjwlaq"
"version": "0.9.34",
"sha256": "0znrcmxdr65gk8bwrknhm530kicznia4xb09h5jv42sxnv3cjkjw"
},
"facetrack-d": {
"version": "0.7.8",
"sha256": "1414wvh0kn1rps5r16ir92sqfj8a7na1gd71ds81jkq8arkm17j0"
"version": "0.8.0",
"sha256": "0p04yd50sgjb9n9gdp2yjgvlm8kkld2gl5ivz36npjnchj8k5a8i"
},
"fghj": {
"version": "1.0.2",
@@ -65,24 +65,16 @@
"sha256": "0dl7n4myxp1s3b32v2s975k76gs90wr2nw6ac5jq9hsgzhp1ix0h"
},
"inmath": {
"version": "1.0.6",
"sha256": "0kzk55ilbnl6qypjk60zwd5ibys5n47128hbbr0mbc7bpj9ppfg4"
"version": "1.3.0",
"sha256": "1bmfsnlpm3lb085cs29h63l4fmfr0xr9iyfd0wrg5i87difshpw6"
},
"inochi2d": {
"version": "0.8.4",
"sha256": "1bj0c6i9kcw1vfm6lf8lyxpf1lhhslg3f182jycdmzms15i3jb3y"
"version": "0.8.6",
"sha256": "0xhidp1y91cidh3g1cc5v7psb5kfy17ars7k7cplnywhjlcqqk70"
},
"kra-d": {
"version": "0.5.5",
"sha256": "0dffmf084ykz19y084v936r3f74613d0jifj0wb3xibfcq9mwxqz"
},
"libasync": {
"version": "0.8.6",
"sha256": "0hhk5asfdccby8ky77a25qn7dfmfdmwyzkrg3zk064bicmgdwlnj"
},
"memutils": {
"version": "1.0.10",
"sha256": "0hm31birbw59sw1bi9syjhbcdgwwwyyx6r9jg7ar9i6a74cjr52c"
"version": "0.5.6",
"sha256": "1lp3mf39qfxn6cayznc4nkk24smnd2m5sg8skl9pnd4x85is6zdr"
},
"mir-algorithm": {
"version": "3.22.1",
@@ -100,9 +92,13 @@
"version": "2.2.19",
"sha256": "0ad9ahvyrv5h38aqwn3zvlrva3ikfq28dfhpg2lwwgm31ymzvqpb"
},
"numem": {
"version": "0.11.3",
"sha256": "00rm3cg5i714ncww8yxsbzf1y1bf6r8d0yx6i38ac2x7090arvjm"
},
"openssl": {
"version": "3.3.3",
"sha256": "1fwhd5fkvgbqf3y8gwmrnd42kzi4k3mibpxijw5j82jxgfp1rzsf"
"version": "3.3.4",
"sha256": "17s71yfyhb9jyym2nldj23ikazwbbrmh6ply33mg888rd6dxnhyy"
},
"openssl-static": {
"version": "1.0.5+3.0.8",
@@ -133,8 +129,8 @@
"sha256": "12mfm49bjnh2pvm51dzna625kzgwznm9kcv6qhazc4il9j0224wd"
},
"vibe-core": {
"version": "2.8.4",
"sha256": "1pik6vympgwxpyxb75g1f8409cd6hw952gbflqvwaj18shz6dwjm"
"version": "2.9.3",
"sha256": "032q1gkm7l6blj5y3yiwk205m12svp4bv8k743crkd8d1xhlrrvi"
},
"vibe-d": {
"version": "0.9.8",
pkgs/applications/misc/inochi2d/default.nix
+12 -6
View File
@@ -22,13 +22,13 @@ in
inochi-creator = mkGeneric rec {
pname = "inochi-creator";
appname = "Inochi Creator";
version = "0.8.5";
version = "0.8.6";
src = fetchFromGitHub {
owner = "Inochi2D";
repo = "inochi-creator";
rev = "v${version}";
hash = "sha256-qrSHyvFE55xRbcA79lngOHJOdv54rNlUTHlxT9jjPEY=";
hash = "sha256-9d3j5ZL6rGOjN1GUpCIfbjby0mNMvOK7BJbHYgwLY2k=";
};
dubLock = ./creator-dub-lock.json;
@@ -54,15 +54,21 @@ in
inochi-session = mkGeneric rec {
pname = "inochi-session";
appname = "Inochi Session";
version = "0.8.4";
version = "0.8.7";
src = fetchFromGitHub {
owner = "Inochi2D";
repo = "inochi-session";
rev = "v${version}";
hash = "sha256-BRA5qODHhyHBeZYT5MQwcFmr/zVokfO5SrbcbQa6w7w=";
hash = "sha256-FcgzTCpD+L50MsPP90kfL6h6DEUtiYkUV1xKww1pQfg=";
};
patches = [
# Dynamically load Lua to get around the linker error on aarch64-linux.
# https://github.com/Inochi2D/inochi-session/pull/60
./session-dynamic-lua.patch
];
dubLock = ./session-dub-lock.json;
preFixup = ''
@@ -72,8 +78,8 @@ in
dontStrip = true; # symbol lookup error: undefined symbol: , version
meta = {
# darwin has slightly different build steps, aarch fails to build because of some lua related error
broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64;
# darwin has slightly different build steps
broken = stdenv.hostPlatform.isDarwin;
changelog = "https://github.com/Inochi2D/inochi-session/releases/tag/${src.rev}";
description = "An application that allows streaming with Inochi2D puppets";
};
pkgs/applications/misc/inochi2d/generic.nix
+8 -2
View File
@@ -14,6 +14,7 @@
freetype,
SDL2,
zenity,
luajit_2_1,
libGL,
builderArgs,
@@ -99,7 +100,7 @@ buildDubPackage (
. gentl.sh
# Use the fake git to generate version info
dub build --skip-registry=all --compiler=ldc2 --build=release --config=meta
dub build --skip-registry=all --compiler=ldc2 --build=release --config=update-version
'';
# Use the "barebones" configuration so that we don't include the mascot and icon files in out build
@@ -128,7 +129,12 @@ buildDubPackage (
# Add support for `open file` dialog
makeWrapper $out/share/${pname}/${pname} $out/bin/${pname} \
--prefix PATH : ${lib.makeBinPath [ zenity ]} \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]}
--prefix LD_LIBRARY_PATH : ${
lib.makeLibraryPath [
libGL
luajit_2_1
]
}
'';
meta = {
pkgs/applications/misc/inochi2d/session-dub-lock.json
+20 -24
View File
@@ -21,8 +21,8 @@
"sha256": "01dgvlvwbhwz7822gp6z5xn6w3k51q09i6qzns2i4ixmjh45wscs"
},
"diet-ng": {
"version": "1.8.1",
"sha256": "0kh8haw712xkd3f07s5x5g12nmmkv0y1lk2cqh66298fc5mgj4sv"
"version": "1.8.2",
"sha256": "0hwm8dsyw7xb9d540ks314vzxibn4ri7b4m2gagqbpmzspvd2slv"
},
"dportals": {
"version": "0.1.0",
@@ -33,12 +33,12 @@
"sha256": "0p9g4h5qanbg6281x1068mdl5p7zvqig4zmmi72a2cay6dxnbvxb"
},
"eventcore": {
"version": "0.9.30",
"sha256": "1n8wdcjhas0y99pf9fvwwsydkmy9g7gvfjhlwpjh158c7pfjwlaq"
"version": "0.9.34",
"sha256": "0znrcmxdr65gk8bwrknhm530kicznia4xb09h5jv42sxnv3cjkjw"
},
"facetrack-d": {
"version": "0.7.8",
"sha256": "1414wvh0kn1rps5r16ir92sqfj8a7na1gd71ds81jkq8arkm17j0"
"version": "0.8.0",
"sha256": "0p04yd50sgjb9n9gdp2yjgvlm8kkld2gl5ivz36npjnchj8k5a8i"
},
"fghj": {
"version": "1.0.2",
@@ -61,29 +61,21 @@
"sha256": "0dl7n4myxp1s3b32v2s975k76gs90wr2nw6ac5jq9hsgzhp1ix0h"
},
"inmath": {
"version": "1.0.6",
"sha256": "0kzk55ilbnl6qypjk60zwd5ibys5n47128hbbr0mbc7bpj9ppfg4"
"version": "1.3.0",
"sha256": "1bmfsnlpm3lb085cs29h63l4fmfr0xr9iyfd0wrg5i87difshpw6"
},
"inochi2d": {
"version": "0.8.4",
"sha256": "1bj0c6i9kcw1vfm6lf8lyxpf1lhhslg3f182jycdmzms15i3jb3y"
"version": "0.8.6",
"sha256": "0xhidp1y91cidh3g1cc5v7psb5kfy17ars7k7cplnywhjlcqqk70"
},
"inui": {
"version": "1.2.1",
"sha256": "0pygf8jxnbvib5f23qxf6k24wz8mh6fc0zhrkp83gq33k02ab5cx"
},
"libasync": {
"version": "0.8.6",
"sha256": "0hhk5asfdccby8ky77a25qn7dfmfdmwyzkrg3zk064bicmgdwlnj"
"version": "1.2.2",
"sha256": "1gh7ngva2ijz5gx9hrqn9rzzx5vvpf6l12r98wklzxwb9v5hmj69"
},
"lumars": {
"version": "1.6.1",
"sha256": "1vzdghqwv2gb41rp75456g43yfsndbl0dy6bnn4x6azwwny22br9"
},
"memutils": {
"version": "1.0.10",
"sha256": "0hm31birbw59sw1bi9syjhbcdgwwwyyx6r9jg7ar9i6a74cjr52c"
},
"mir-algorithm": {
"version": "3.22.1",
"sha256": "1bvvf3dm26x1h10pg1s4kyhxiyrmd96kk2lmchyady39crpjj5cf"
@@ -96,9 +88,13 @@
"version": "1.0.1",
"sha256": "0adyjpcgd65z44iydnrrrpjwbvmrm08a3pkcriqi7npqylfysqn6"
},
"numem": {
"version": "0.11.3",
"sha256": "00rm3cg5i714ncww8yxsbzf1y1bf6r8d0yx6i38ac2x7090arvjm"
},
"openssl": {
"version": "3.3.3",
"sha256": "1fwhd5fkvgbqf3y8gwmrnd42kzi4k3mibpxijw5j82jxgfp1rzsf"
"version": "3.3.4",
"sha256": "17s71yfyhb9jyym2nldj23ikazwbbrmh6ply33mg888rd6dxnhyy"
},
"openssl-static": {
"version": "1.0.5+3.0.8",
@@ -125,8 +121,8 @@
"sha256": "12mfm49bjnh2pvm51dzna625kzgwznm9kcv6qhazc4il9j0224wd"
},
"vibe-core": {
"version": "2.8.4",
"sha256": "1pik6vympgwxpyxb75g1f8409cd6hw952gbflqvwaj18shz6dwjm"
"version": "2.9.3",
"sha256": "032q1gkm7l6blj5y3yiwk205m12svp4bv8k743crkd8d1xhlrrvi"
},
"vibe-d": {
"version": "0.9.8",
pkgs/applications/misc/inochi2d/session-dynamic-lua.patch
+98
View File
@@ -0,0 +1,98 @@
diff --git a/dub.sdl b/dub.sdl
index 50c0da1..87936a4 100644
--- a/dub.sdl
+++ b/dub.sdl
@@ -32,6 +32,9 @@ configuration "barebones" {
targetType "executable"
dependency "dportals" version="~>0.1.0"
+
+ subConfiguration "lumars" "lua51-dynamic"
+ versions "LUA_51"
}
@@ -51,6 +54,9 @@ configuration "linux-full" {
versions "InBranding"
dependency "dportals" version="~>0.1.0"
+
+ subConfiguration "lumars" "lua51-dynamic"
+ versions "LUA_51"
}
configuration "osx-full" {
@@ -84,6 +90,9 @@ configuration "linux-nightly" {
versions "InNightly"
dependency "dportals" version="~>0.1.0"
+
+ subConfiguration "lumars" "lua51-dynamic"
+ versions "LUA_51"
}
// macOS nightly build
diff --git a/source/session/plugins/package.d b/source/session/plugins/package.d
index 965c64f..7cfbb0b 100644
--- a/source/session/plugins/package.d
+++ b/source/session/plugins/package.d
@@ -14,9 +14,9 @@ import lumars;
import session.log;
import std.file;
import std.path;
+import std.exception;
private {
- bool couldLoadLua = true;
LuaState* state;
LuaTable apiTable;
@@ -34,13 +34,17 @@ Plugin[] insPlugins;
Initializes Lua support
*/
void insLuaInit() {
- // LuaSupport support = loadLua();
-
- // if (support == LuaSupport.noLibrary || support == LuaSupport.badLibrary) {
- // couldLoadLua = false;
- // insLogWarn("Could not load Lua support...");
- // } else insLogInfo("Lua support initialized.");
- insLogInfo("Lua support initialized. (Statically linked for now)");
+ version(linux){
+ LuaSupport support = loadLua("libluajit-5.1.so.2");
+ if(support == LuaSupport.noLibrary){
+ support = loadLua();
+ }
+ enforce(support != LuaSupport.noLibrary, "Could not find Lua support...!");
+ enforce(support != LuaSupport.badLibrary, "Bad Lua library found!");
+ insLogInfo("Lua support initialized.");
+ } else {
+ insLogInfo("Lua support initialized. (Statically linked)");
+ }
// Create Lua state
state = new LuaState(luaL_newstate());
@@ -56,6 +60,9 @@ void insLuaInit() {
void insLuaUnload() {
lua_close(state.handle());
destroy(state);
+ version(linux){
+ unloadLua();
+ }
}
void insSavePluginState() {
@@ -111,13 +118,6 @@ void insEnumeratePlugins() {
insSavePluginState();
}
-/**
- Gets whether Lua support is loaded.
-*/
-bool insHasLua() {
- return couldLoadLua;
-}
-
/**
Gets string of value
*/
pkgs/applications/misc/klayout/default.nix
+2 -2
View File
@@ -5,13 +5,13 @@
mkDerivation rec {
pname = "klayout";
version = "0.29.6";
version = "0.29.7";
src = fetchFromGitHub {
owner = "KLayout";
repo = "klayout";
rev = "v${version}";
hash = "sha256-gbbes8CPh+Z9wCeQaAaObZjQvBTMe06z8oR12i6e12M=";
hash = "sha256-4GjCV/Z9al7Hrj7Ik/EvmLy5jPCsU/3Ti9HwOjzPKYc=";
};
postPatch = ''
pkgs/applications/misc/sioyek/default.nix
-95
View File
@@ -1,95 +0,0 @@
{ lib
, stdenv
, installShellFiles
, fetchFromGitHub
, fetchurl
, freetype
, gumbo
, harfbuzz
, jbig2dec
, mujs
, mupdf
, openjpeg
, qt3d
, qtbase
, qmake
, wrapQtAppsHook
}:
stdenv.mkDerivation (finalAttrs: {
pname = "sioyek";
version = "2.0.0";
src = fetchFromGitHub {
owner = "ahrm";
repo = "sioyek";
rev = "v${finalAttrs.version}";
sha256 = "sha256-GFZaTXJhoBB+rSe7Qk6H6FZJVXr3nO9XgM+LAbS4te4=";
};
patches = [
# Fixed compatibility with mupdf-0.23.0
# https://github.com/ahrm/sioyek/issues/804
(fetchurl {
url = "https://git.alpinelinux.org/aports/plain/community/sioyek/mupdf-0.23.0.patch?id=86e913eccf19b97a16f25d9b6cdf0f50232f1226";
hash = "sha256-sEqhpk7/h6g/fIhbu5LgpKKnbnIFLInrTP1k+/GhrXE=";
})
];
buildInputs = [
gumbo
harfbuzz
jbig2dec
mujs
mupdf
openjpeg
qt3d
qtbase
]
++ lib.optionals stdenv.hostPlatform.isDarwin [ freetype ];
nativeBuildInputs = [
installShellFiles
qmake
wrapQtAppsHook
];
qmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "CONFIG+=non_portable" ];
postPatch = ''
substituteInPlace pdf_viewer_build_config.pro \
--replace "-lmupdf-threads" "-lgumbo -lharfbuzz -lfreetype -ljbig2dec -ljpeg -lopenjp2" \
--replace "-lmupdf-third" ""
substituteInPlace pdf_viewer/main.cpp \
--replace "/usr/share/sioyek" "$out/share" \
--replace "/etc/sioyek" "$out/etc"
'';
postInstall = if stdenv.hostPlatform.isDarwin then ''
cp -r pdf_viewer/shaders sioyek.app/Contents/MacOS/shaders
cp pdf_viewer/prefs.config sioyek.app/Contents/MacOS/
cp pdf_viewer/prefs_user.config sioyek.app/Contents/MacOS/
cp pdf_viewer/keys.config sioyek.app/Contents/MacOS/
cp pdf_viewer/keys_user.config sioyek.app/Contents/MacOS/
cp tutorial.pdf sioyek.app/Contents/MacOS/
mkdir -p $out/Applications $out/bin
cp -r sioyek.app $out/Applications
ln -s $out/Applications/sioyek.app/Contents/MacOS/sioyek $out/bin/sioyek
'' else ''
install -Dm644 tutorial.pdf $out/share/tutorial.pdf
cp -r pdf_viewer/shaders $out/share/
install -Dm644 -t $out/etc/ pdf_viewer/{keys,prefs}.config
installManPage resources/sioyek.1
'';
meta = with lib; {
homepage = "https://sioyek.info/";
description = "PDF viewer designed for research papers and technical books";
mainProgram = "sioyek";
changelog = "https://github.com/ahrm/sioyek/releases/tag/v${finalAttrs.version}";
license = licenses.gpl3Only;
maintainers = with maintainers; [ podocarp ];
platforms = platforms.unix;
};
})
pkgs/applications/networking/browsers/lagrange/default.nix
+63 -41
View File
@@ -1,63 +1,85 @@
{ stdenv
, lib
, fetchFromGitHub
, nix-update-script
, cmake
, pkg-config
, fribidi
, harfbuzz
, libwebp
, mpg123
, SDL2
, the-foundation
, AppKit
, zip
, enableTUI ? false, ncurses, sealcurses
{
stdenv,
lib,
fetchFromGitHub,
nix-update-script,
cmake,
pkg-config,
fribidi,
harfbuzz,
libogg,
libwebp,
mpg123,
opusfile,
SDL2,
the-foundation,
AppKit,
zip,
enableTUI ? false,
ncurses,
sealcurses,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "lagrange";
version = "1.17.6";
version = "1.18.1";
src = fetchFromGitHub {
owner = "skyjake";
repo = "lagrange";
rev = "v${finalAttrs.version}";
hash = "sha256-ZF2HMfEI0LpvJrnB9MN8sQQDyBl/mRsI7pt6lfN4wdU=";
hash = "sha256-iIUWF93RZheW4uf3zgs1jqDjQnn0nFH7GOMaLBR0w0o=";
};
nativeBuildInputs = [ cmake pkg-config zip ];
buildInputs = [ the-foundation ]
++ lib.optionals (!enableTUI) [ fribidi harfbuzz libwebp mpg123 SDL2 ]
++ lib.optionals enableTUI [ ncurses sealcurses ]
++ lib.optional stdenv.hostPlatform.isDarwin AppKit;
cmakeFlags = lib.optionals enableTUI [
"-DENABLE_TUI=YES"
"-DENABLE_MPG123=NO"
"-DENABLE_WEBP=NO"
"-DENABLE_FRIBIDI=NO"
"-DENABLE_HARFBUZZ=NO"
"-DENABLE_POPUP_MENUS=NO"
"-DENABLE_IDLE_SLEEP=NO"
"-DCMAKE_INSTALL_DATADIR=${placeholder "out"}/share"
nativeBuildInputs = [
cmake
pkg-config
zip
];
installPhase = lib.optionalString (stdenv.hostPlatform.isDarwin && !enableTUI) ''
mkdir -p $out/Applications
mv Lagrange.app $out/Applications
'';
buildInputs =
[
the-foundation
fribidi
harfbuzz
libogg
libwebp
mpg123
opusfile
SDL2
]
++ lib.optionals enableTUI [
ncurses
sealcurses
]
++ lib.optional stdenv.hostPlatform.isDarwin AppKit;
cmakeFlags = [
(lib.cmakeBool "ENABLE_TUI" enableTUI)
(lib.cmakeFeature "CMAKE_INSTALL_DATAROOTDIR" "${placeholder "out"}/share")
];
installPhase =
lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir -p $out/Applications
mv Lagrange.app $out/Applications
''
+ lib.optionalString (stdenv.hostPlatform.isDarwin && enableTUI) ''
# https://github.com/skyjake/lagrange/issues/610
make install
install -d $out/share/lagrange
ln -s $out/Applications/Lagrange.app/Contents/Resources/resources.lgr $out/share/lagrange/resources.lgr
'';
passthru = {
updateScript = nix-update-script { };
};
meta = with lib; {
meta = {
description = "Beautiful Gemini Client";
homepage = "https://gmi.skyjake.fi/lagrange/";
license = licenses.bsd2;
maintainers = with maintainers; [ sikmir ];
platforms = platforms.unix;
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [ sikmir ];
platforms = lib.platforms.unix;
};
})
pkgs/applications/networking/cluster/nova/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "nova";
version = "3.10.1";
version = "3.10.2";
src = fetchFromGitHub {
owner = "FairwindsOps";
repo = pname;
rev = "v${version}";
hash = "sha256-V7cUXzXvixONqL71f8hpJbGS+PyJgz+8LSwOlmXm+Po=";
hash = "sha256-RpYlUYGqOtF9R1Fr+Smu7XMWN+Y+P3RnagjBRNnA8/8=";
};
vendorHash = "sha256-xhpE+KDEf36kAw1HVm3WhiOwyWkFxkD5S+3mx0Sytv4=";
vendorHash = "sha256-v3ld3bHpVWNJgQ6K5iS7q8QV4ft4RE42wKi+f4++yqY=";
ldflags = [ "-X main.version=${version}" "-s" "-w" ];
pkgs/development/tools/buf/default.nix → pkgs/by-name/bu/buf/package.nix
+7 -3
View File
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "buf";
version = "1.42.0";
version = "1.44.0";
src = fetchFromGitHub {
owner = "bufbuild";
repo = "buf";
rev = "v${version}";
hash = "sha256-T4cEl2aT6F/IamCd1FxomYxqGpbcbXzPtEu0AJUyJJU=";
hash = "sha256-I0Y9gsNqCFLR2Bkt55HyER6wznTNoZW5345zUmuOFXQ=";
};
vendorHash = "sha256-apF3FpVlwonm76d0Ue7TMPDIRW0BNkZXWMLgh1+mmvo=";
vendorHash = "sha256-4ykve9X//ckYPDkq76i0ojOiyzjrPJ/J2z7mA5giWKE=";
patches = [
# Skip a test that requires networking to be available to work.
@@ -40,6 +40,10 @@ buildGoModule rec {
];
preCheck = ''
# For WebAssembly runtime tests
GOOS=wasip1 GOARCH=wasm go build -o $GOPATH/bin/buf-plugin-suffix.wasm \
./private/bufpkg/bufcheck/internal/cmd/buf-plugin-suffix
# The tests need access to some of the built utilities
export PATH="$PATH:$GOPATH/bin"
'';
pkgs/development/tools/buf/skip_broken_tests.patch → pkgs/by-name/bu/buf/skip_broken_tests.patch
View File
pkgs/by-name/lo/loco-cli/Cargo.lock
Generated
-1606
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/lo/loco-cli/package.nix
+16 -18
View File
@@ -1,30 +1,28 @@
{ lib, rustPlatform, fetchFromGitHub }:
{
lib,
rustPlatform,
fetchCrate,
}:
rustPlatform.buildRustPackage rec {
pname = "loco-cli";
version = "0.2.6";
version = "0.2.9";
src = fetchFromGitHub {
owner = "loco-rs";
repo = "loco";
rev = "51e0362";
hash = "sha256-ZiAl+Ru2ggLy7RRqQySwKRbWtGesR7ZgREIpHKrJ00Q=";
sparseCheckout = [ "loco-cli" ];
src = fetchCrate {
inherit pname version;
hash = "sha256-AhL+k5XEf8m1pyOECTlPwALUG/ELJeACfV2kulxlzaA=";
};
cargoLock.lockFile = ./Cargo.lock;
cargoHash = "sha256-BtunTti1cPbG1Qiv39tLdbXHM413UzsCckyqL5CJEUA=";
postPatch = ''
ln -s ${./Cargo.lock} Cargo.lock
'';
#Skip trycmd integration tests
checkFlags = [ "--skip=cli_tests" ];
sourceRoot = "${src.name}/loco-cli";
meta = with lib; {
mainProgram = "loco";
meta = {
description = "Loco CLI is a powerful command-line tool designed to streamline the process of generating Loco websites";
homepage = "https://loco.rs";
changelog = "https://github.com/loco-rs/loco/blob/master/CHANGELOG.md";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ sebrut ];
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ sebrut ];
mainProgram = "loco";
};
}
pkgs/by-name/ma/mautrix-meta/package.nix
+1 -1
View File
@@ -46,7 +46,7 @@ buildGoModule rec {
homepage = "https://github.com/mautrix/meta";
description = "Matrix <-> Facebook and Matrix <-> Instagram hybrid puppeting/relaybot bridge";
license = lib.licenses.agpl3Plus;
maintainers = with lib.maintainers; [ rutherther eyjhb ];
maintainers = with lib.maintainers; [ eyjhb ];
mainProgram = "mautrix-meta";
};
}
pkgs/by-name/mi/mission-center/Cargo.lock
Generated
+1 -1
View File
@@ -667,7 +667,7 @@ dependencies = [
[[package]]
name = "missioncenter"
version = "0.6.0"
version = "0.6.1"
dependencies = [
"dbus",
"errno-sys",
pkgs/by-name/mi/mission-center/gatherer-Cargo.lock
Generated
+3 -3
View File
@@ -25,9 +25,9 @@ checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356"
[[package]]
name = "app-rummage"
version = "0.2.6"
version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c015066de1a3af6e3582d1c4bf19f481fe7536e495c30fae84ec63cb08f90622"
checksum = "1321031f83546d8c1c81840700838c47e1fbf8eba93c393f2821573624b296f0"
dependencies = [
"log",
"nix",
@@ -399,7 +399,7 @@ dependencies = [
[[package]]
name = "gatherer"
version = "0.6.0"
version = "0.6.1"
dependencies = [
"anyhow",
"app-rummage",
pkgs/by-name/mi/mission-center/package.nix
+20 -2
View File
@@ -38,8 +38,20 @@
wayland,
vulkan-loader,
versionCheckHook,
}:
# UPDATE PROCESS:
# 1) Get the nvtop commit hash (`source-url` in `nvtop.json`):
# https://gitlab.com/mission-center-devs/mission-center/-/blob/v<VERSION>/src/sys_info_v2/gatherer/3rdparty/nvtop/nvtop.json?ref_type=tags
# 2) Update the version of the main derivation
# 3) Get the main `Cargo.lock` and copy it to `Cargo.lock`:
# https://gitlab.com/mission-center-devs/mission-center/-/blob/v<VERSION>/Cargo.lock?ref_type=tags
# 4) Get the gatherer `Cargo.lock` and copy it to `gatherer-Cargo.lock`:
# https://gitlab.com/mission-center-devs/mission-center/-/blob/v<VERSION>/src/sys_info_v2/gatherer/Cargo.lock?ref_type=tags
# 5) Refresh both the `nvtop` and `src` hashes
let
nvtop = fetchFromGitHub {
owner = "Syllo";
@@ -50,13 +62,13 @@ let
in
stdenv.mkDerivation rec {
pname = "mission-center";
version = "0.6.0";
version = "0.6.1";
src = fetchFromGitLab {
owner = "mission-center-devs";
repo = "mission-center";
rev = "v${version}";
hash = "sha256-MHCQHQFMd+YFgwY+k5iVZG08UeYBvEhrZGhHmzR+cLc=";
hash = "sha256-1/cbU5yH6VlfFXCAO3m2CCZwCrqls8WZQf2eplfS6Rs=";
};
cargoDeps = symlinkJoin {
@@ -133,6 +145,12 @@ stdenv.mkDerivation rec {
patchShebangs data/hwdb/generate_hwdb.py
'';
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgram = "${builtins.placeholder "out"}/bin/${meta.mainProgram}";
doInstallCheck = true;
meta = {
description = "Monitor your CPU, Memory, Disk, Network and GPU usage";
homepage = "https://gitlab.com/mission-center-devs/mission-center";
pkgs/by-name/my/myks/package.nix
+4 -1
View File
@@ -49,7 +49,10 @@ buildGoModule rec {
description = "Configuration framework for Kubernetes applications";
license = licenses.mit;
homepage = "https://github.com/mykso/myks";
maintainers = [ maintainers.kbudde ];
maintainers = [
maintainers.kbudde
maintainers.zebradil
];
mainProgram = "myks";
};
}
pkgs/by-name/pr/presenterm/package.nix
+22 -15
View File
@@ -1,42 +1,49 @@
{ lib
, fetchFromGitHub
, rustPlatform
, libsixel
, stdenv
, nix-update-script
, testers
, presenterm
{
lib,
fetchFromGitHub,
rustPlatform,
libsixel,
stdenv,
nix-update-script,
versionCheckHook,
}:
rustPlatform.buildRustPackage rec {
pname = "presenterm";
version = "0.8.0";
version = "0.9.0";
src = fetchFromGitHub {
owner = "mfontanini";
repo = "presenterm";
rev = "refs/tags/v${version}";
hash = "sha256-sMhowTXPzZcIOV4Ny9NzvgXGsZSPBJGDg9JvuoZoSUc=";
hash = "sha256-BFL0Y6v1v15WLSvA5i+l47bR9+1qDHPWSMMuEaLdhPY=";
};
buildInputs = [
libsixel
];
cargoHash = "sha256-2aHJnGSuP0TEBMxF1zljbEyk1g6ECTpnByyH8jaj78s=";
cargoHash = "sha256-IC72l1xbH/AdCHdcgY8ODv6+YZUmT5NYVisP9oIMpGA=";
# Crashes at runtime on darwin with:
# Library not loaded: .../out/lib/libsixel.1.dylib
buildFeatures = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "sixel" ];
checkFlags = [
# failed to load .tmpEeeeaQ: No such file or directory (os error 2)
"--skip=external_snippet"
];
passthru = {
updateScript = nix-update-script { };
tests.version = testers.testVersion {
package = presenterm;
command = "presenterm --version";
};
};
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
doInstallCheck = true;
meta = {
description = "Terminal based slideshow tool";
changelog = "https://github.com/mfontanini/presenterm/releases/tag/v${version}";
pkgs/by-name/re/remnote/package.nix
+2 -2
View File
@@ -6,10 +6,10 @@
}:
let
pname = "remnote";
version = "1.16.116";
version = "1.16.127";
src = fetchurl {
url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage";
hash = "sha256-H89ge4b8Xm6YJXQSiPA/FBnlbekAG0Vobr2EQ4459q4=";
hash = "sha256-VsS9RXbcu6aV7b+Bk3lB+x6/X/HxN5EoypFCn4qKNEk=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };
in
pkgs/by-name/se/seilfahrt/package.nix
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "seilfahrt";
version = "1.0.2";
version = "2.0.0";
src = fetchFromGitHub {
owner = "Nerdbergev";
repo = "seilfahrt";
rev = "v${version}";
hash = "sha256-2nbBG/LIx1JDUzxyASvM/5hAI2JbBRDuv8Jub+yTwdA=";
hash = "sha256-eQcRS3xyqdtjRki+EPnHIaqUJufniFJCh5qU2Za9kyg=";
};
vendorHash = "sha256-JU77EFk8SWgZkN4DEtkKS2MsBH16my4j9X/NJC/r6mI=";
pkgs/by-name/si/sioyek/package.nix
+94
View File
@@ -0,0 +1,94 @@
{
lib,
stdenv,
installShellFiles,
fetchFromGitHub,
freetype,
nix-update-script,
gumbo,
harfbuzz,
jbig2dec,
mujs,
mupdf,
openjpeg,
qt6,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "sioyek";
version = "2.0.0-unstable-2024-09-29";
src = fetchFromGitHub {
owner = "ahrm";
repo = "sioyek";
rev = "965499f0acbb1faf4b443b6bca30e7078f944b52";
hash = "sha256-MOqWitXnYn8efk2LSeAOhmpcxGn6hbvjXbNTXEDdxIM=";
};
buildInputs = [
gumbo
harfbuzz
jbig2dec
mujs
mupdf
openjpeg
qt6.qt3d
qt6.qtbase
qt6.qtspeech
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ freetype ];
nativeBuildInputs = [
installShellFiles
qt6.qmake
qt6.wrapQtAppsHook
];
qmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "CONFIG+=non_portable" ];
postPatch = ''
substituteInPlace pdf_viewer_build_config.pro \
--replace-fail "-lmupdf-threads" "-lgumbo -lharfbuzz -lfreetype -ljbig2dec -ljpeg -lopenjp2" \
--replace-fail "-lmupdf-third" ""
substituteInPlace pdf_viewer/main.cpp \
--replace-fail "/usr/share/sioyek" "$out/share" \
--replace-fail "/etc/sioyek" "$out/etc"
'';
postInstall =
if stdenv.isDarwin then
''
cp -r pdf_viewer/shaders sioyek.app/Contents/MacOS/shaders
cp pdf_viewer/{prefs,prefs_user,keys,key_user}.config tutorial.pdf sioyek.app/Contents/MacOS/
mkdir -p $out/Applications $out/bin
cp -r sioyek.app $out/Applications
ln -s $out/Applications/sioyek.app/Contents/MacOS/sioyek $out/bin/sioyek
''
else
''
install -Dm644 tutorial.pdf $out/share/tutorial.pdf
cp -r pdf_viewer/shaders $out/share/
install -Dm644 -t $out/etc/ pdf_viewer/{keys,prefs}.config
installManPage resources/sioyek.1
'';
passthru.updateScript = nix-update-script {
extraArgs = [
"--version"
"branch=development"
];
};
meta = with lib; {
homepage = "https://sioyek.info/";
description = "PDF viewer designed for research papers and technical books";
mainProgram = "sioyek";
changelog = "https://github.com/ahrm/sioyek/releases/tag/v${finalAttrs.version}";
license = licenses.gpl3Only;
maintainers = with maintainers; [
podocarp
stephen-huan
xyven1
];
platforms = platforms.unix;
};
})
pkgs/by-name/st/starpls-bin/package.nix
+9 -1
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl }:
{ lib, stdenv, fetchurl, autoPatchelfHook }:
stdenv.mkDerivation (finalAttrs: {
pname = "starpls-bin";
@@ -19,6 +19,14 @@ stdenv.mkDerivation (finalAttrs: {
dontConfigure = true;
dontBuild = true;
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isElf [
autoPatchelfHook
];
buildInputs = lib.optionals stdenv.hostPlatform.isElf [
stdenv.cc.cc.lib
];
installPhase = ''
install -D $src $out/bin/starpls
'';
pkgs/by-name/sy/syslogng/package.nix
+2 -2
View File
@@ -64,13 +64,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "syslog-ng";
version = "4.8.0";
version = "4.8.1";
src = fetchFromGitHub {
owner = "syslog-ng";
repo = "syslog-ng";
rev = "syslog-ng-${finalAttrs.version}";
hash = "sha256-sfCElufK80BU8I6pbdCJ+IlAPhSOt9MOYDy3E2hg5/A=";
hash = "sha256-YdGbDpGMC0DPuPSbfe9HvZshBVdv1s1+hiHDnhYbs6Q=";
fetchSubmodules = true;
};
nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config which bison flex libxslt perl gperf python3Packages.setuptools ];
pkgs/by-name/to/tomlq/package.nix
+26
View File
@@ -0,0 +1,26 @@
{
lib,
rustPlatform,
fetchFromGitHub,
}:
rustPlatform.buildRustPackage rec {
pname = "tomlq";
version = "0.1.6";
src = fetchFromGitHub {
owner = "cryptaliagy";
repo = "tomlq";
rev = "refs/tags/${version}";
hash = "sha256-g8xjz8qCTiulTwcEbLTHYldw4PI+4ZfCOMJs+J6L1C4=";
};
cargoHash = "sha256-/cepTVJoBM1LYZkFpH9UCvE74cSszHDaeThsZksQ1P8=";
meta = {
description = "Tool for getting data from TOML files on the command line";
homepage = "https://github.com/cryptaliagy/tomlq";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ kinzoku ];
mainProgram = "tq";
};
}
pkgs/by-name/tr/troubadix/package.nix
+2 -2
View File
@@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "troubadix";
version = "24.9.4";
version = "24.10.0";
pyproject = true;
src = fetchFromGitHub {
owner = "greenbone";
repo = "troubadix";
rev = "refs/tags/v${version}";
hash = "sha256-y7IVEDbXYiNi9/SIlbmrkZ5SxrLzYe3Yy8LkP+wID3w=";
hash = "sha256-UOjR23VfOc65584JQtO+LF2Pp1JER8nIOA64hRnd5UA=";
};
pythonRelaxDeps = [ "validators" ];
pkgs/by-name/un/unl0kr/package.nix
+1 -1
View File
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
mainProgram = "unl0kr";
homepage = "https://gitlab.com/cherrypicker/unl0kr";
license = licenses.gpl3Plus;
maintainers = [];
maintainers = with maintainers; [ hustlerone ];
platforms = platforms.linux;
};
})
pkgs/by-name/ya/yara-x/package.nix
+3 -3
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "yara-x";
version = "0.8.0";
version = "0.9.0";
src = fetchFromGitHub {
owner = "VirusTotal";
repo = "yara-x";
rev = "refs/tags/v${version}";
hash = "sha256-xCybcDRswxRHiPf0ultIahxSPqn0YonmR4Kah38wJuw=";
hash = "sha256-W5qZHPNfRe9RmsmRzA8xGPvLl6JCoVJ59N87p2ZnXGo=";
};
cargoHash = "sha256-6CDzOxvktJc6AnFOm6OJp3cD2bZ0XCY5HLIoEmP59es=";
cargoHash = "sha256-ofmTDO11hqr95vSKRtJgMZL2BeA4AkCRNLknzr4n88I=";
nativeBuildInputs = [ cmake installShellFiles ];
pkgs/development/interpreters/acl2/default.nix
+21 -8
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, callPackage, fetchFromGitHub, runCommandLocal, makeWrapper, substituteAll
{ lib, stdenv, callPackage, fetchFromGitHub, fetchpatch, runCommandLocal, makeWrapper, substituteAll
, sbcl, bash, which, perl, hostname
, openssl, glucose, minisat, abc-verifier, z3, python3
, certifyBooks ? true
@@ -33,12 +33,25 @@ in stdenv.mkDerivation rec {
# $IPASIR_SHARED_LIBRARY environment variable.
libipasir = callPackage ./libipasirglucose4 { };
patches = [(substituteAll {
src = ./0001-Fix-some-paths-for-Nix-build.patch;
libipasir = "${libipasir}/lib/${libipasir.libname}";
libssl = "${lib.getLib openssl}/lib/libssl${stdenv.hostPlatform.extensions.sharedLibrary}";
libcrypto = "${lib.getLib openssl}/lib/libcrypto${stdenv.hostPlatform.extensions.sharedLibrary}";
})];
patches = [
(substituteAll {
src = ./0001-Fix-some-paths-for-Nix-build.patch;
libipasir = "${libipasir}/lib/${libipasir.libname}";
libssl = "${lib.getLib openssl}/lib/libssl${stdenv.hostPlatform.extensions.sharedLibrary}";
libcrypto = "${lib.getLib openssl}/lib/libcrypto${stdenv.hostPlatform.extensions.sharedLibrary}";
})
(fetchpatch {
name = "fix-fastnumio-on-newer-sbcl.patch";
url = "https://github.com/acl2-devel/acl2-devel/commit/84f5a6cd4a1aaf204e8bae3eab4c21e8c061f469.patch";
hash = "sha256-VA9giXZMb/Ob8ablxfbBAaZ2+2PGcv7WtooXwKDgT08=";
})
];
# We need the timestamps on the source tree to be stable for certification to
# work properly, so reset them here as necessary after patching
postPatch = ''
find . -type f -newer "$src" -execdir touch -r "$src" {} +
'';
nativeBuildInputs = lib.optional certifyBooks makeWrapper;
@@ -112,7 +125,7 @@ in stdenv.mkDerivation rec {
'';
meta = with lib; {
description = "Interpreter and a prover for a Lisp dialect";
description = "Interpreter and prover for a Lisp dialect";
mainProgram = "acl2";
longDescription = ''
ACL2 is a logic and programming language in which you can model computer
pkgs/development/libraries/kerberos/heimdal.nix
+3 -3
View File
@@ -48,13 +48,13 @@ assert lib.assertMsg (withOpenLDAPAsHDBModule -> withOpenLDAP) ''
stdenv.mkDerivation {
pname = "heimdal";
version = "7.8.0-unstable-2023-11-29";
version = "7.8.0-unstable-2024-09-10";
src = fetchFromGitHub {
owner = "heimdal";
repo = "heimdal";
rev = "3253c49544eacb33d5ad2f6f919b0696e5aab794";
hash = "sha256-uljzQBzXrZCZjcIWfioqHN8YsbUUNy14Vo+A3vZIXzM=";
rev = "fd2d434dd375c402d803e6f948cfc6e257d3facc";
hash = "sha256-WA3lo3eD05l7zKuKEVxudMmiG7OvjK/calaUzPQ2pWs=";
};
outputs = [ "out" "dev" "man" "info" ];
pkgs/development/libraries/the-foundation/default.nix
+32 -18
View File
@@ -1,41 +1,55 @@
{ lib
, stdenv
, fetchFromGitea
, cmake
, pkg-config
, curl
, libunistring
, openssl
, pcre
, zlib
{
lib,
stdenv,
fetchFromGitea,
cmake,
pkg-config,
curl,
libunistring,
openssl,
pcre,
zlib,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "the-foundation";
version = "1.8.1";
version = "1.9.0";
src = fetchFromGitea {
domain = "git.skyjake.fi";
owner = "skyjake";
repo = "the_Foundation";
rev = "v${finalAttrs.version}";
hash = "sha256-gyDBK/bF+QxXMnthUfMjeUuRBZk0Xcahm7wOtLGs5kY=";
hash = "sha256-hrwnY8m4xW8Sr2RunwD5VB+gnYUtZxXyGoiO3N23qGM=";
};
nativeBuildInputs = [ cmake pkg-config ];
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [ curl libunistring openssl pcre zlib ];
buildInputs = [
curl
libunistring
openssl
pcre
zlib
];
cmakeFlags = [
(lib.cmakeFeature "UNISTRING_DIR" "${libunistring}")
];
postFixup = ''
substituteInPlace "$out"/lib/pkgconfig/the_Foundation.pc \
--replace '="''${prefix}//' '="/'
'';
meta = with lib; {
meta = {
description = "Opinionated C11 library for low-level functionality";
homepage = "https://git.skyjake.fi/skyjake/the_Foundation";
license = licenses.bsd2;
maintainers = with maintainers; [ sikmir ];
platforms = platforms.unix;
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [ sikmir ];
platforms = lib.platforms.unix;
};
})
pkgs/development/python-modules/airgradient/default.nix
+2 -2
View File
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "airgradient";
version = "0.9.0";
version = "0.9.1";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "airgradienthq";
repo = "python-airgradient";
rev = "refs/tags/v${version}";
hash = "sha256-BBJ9pYE9qAE62FJFwycWBnvsoeobjsg0uIDZffIg18o=";
hash = "sha256-al0DLsub3xLU1BWLNn0cMI87O0mcQJ0Y4Boj2Xwk1r0=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/dvc-task/default.nix
+2 -2
View File
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "dvc-task";
version = "0.4.0";
version = "0.40.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = "dvc-task";
rev = "refs/tags/${version}";
hash = "sha256-zSPv+eMGSsGXKtgi9r4EiGY1ZURXeJXWBKvR2GnfP8I=";
hash = "sha256-r5rBY4g4S4VaifGCK3bGx6arjPoGZI9th2T9LDC5wfI=";
};
build-system = [ setuptools-scm ];
pkgs/development/python-modules/hepunits/default.nix
+2 -2
View File
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "hepunits";
version = "2.3.4";
version = "2.3.5";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-qEK4hqZ7oFY6NHFVJ3z9yPtnAggjNmG8urnyip34zWA=";
hash = "sha256-lDTNLWpyLJSenp4ivQtZWH9pAlvTc1blxwY18bNwNtg=";
};
nativeBuildInputs = [
pkgs/development/python-modules/lxmf/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "lxmf";
version = "0.5.4";
version = "0.5.5";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "markqvist";
repo = "lxmf";
rev = "refs/tags/${version}";
hash = "sha256-sFtfjDhG3dEMD49GxEVlYm338M3E4xoH5chIvlRVOQg=";
hash = "sha256-1zZRONzKafXfnmszRl7oCRTFBsy9U1bUaOzWwt7jLzY=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/pubnub/default.nix
+2 -2
View File
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "pubnub";
version = "8.1.0";
version = "9.0.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "pubnub";
repo = "python";
rev = "refs/tags/v${version}";
hash = "sha256-c6NSwDl0rV5t9dELuVVbRiLXYzxcYhiLc6yV4QoErTs=";
hash = "sha256-v3tFbq2YvQJRvRu9+8yzWLkFo+7AMsJDlqjMK2Q/FAE=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/sunweg/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "sunweg";
version = "3.0.2";
version = "3.1.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "rokam";
repo = "sunweg";
rev = "refs/tags/${version}";
hash = "sha256-/pniECgavRiQdKzNtPINNhOijUW/uhPEOQJtjfr46ps=";
hash = "sha256-T67eH5WjS7J2pcNjq9psNmD4MwMfH+HRvk9llqI3FoQ=";
};
nativeBuildInputs = [ setuptools ];
pkgs/development/tools/devbox/default.nix
+6 -3
View File
@@ -2,16 +2,17 @@
, fetchFromGitHub
, installShellFiles
, lib
, stdenv
}:
buildGoModule rec {
pname = "devbox";
version = "0.13.0";
version = "0.13.3";
src = fetchFromGitHub {
owner = "jetpack-io";
repo = pname;
rev = version;
hash = "sha256-gTJotzg7ot9C7NVDiauVJHpkSXBwaK7arjtnwUGFqgE=";
hash = "sha256-A1dl5bQ7+Qe+MxzplQ2duGqWwgZYHd6M2MQUPPFlx14=";
};
ldflags = [
@@ -20,6 +21,8 @@ buildGoModule rec {
"-X go.jetpack.io/devbox/internal/build.Version=${version}"
];
subPackages = [ "cmd/devbox" ];
# integration tests want file system access
doCheck = false;
@@ -27,7 +30,7 @@ buildGoModule rec {
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd devbox \
--bash <($out/bin/devbox completion bash) \
--fish <($out/bin/devbox completion fish) \
pkgs/development/tools/rust/cargo-web/default.nix
+1 -1
View File
@@ -50,6 +50,6 @@ rustPlatform.buildRustPackage rec {
asl20 # or
mit
];
maintainers = with maintainers; [ kevincox ];
maintainers = with maintainers; [ clevor ];
};
}
pkgs/tools/misc/tmuxinator/default.nix
+5 -5
View File
@@ -11,12 +11,12 @@ buildRubyGem rec {
version = "3.3.1";
source.sha256 = "sha256-xixLYzDIvX3D+vbe9SccST37TnyZx/YjePLPjagHsOU=";
erubis = buildRubyGem rec {
erubi = buildRubyGem rec {
inherit ruby;
name = "ruby${ruby.version}-${gemName}-${version}";
gemName = "erubis";
version = "2.7.0";
source.sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3";
gemName = "erubi";
version = "1.13.0";
source.sha256 = "fca61b47daefd865d0fb50d168634f27ad40181867445badf6427c459c33cd62";
};
thor = buildRubyGem rec {
@@ -35,7 +35,7 @@ buildRubyGem rec {
source.sha256 = "04xr4cavnzxlk926pkji7b5yiqy4qsd3gdvv8mg6jliq6sczg9gk";
};
propagatedBuildInputs = [ erubis thor xdg ];
propagatedBuildInputs = [ erubi thor xdg ];
nativeBuildInputs = [ installShellFiles ];
pkgs/tools/misc/topgrade/default.nix
+3 -3
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "topgrade";
version = "15.0.0";
version = "16.0.0";
src = fetchFromGitHub {
owner = "topgrade-rs";
repo = "topgrade";
rev = "v${version}";
hash = "sha256-w3JsMUuARJ5UtA8Io3kzeNjXoa014YzyT8hHPwEgljQ=";
hash = "sha256-MYilhVUaf5+gsRNv3tJm5UL8mH2T49r8jLPkd4vHRTw=";
};
cargoHash = "sha256-DEZlpt9mOy/BOnvkkINz2+q3hUx2aBSzBfOVxv43w6g=";
cargoHash = "sha256-RP86Wk4rsM6MBH6zAiZ5JqQhkm0HCEMFrUj9ULqB978=";
nativeBuildInputs = [
installShellFiles
pkgs/tools/networking/cloudflare-warp/default.nix
+4 -4
View File
@@ -16,7 +16,7 @@
stdenv.mkDerivation rec {
pname = "cloudflare-warp";
version = "2024.6.497";
version = "2024.9.346";
suffix = {
aarch64-linux = "arm64";
@@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
src = fetchurl {
url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}-1_${suffix}.deb";
url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}.0_${suffix}.deb";
hash = {
aarch64-linux = "sha256-j0D1VcPCJpp0yoK6GjuKKwTVNEqKgr9+6X1AfBbsXAg=";
x86_64-linux = "sha256-y+1TQ/QzzjkorSscB2+QBYR81IowKWcgSoUm1Nz9Gts=";
aarch64-linux = "sha256-dgu/OiQPT7bkPnhrDArQg2lDAcOyhzZ5nJrjS2dqpFo=";
x86_64-linux = "sha256-KwxLF7LWB49M+kZPJ9M4OcDSF1f3MX4S0dTtTkzQVRQ=";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};
pkgs/tools/networking/termscp/default.nix
+3 -3
View File
@@ -14,16 +14,16 @@
rustPlatform.buildRustPackage rec {
pname = "termscp";
version = "0.14.0";
version = "0.15.0";
src = fetchFromGitHub {
owner = "veeso";
repo = "termscp";
rev = "refs/tags/v${version}";
hash = "sha256-XK0bH5ru248tSlD3Sdxb07O6i335dfTFvxDzKdc/3GQ=";
hash = "sha256-/WYhwt/GAULX/UY1GyqzauaMRlVuvAwwS0DNfYB7aD4=";
};
cargoHash = "sha256-DzKxVqE0GMmpkxLH3raASgha9qGGs4kaUdSaviUwvdM=";
cargoHash = "sha256-OqrJpVb9EF22OGP5SOIfEUg66+T96qcN3GH+fs72+7A=";
nativeBuildInputs = [
pkg-config
pkgs/tools/security/apachetomcatscanner/default.nix
+6 -4
View File
@@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "apachetomcatscanner";
version = "3.5";
format = "setuptools";
version = "3.7.2";
pyproject = true;
src = fetchFromGitHub {
owner = "p0dalirius";
repo = "ApacheTomcatScanner";
rev = "refs/tags/${version}";
hash = "sha256-ChVVXUjm6y71iRs64Kv63oiOG1GSqmx6J0YiGtEI0ao=";
hash = "sha256-mzpJq0er13wcekTac3j4cnRokHh6Q0seM8vwZsM2tN8=";
};
# Posted a PR for discussion upstream that can be followed:
@@ -21,6 +21,8 @@ python3.pkgs.buildPythonApplication rec {
sed -i '/apachetomcatscanner=apachetomcatscanner\.__main__:main/d' setup.py
'';
build-system = with python3.pkgs; [ setuptools ];
propagatedBuildInputs = with python3.pkgs; [
requests
sectools
@@ -39,7 +41,7 @@ python3.pkgs.buildPythonApplication rec {
mainProgram = "ApacheTomcatScanner";
homepage = "https://github.com/p0dalirius/ApacheTomcatScanner";
changelog = "https://github.com/p0dalirius/ApacheTomcatScanner/releases/tag/${version}";
license = with licenses; [ gpl2Only ];
license = licenses.gpl2Only;
maintainers = with maintainers; [ fab ];
};
}
pkgs/tools/security/kubescape/default.nix
+3 -3
View File
@@ -10,18 +10,18 @@
buildGoModule rec {
pname = "kubescape";
version = "3.0.17";
version = "3.0.18";
src = fetchFromGitHub {
owner = "kubescape";
repo = "kubescape";
rev = "refs/tags/v${version}";
hash = "sha256-xErgJPtf89Zmjn2lyRSuVmHT692xzupxWuBsu547+E0=";
hash = "sha256-4HBKvykeFFYg+/86ophmpIWELX8zkbvYEYgmISD3bbY=";
fetchSubmodules = true;
};
proxyVendor = true;
vendorHash = "sha256-i3KvZt7DpQ7kiWe+g4k2sHqI3ypxKiwrLhOe/sg3FMs=";
vendorHash = "sha256-QcCCY7BdDhZeLSOIYNnAet7uvcGlju4qb/j/GYwu2vE=";
subPackages = [ "." ];
pkgs/tools/security/wpscan/Gemfile.lock
+35 -25
View File
@@ -1,57 +1,67 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (6.1.7.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
activesupport (7.2.1)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
logger (>= 1.4.2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
cms_scanner (0.13.9)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
base64 (0.2.0)
bigdecimal (3.1.8)
cms_scanner (0.14.3)
ethon (>= 0.14, < 0.17)
get_process_mem (~> 0.2.5)
nokogiri (>= 1.11.4, < 1.16.0)
opt_parse_validator (~> 1.9.5)
public_suffix (>= 4.0.3, < 5.1.0)
nokogiri (~> 1.16)
opt_parse_validator (~> 1.10.0)
public_suffix (>= 4.0.3, < 6.1)
ruby-progressbar (>= 1.10, < 1.14)
sys-proctable (>= 1.2.2, < 1.4.0)
typhoeus (>= 1.3, < 1.5)
xmlrpc (~> 0.3)
yajl-ruby (~> 1.4.1)
concurrent-ruby (1.2.2)
concurrent-ruby (1.3.4)
connection_pool (2.4.1)
drb (2.2.1)
ethon (0.16.0)
ffi (>= 1.15.0)
ffi (1.16.3)
ffi (1.17.0)
get_process_mem (0.2.7)
ffi (~> 1.0)
i18n (1.14.1)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
mini_portile2 (2.8.5)
minitest (5.20.0)
nokogiri (1.15.5)
logger (1.6.1)
mini_portile2 (2.8.7)
minitest (5.25.1)
nokogiri (1.16.7)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
opt_parse_validator (1.9.5)
activesupport (>= 5.2, < 6.2.0)
opt_parse_validator (1.10.0)
activesupport (>= 5.2, < 7.3.0)
addressable (>= 2.5, < 2.9)
public_suffix (5.0.4)
racc (1.7.3)
public_suffix (6.0.1)
racc (1.8.1)
ruby-progressbar (1.13.0)
securerandom (0.3.1)
sys-proctable (1.3.0)
ffi (~> 1.1)
typhoeus (1.4.1)
ethon (>= 0.9.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
webrick (1.8.1)
wpscan (3.8.25)
cms_scanner (~> 0.13.9)
webrick (1.8.2)
wpscan (3.8.27)
cms_scanner (~> 0.14.3)
xmlrpc (0.3.3)
webrick
yajl-ruby (1.4.3)
zeitwerk (2.6.12)
PLATFORMS
ruby
@@ -60,4 +70,4 @@ DEPENDENCIES
wpscan
BUNDLED WITH
2.4.22
2.5.16
pkgs/tools/security/wpscan/gemset.nix
+89 -39
View File
@@ -1,14 +1,14 @@
{
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "logger" "minitest" "securerandom" "tzinfo"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1nhrdih0rk46i0s6x7nqhbypmj1hf23zl5gfl9xasb6k4r2a1dxk";
sha256 = "094cv9kxa8hwlsw3c0njkvvayd0wszcz9b6xywv4yajrg83zlmvm";
type = "gem";
};
version = "6.1.7.6";
version = "7.2.1";
};
addressable = {
dependencies = ["public_suffix"];
@@ -16,10 +16,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33";
sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6";
type = "gem";
};
version = "2.8.5";
version = "2.8.7";
};
base64 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g";
type = "gem";
};
version = "0.2.0";
};
bigdecimal = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558";
type = "gem";
};
version = "3.1.8";
};
cms_scanner = {
dependencies = ["ethon" "get_process_mem" "nokogiri" "opt_parse_validator" "public_suffix" "ruby-progressbar" "sys-proctable" "typhoeus" "xmlrpc" "yajl-ruby"];
@@ -27,20 +47,40 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0p3vdkkd04r31d503z5v0480xlq1fhiw77icbk5s17y6dwfacydy";
sha256 = "1bkmxxxz0q8brfivm7li1hmk2yrdl8wpi25qi4c2rhzfk361ass3";
type = "gem";
};
version = "0.13.9";
version = "0.14.3";
};
concurrent-ruby = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q";
sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl";
type = "gem";
};
version = "1.2.2";
version = "1.3.4";
};
connection_pool = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g";
type = "gem";
};
version = "2.4.1";
};
drb = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79";
type = "gem";
};
version = "2.2.1";
};
ethon = {
dependencies = ["ffi"];
@@ -58,10 +98,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd";
sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi";
type = "gem";
};
version = "1.16.3";
version = "1.17.0";
};
get_process_mem = {
dependencies = ["ffi"];
@@ -80,30 +120,40 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx";
sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw";
type = "gem";
};
version = "1.14.1";
version = "1.14.6";
};
logger = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s";
type = "gem";
};
version = "1.6.1";
};
mini_portile2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs";
sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk";
type = "gem";
};
version = "2.8.5";
version = "2.8.7";
};
minitest = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bkmfi9mb49m0fkdhl2g38i3xxa02d411gg0m8x0gvbwfmmg5ym3";
sha256 = "1n1akmc6bibkbxkzm1p1wmfb4n9vv397knkgz0ffykb3h1d7kdix";
type = "gem";
};
version = "5.20.0";
version = "5.25.1";
};
nokogiri = {
dependencies = ["mini_portile2" "racc"];
@@ -111,10 +161,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "004ip9x9281fxhpipwi8di1sb1dnabscq9dy1p3cxgdwbniqqi12";
sha256 = "15gysw8rassqgdq3kwgl4mhqmrgh7nk2qvrcqp4ijyqazgywn6gq";
type = "gem";
};
version = "1.15.5";
version = "1.16.7";
};
opt_parse_validator = {
dependencies = ["activesupport" "addressable"];
@@ -122,30 +172,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jzmn3h9sr7bhjj1fdfvh4yzvqx7d3vsbwbqrf718dh427ifqs9c";
sha256 = "0x2pn1c8h5sn3j5x05n2l1wnd56vp28jzg8pap1dj7ddmhlv12p4";
type = "gem";
};
version = "1.9.5";
version = "1.10.0";
};
public_suffix = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m";
sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31";
type = "gem";
};
version = "5.0.4";
version = "6.0.1";
};
racc = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp";
sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa";
type = "gem";
};
version = "1.7.3";
version = "1.8.1";
};
ruby-progressbar = {
groups = ["default"];
@@ -157,6 +207,16 @@
};
version = "1.13.0";
};
securerandom = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1phv6kh417vkanhssbjr960c0gfqvf8z7d3d9fd2yvd41q64bw4q";
type = "gem";
};
version = "0.3.1";
};
sys-proctable = {
dependencies = ["ffi"];
groups = ["default"];
@@ -195,10 +255,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r";
sha256 = "089gy5494j560b242vi173wnbj2913hwlwnjkpzld58r96ilc5s3";
type = "gem";
};
version = "1.8.1";
version = "1.8.2";
};
wpscan = {
dependencies = ["cms_scanner"];
@@ -206,10 +266,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1x04asq0aznbm6m79jlsv7mjbhq755759s4bi3qbyrv5rwpy7hji";
sha256 = "14d2kp01fnbm88ny6wvzr1v8za2mv4wvx8k0iz8cb5z15nlldk78";
type = "gem";
};
version = "3.8.25";
version = "3.8.27";
};
xmlrpc = {
dependencies = ["webrick"];
@@ -232,14 +292,4 @@
};
version = "1.4.3";
};
zeitwerk = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gir0if4nryl1jhwi28669gjwhxb7gzrm1fcc8xzsch3bnbi47jn";
type = "gem";
};
version = "2.6.12";
};
}
pkgs/tools/virtualization/mininet/default.nix
+6 -2
View File
@@ -13,7 +13,11 @@
}:
let
pyEnv = python3.withPackages(ps: [ ps.setuptools ]);
pyEnv = python3.withPackages(ps: [
ps.setuptools
ps.packaging
ps.distutils
]);
telnet = runCommand "inetutils-telnet"
{ }
@@ -53,7 +57,7 @@ stdenv.mkDerivation rec {
pythonPath = [ python3.pkgs.setuptools ];
nativeBuildInputs = [ help2man makeWrapper python3.pkgs.wrapPython ];
propagatedBuildInputs = [ python3 which ];
propagatedBuildInputs = [ pyEnv which ];
installTargets = [ "install-mnexec" "install-manpages" ];
pkgs/top-level/aliases.nix
+1
View File
@@ -1243,6 +1243,7 @@ mapAliases {
pipewire_0_2 = throw "pipewire_0_2 has been removed as it is outdated and no longer used"; # Added 2024-07-28
pipewire-media-session = throw "pipewire-media-session is no longer maintained and has been removed. Please use Wireplumber instead.";
pkgconfig = throw "'pkgconfig' has been renamed to/replaced by 'pkg-config'"; # Converted to throw 2023-09-10
playwright = lib.warn "'playwright' will reference playwright-driver in 25.05. Reference 'python3Packages.playwright' for the python test launcher" python3Packages.toPythonApplication python3Packages.playwright; # Added 2024-10-04
pleroma-otp = pleroma; # Added 2021-07-10
pltScheme = racket; # just to be sure
pmdk = throw "'pmdk' is discontinued, no further support or maintenance is planned by upstream"; # Added 2023-02-06
pkgs/top-level/all-packages.nix
-6
View File
@@ -347,8 +347,6 @@ with pkgs;
brev-cli = callPackage ../development/misc/brev-cli { };
buf = callPackage ../development/tools/buf { };
cbfmt = callPackage ../development/tools/cbfmt { };
circumflex = callPackage ../applications/networking/circumflex { };
@@ -11244,8 +11242,6 @@ with pkgs;
playbar2 = libsForQt5.callPackage ../applications/audio/playbar2 { };
playwright = with python3Packages; toPythonApplication playwright;
playwright-driver = (callPackage ../development/web/playwright/driver.nix { }).playwright-core;
playwright-test = (callPackage ../development/web/playwright/driver.nix { }).playwright-test;
@@ -32505,8 +32501,6 @@ with pkgs;
sic-image-cli = callPackage ../tools/graphics/sic-image-cli { };
sioyek = libsForQt5.callPackage ../applications/misc/sioyek { };
siproxd = callPackage ../applications/networking/siproxd { };
sish = callPackage ../tools/networking/sish { };