mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-13 21:50:33 +03:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
ae79d808a5
80 changed files with 1536 additions and 1020 deletions
|
|
@ -4222,6 +4222,14 @@
|
|||
githubId = 39825;
|
||||
name = "Dominik Honnef";
|
||||
};
|
||||
donovanglover = {
|
||||
github = "donovanglover";
|
||||
githubId = 2374245;
|
||||
name = "Donovan Glover";
|
||||
keys = [{
|
||||
fingerprint = "EE7D 158E F9E7 660E 0C33 86B2 8FC5 F7D9 0A5D 8F4D";
|
||||
}];
|
||||
};
|
||||
doriath = {
|
||||
email = "tomasz.zurkowski@gmail.com";
|
||||
github = "doriath";
|
||||
|
|
|
|||
|
|
@ -1,15 +1,18 @@
|
|||
{ maintainer }:
|
||||
let
|
||||
pkgs = import ./../../default.nix { };
|
||||
pkgs = import ./../../default.nix {
|
||||
config.allowAliases = false;
|
||||
};
|
||||
inherit (pkgs) lib;
|
||||
maintainer_ = pkgs.lib.maintainers.${maintainer};
|
||||
packagesWith = cond: return: prefix: set:
|
||||
(pkgs.lib.flatten
|
||||
(pkgs.lib.mapAttrsToList
|
||||
(lib.flatten
|
||||
(lib.mapAttrsToList
|
||||
(name: pkg:
|
||||
let
|
||||
result = builtins.tryEval
|
||||
(
|
||||
if pkgs.lib.isDerivation pkg && cond name pkg then
|
||||
if lib.isDerivation pkg && cond name pkg then
|
||||
# Skip packages whose closure fails on evaluation.
|
||||
# This happens for pkgs like `python27Packages.djangoql`
|
||||
# that have disabled Python pkgs as dependencies.
|
||||
|
|
@ -42,7 +45,7 @@ let
|
|||
)
|
||||
)
|
||||
(name: name)
|
||||
("")
|
||||
""
|
||||
pkgs;
|
||||
|
||||
in
|
||||
|
|
|
|||
|
|
@ -1,13 +1,31 @@
|
|||
# Configuration for the pwdutils suite of tools: passwd, useradd, etc.
|
||||
|
||||
{ config, lib, utils, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.security.loginDefs;
|
||||
in
|
||||
{
|
||||
options = with types; {
|
||||
security.loginDefs = {
|
||||
package = mkPackageOptionMD pkgs "shadow" { };
|
||||
|
||||
/*
|
||||
There are three different sources for user/group id ranges, each of which gets
|
||||
chfnRestrict = mkOption {
|
||||
description = mdDoc ''
|
||||
Use chfn SUID to allow non-root users to change their account GECOS information.
|
||||
'';
|
||||
type = nullOr str;
|
||||
default = null;
|
||||
};
|
||||
|
||||
settings = mkOption {
|
||||
description = mdDoc ''
|
||||
Config options for the /etc/login.defs file, that defines
|
||||
the site-specific configuration for the shadow password suite.
|
||||
See login.defs(5) man page for available options.
|
||||
'';
|
||||
type = submodule {
|
||||
freeformType = (pkgs.formats.keyValue { }).type;
|
||||
/* There are three different sources for user/group id ranges, each of which gets
|
||||
used by different programs:
|
||||
- The login.defs file, used by the useradd, groupadd and newusers commands
|
||||
- The update-users-groups.pl file, used by NixOS in the activation phase to
|
||||
|
|
@ -16,52 +34,98 @@ let
|
|||
- Systemd compile time options -Dsystem-uid-max= and -Dsystem-gid-max=, used
|
||||
by systemd for features like ConditionUser=@system and systemd-sysusers
|
||||
*/
|
||||
loginDefs =
|
||||
''
|
||||
DEFAULT_HOME yes
|
||||
|
||||
SYS_UID_MIN 400
|
||||
SYS_UID_MAX 999
|
||||
UID_MIN 1000
|
||||
UID_MAX 29999
|
||||
|
||||
SYS_GID_MIN 400
|
||||
SYS_GID_MAX 999
|
||||
GID_MIN 1000
|
||||
GID_MAX 29999
|
||||
|
||||
TTYGROUP tty
|
||||
TTYPERM 0620
|
||||
|
||||
# Ensure privacy for newly created home directories.
|
||||
UMASK 077
|
||||
|
||||
# Uncomment this and install chfn SUID to allow non-root
|
||||
# users to change their account GECOS information.
|
||||
# This should be made configurable.
|
||||
#CHFN_RESTRICT frwh
|
||||
|
||||
# The default crypt() method, keep in sync with the PAM default
|
||||
ENCRYPT_METHOD YESCRYPT
|
||||
'';
|
||||
|
||||
mkSetuidRoot = source:
|
||||
{ setuid = true;
|
||||
owner = "root";
|
||||
group = "root";
|
||||
inherit source;
|
||||
options = {
|
||||
DEFAULT_HOME = mkOption {
|
||||
description = mdDoc "Indicate if login is allowed if we can't cd to the home directory.";
|
||||
default = "yes";
|
||||
type = enum [ "yes" "no" ];
|
||||
};
|
||||
|
||||
in
|
||||
ENCRYPT_METHOD = mkOption {
|
||||
description = mdDoc "This defines the system default encryption algorithm for encrypting passwords.";
|
||||
# The default crypt() method, keep in sync with the PAM default
|
||||
default = "YESCRYPT";
|
||||
type = enum [ "YESCRYPT" "SHA512" "SHA256" "MD5" "DES"];
|
||||
};
|
||||
|
||||
{
|
||||
SYS_UID_MIN = mkOption {
|
||||
description = mdDoc "Range of user IDs used for the creation of system users by useradd or newusers.";
|
||||
default = 400;
|
||||
type = int;
|
||||
};
|
||||
|
||||
###### interface
|
||||
SYS_UID_MAX = mkOption {
|
||||
description = mdDoc "Range of user IDs used for the creation of system users by useradd or newusers.";
|
||||
default = 999;
|
||||
type = int;
|
||||
};
|
||||
|
||||
options = {
|
||||
UID_MIN = mkOption {
|
||||
description = mdDoc "Range of user IDs used for the creation of regular users by useradd or newusers.";
|
||||
default = 1000;
|
||||
type = int;
|
||||
};
|
||||
|
||||
users.defaultUserShell = lib.mkOption {
|
||||
description = lib.mdDoc ''
|
||||
UID_MAX = mkOption {
|
||||
description = mdDoc "Range of user IDs used for the creation of regular users by useradd or newusers.";
|
||||
default = 29999;
|
||||
type = int;
|
||||
};
|
||||
|
||||
SYS_GID_MIN = mkOption {
|
||||
description = mdDoc "Range of group IDs used for the creation of system groups by useradd, groupadd, or newusers";
|
||||
default = 400;
|
||||
type = int;
|
||||
};
|
||||
|
||||
SYS_GID_MAX = mkOption {
|
||||
description = mdDoc "Range of group IDs used for the creation of system groups by useradd, groupadd, or newusers";
|
||||
default = 999;
|
||||
type = int;
|
||||
};
|
||||
|
||||
GID_MIN = mkOption {
|
||||
description = mdDoc "Range of group IDs used for the creation of regular groups by useradd, groupadd, or newusers.";
|
||||
default = 1000;
|
||||
type = int;
|
||||
};
|
||||
|
||||
GID_MAX = mkOption {
|
||||
description = mdDoc "Range of group IDs used for the creation of regular groups by useradd, groupadd, or newusers.";
|
||||
default = 29999;
|
||||
type = int;
|
||||
};
|
||||
|
||||
TTYGROUP = mkOption {
|
||||
description = mdDoc ''
|
||||
The terminal permissions: the login tty will be owned by the TTYGROUP group,
|
||||
and the permissions will be set to TTYPERM'';
|
||||
default = "tty";
|
||||
type = str;
|
||||
};
|
||||
|
||||
TTYPERM = mkOption {
|
||||
description = mdDoc ''
|
||||
The terminal permissions: the login tty will be owned by the TTYGROUP group,
|
||||
and the permissions will be set to TTYPERM'';
|
||||
default = "0620";
|
||||
type = str;
|
||||
};
|
||||
|
||||
# Ensure privacy for newly created home directories.
|
||||
UMASK = mkOption {
|
||||
description = mdDoc "The file mode creation mask is initialized to this value.";
|
||||
default = "077";
|
||||
type = str;
|
||||
};
|
||||
};
|
||||
};
|
||||
default = { };
|
||||
};
|
||||
};
|
||||
|
||||
users.defaultUserShell = mkOption {
|
||||
description = mdDoc ''
|
||||
This option defines the default shell assigned to user
|
||||
accounts. This can be either a full system path or a shell package.
|
||||
|
||||
|
|
@ -69,63 +133,107 @@ in
|
|||
used outside the store (in particular in /etc/passwd).
|
||||
'';
|
||||
example = literalExpression "pkgs.zsh";
|
||||
type = types.either types.path types.shellPackage;
|
||||
type = either path shellPackage;
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
|
||||
###### implementation
|
||||
|
||||
config = {
|
||||
assertions = [
|
||||
{
|
||||
assertion = cfg.settings.SYS_UID_MIN <= cfg.settings.SYS_UID_MAX;
|
||||
message = "SYS_UID_MIN must be less than or equal to SYS_UID_MAX";
|
||||
}
|
||||
{
|
||||
assertion = cfg.settings.UID_MIN <= cfg.settings.UID_MAX;
|
||||
message = "UID_MIN must be less than or equal to UID_MAX";
|
||||
}
|
||||
{
|
||||
assertion = cfg.settings.SYS_GID_MIN <= cfg.settings.SYS_GID_MAX;
|
||||
message = "SYS_GID_MIN must be less than or equal to SYS_GID_MAX";
|
||||
}
|
||||
{
|
||||
assertion = cfg.settings.GID_MIN <= cfg.settings.GID_MAX;
|
||||
message = "GID_MIN must be less than or equal to GID_MAX";
|
||||
}
|
||||
];
|
||||
|
||||
environment.systemPackages =
|
||||
lib.optional config.users.mutableUsers pkgs.shadow ++
|
||||
lib.optional (types.shellPackage.check config.users.defaultUserShell)
|
||||
config.users.defaultUserShell;
|
||||
security.loginDefs.settings.CHFN_RESTRICT =
|
||||
mkIf (cfg.chfnRestrict != null) cfg.chfnRestrict;
|
||||
|
||||
environment.systemPackages = optional config.users.mutableUsers cfg.package
|
||||
++ optional (types.shellPackage.check config.users.defaultUserShell) config.users.defaultUserShell
|
||||
++ optional (cfg.chfnRestrict != null) pkgs.util-linux;
|
||||
|
||||
environment.etc =
|
||||
{ # /etc/login.defs: global configuration for pwdutils. You
|
||||
# cannot login without it!
|
||||
"login.defs".source = pkgs.writeText "login.defs" loginDefs;
|
||||
# Create custom toKeyValue generator
|
||||
# see https://man7.org/linux/man-pages/man5/login.defs.5.html for config specification
|
||||
let
|
||||
toKeyValue = generators.toKeyValue {
|
||||
mkKeyValue = generators.mkKeyValueDefault { } " ";
|
||||
};
|
||||
in
|
||||
{
|
||||
# /etc/login.defs: global configuration for pwdutils.
|
||||
# You cannot login without it!
|
||||
"login.defs".source = pkgs.writeText "login.defs" (toKeyValue cfg.settings);
|
||||
|
||||
# /etc/default/useradd: configuration for useradd.
|
||||
"default/useradd".source = pkgs.writeText "useradd"
|
||||
''
|
||||
"default/useradd".source = pkgs.writeText "useradd" ''
|
||||
GROUP=100
|
||||
HOME=/home
|
||||
SHELL=${utils.toShellPath config.users.defaultUserShell}
|
||||
'';
|
||||
};
|
||||
|
||||
security.pam.services =
|
||||
{ chsh = { rootOK = true; };
|
||||
security.pam.services = {
|
||||
chsh = { rootOK = true; };
|
||||
chfn = { rootOK = true; };
|
||||
su = { rootOK = true; forwardXAuth = true; logFailures = true; };
|
||||
passwd = {};
|
||||
su = {
|
||||
rootOK = true;
|
||||
forwardXAuth = true;
|
||||
logFailures = true;
|
||||
};
|
||||
passwd = { };
|
||||
# Note: useradd, groupadd etc. aren't setuid root, so it
|
||||
# doesn't really matter what the PAM config says as long as it
|
||||
# lets root in.
|
||||
useradd = { rootOK = true; };
|
||||
usermod = { rootOK = true; };
|
||||
userdel = { rootOK = true; };
|
||||
groupadd = { rootOK = true; };
|
||||
groupmod = { rootOK = true; };
|
||||
groupmems = { rootOK = true; };
|
||||
groupdel = { rootOK = true; };
|
||||
login = { startSession = true; allowNullPassword = true; showMotd = true; updateWtmp = true; };
|
||||
useradd.rootOK = true;
|
||||
usermod.rootOK = true;
|
||||
userdel.rootOK = true;
|
||||
groupadd.rootOK = true;
|
||||
groupmod.rootOK = true;
|
||||
groupmems.rootOK = true;
|
||||
groupdel.rootOK = true;
|
||||
login = {
|
||||
startSession = true;
|
||||
allowNullPassword = true;
|
||||
showMotd = true;
|
||||
updateWtmp = true;
|
||||
};
|
||||
chpasswd = { rootOK = true; };
|
||||
};
|
||||
|
||||
security.wrappers = {
|
||||
su = mkSetuidRoot "${pkgs.shadow.su}/bin/su";
|
||||
sg = mkSetuidRoot "${pkgs.shadow.out}/bin/sg";
|
||||
newgrp = mkSetuidRoot "${pkgs.shadow.out}/bin/newgrp";
|
||||
newuidmap = mkSetuidRoot "${pkgs.shadow.out}/bin/newuidmap";
|
||||
newgidmap = mkSetuidRoot "${pkgs.shadow.out}/bin/newgidmap";
|
||||
} // lib.optionalAttrs config.users.mutableUsers {
|
||||
chsh = mkSetuidRoot "${pkgs.shadow.out}/bin/chsh";
|
||||
passwd = mkSetuidRoot "${pkgs.shadow.out}/bin/passwd";
|
||||
security.wrappers =
|
||||
let
|
||||
mkSetuidRoot = source: {
|
||||
setuid = true;
|
||||
owner = "root";
|
||||
group = "root";
|
||||
inherit source;
|
||||
};
|
||||
in
|
||||
{
|
||||
su = mkSetuidRoot "${cfg.package.su}/bin/su";
|
||||
sg = mkSetuidRoot "${cfg.package.out}/bin/sg";
|
||||
newgrp = mkSetuidRoot "${cfg.package.out}/bin/newgrp";
|
||||
newuidmap = mkSetuidRoot "${cfg.package.out}/bin/newuidmap";
|
||||
newgidmap = mkSetuidRoot "${cfg.package.out}/bin/newgidmap";
|
||||
}
|
||||
// optionalAttrs config.users.mutableUsers {
|
||||
chsh = mkSetuidRoot "${cfg.package.out}/bin/chsh";
|
||||
passwd = mkSetuidRoot "${cfg.package.out}/bin/passwd";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -91,18 +91,30 @@ in
|
|||
The package used in the service
|
||||
'';
|
||||
};
|
||||
|
||||
user = mkOption {
|
||||
type = types.str;
|
||||
default = "gollum";
|
||||
description = lib.mdDoc "Specifies the owner of the wiki directory";
|
||||
};
|
||||
|
||||
group = mkOption {
|
||||
type = types.str;
|
||||
default = "gollum";
|
||||
description = lib.mdDoc "Specifies the owner group of the wiki directory";
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
users.users.gollum = {
|
||||
group = config.users.users.gollum.name;
|
||||
users.users.gollum = mkIf (cfg.user == "gollum") {
|
||||
group = cfg.group;
|
||||
description = "Gollum user";
|
||||
createHome = false;
|
||||
isSystemUser = true;
|
||||
};
|
||||
|
||||
users.groups.gollum = { };
|
||||
users.groups."${cfg.group}" = { };
|
||||
|
||||
systemd.tmpfiles.rules = [
|
||||
"d '${cfg.stateDir}' - ${config.users.users.gollum.name} ${config.users.groups.gollum.name} - -"
|
||||
|
|
@ -120,8 +132,8 @@ in
|
|||
'';
|
||||
|
||||
serviceConfig = {
|
||||
User = config.users.users.gollum.name;
|
||||
Group = config.users.groups.gollum.name;
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
WorkingDirectory = cfg.stateDir;
|
||||
ExecStart = ''
|
||||
${cfg.package}/bin/gollum \
|
||||
|
|
|
|||
|
|
@ -1,28 +1,21 @@
|
|||
{ config, lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.nix.optimise;
|
||||
in
|
||||
|
||||
{
|
||||
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
|
||||
nix.optimise = {
|
||||
|
||||
automatic = mkOption {
|
||||
automatic = lib.mkOption {
|
||||
default = false;
|
||||
type = types.bool;
|
||||
type = lib.types.bool;
|
||||
description = lib.mdDoc "Automatically run the nix store optimiser at a specific time.";
|
||||
};
|
||||
|
||||
dates = mkOption {
|
||||
dates = lib.mkOption {
|
||||
default = ["03:45"];
|
||||
type = types.listOf types.str;
|
||||
type = with lib.types; listOf str;
|
||||
description = lib.mdDoc ''
|
||||
Specification (in the format described by
|
||||
{manpage}`systemd.time(7)`) of the time at
|
||||
|
|
@ -32,9 +25,6 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
|
||||
###### implementation
|
||||
|
||||
config = {
|
||||
assertions = [
|
||||
{
|
||||
|
|
@ -43,14 +33,19 @@ in
|
|||
}
|
||||
];
|
||||
|
||||
systemd.services.nix-optimise = lib.mkIf config.nix.enable
|
||||
{ description = "Nix Store Optimiser";
|
||||
systemd = lib.mkIf config.nix.enable {
|
||||
services.nix-optimise = {
|
||||
description = "Nix Store Optimiser";
|
||||
# No point this if the nix daemon (and thus the nix store) is outside
|
||||
unitConfig.ConditionPathIsReadWrite = "/nix/var/nix/daemon-socket";
|
||||
serviceConfig.ExecStart = "${config.nix.package}/bin/nix-store --optimise";
|
||||
startAt = optionals cfg.automatic cfg.dates;
|
||||
startAt = lib.optionals cfg.automatic cfg.dates;
|
||||
};
|
||||
|
||||
timers.nix-optimise.timerConfig = {
|
||||
Persistent = true;
|
||||
RandomizedDelaySec = 1800;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,6 +56,7 @@ in
|
|||
|
||||
systemd.services.sing-box = {
|
||||
preStart = ''
|
||||
umask 0077
|
||||
mkdir -p /etc/sing-box
|
||||
${utils.genJqSecretsReplacementSnippet cfg.settings "/etc/sing-box/config.json"}
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -26,6 +26,8 @@ in
|
|||
site_name = "Lemmy FTW";
|
||||
admin_email = "mightyiam@example.com";
|
||||
};
|
||||
# https://github.com/LemmyNet/lemmy/blob/50efb1d519c63a7007a07f11cc8a11487703c70d/crates/utils/src/settings/mod.rs#L52
|
||||
database.uri = "postgres:///lemmy?host=/run/postgresql&user=lemmy";
|
||||
};
|
||||
caddy.enable = true;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,20 +2,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dcrd";
|
||||
version = "1.5.2";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "decred";
|
||||
repo = "dcrd";
|
||||
rev = "refs/tags/release-v${version}";
|
||||
sha256 = "14pxajc8si90hnddilfm09kmljwxq6i6p53fk0g09jp000cbklkl";
|
||||
hash = "sha256-ZNBSIzx07zJrBxas7bHpZ8ZPDWJ4d7jumpKYj5Qmzlo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "03aw6mcvp1vr01ppxy673jf5hdryd5032cxndlkaiwg005mxp1dy";
|
||||
vendorHash = "sha256-++IPB2IadXd1LC5r6f1a0UqsTG/McAf7KQAw8WKKoaE=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
subPackages = [ "." "cmd/dcrctl" "cmd/promptsecret" ];
|
||||
subPackages = [ "." "cmd/promptsecret" ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://decred.org";
|
||||
|
|
|
|||
|
|
@ -2,18 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dcrwallet";
|
||||
version = "1.6.0";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "decred";
|
||||
repo = "dcrwallet";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-WUfmv+laOwR/fc4osAFzPKqHQR+wOtSdLEsysICnuvg=";
|
||||
rev = "release-v${version}";
|
||||
hash = "sha256-ffY5IvSGu4Q7EdJpfdsIKxxjkm6FD0DR9ItnaO90SBc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-9IRNlULvARIZu6dWaKrvx6fiDJ80SBLINhK/9tW9k/0=";
|
||||
|
||||
doCheck = false;
|
||||
vendorHash = "sha256-dduHuMa5UPf73lfirTHSrYnOUbc2IyULpstZPGUJzuc=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -587,6 +587,22 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
brandonkirbyson.solarized-palenight = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "solarized-palenight";
|
||||
publisher = "BrandonKirbyson";
|
||||
version = "1.0.1";
|
||||
sha256 = "sha256-vVbaHSaBX6QzpnYMQlpPsJU1TQYJEBe8jq95muzwN0o=";
|
||||
};
|
||||
meta = {
|
||||
description = " A solarized-palenight theme for vscode";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=BrandonKirbyson.solarized-palenight";
|
||||
homepage = "https://github.com/BrandonKirbyson/Solarized-Palenight";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.sebtm ];
|
||||
};
|
||||
};
|
||||
|
||||
brettm12345.nixfmt-vscode = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "nixfmt-vscode";
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
let
|
||||
|
||||
pname = "1password";
|
||||
version = if channel == "stable" then "8.10.7" else "8.10.8-13.BETA";
|
||||
version = if channel == "stable" then "8.10.7" else "8.10.8-42.BETA";
|
||||
|
||||
sources = {
|
||||
stable = {
|
||||
|
|
@ -33,19 +33,19 @@ let
|
|||
beta = {
|
||||
x86_64-linux = {
|
||||
url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz";
|
||||
sha256 = "sha256-+Gg4OJXjdufEBNa3+qBXz0/NfPDXDfuiCYjMEDHnOKo=";
|
||||
sha256 = "sha256-nPstDndWuPMSGJlbyniEfljdEy+TOB9zWMJ+db7xCx4=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz";
|
||||
sha256 = "sha256-xDwwxo4UsoPzcxFblYeZ9QIDIJ6f6vGBxYySqP9o/A0=";
|
||||
sha256 = "sha256-waJjvqF6OXGrf90srvvZ+hyxapcQApGTsxTzNMX9V3s=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
|
||||
sha256 = "sha256-NphHgeMrjBqApU5crNj1JOTTXD4kXoO067feVs/YxuA=";
|
||||
sha256 = "sha256-i9hbnjXx2/RWJ9YvrFDOGbi7dpiHtxWsN0HAZPOhK8o=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
|
||||
sha256 = "sha256-M1MnSbZ6qsT7Ke5e8/4ppCxlXekulJnm9Zb5+4tt8Vg=";
|
||||
sha256 = "sha256-tat2x2J4/yKhWp4sWCEqU+SSZaNRx8WTcCJAAbo1Kpk=";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -78,12 +78,12 @@ let
|
|||
++ lib.optionals mediaSupport [ ffmpeg ]
|
||||
);
|
||||
|
||||
version = "12.0.7";
|
||||
version = "12.5";
|
||||
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://cdn.mullvad.net/browser/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz";
|
||||
hash = "sha256-8TcC39A9VFyhFb+pfefzvwJqXq1yF7C2YDcbCyEa0yo=";
|
||||
hash = "sha256-RTDFi+vMkzRtDFgv9sP1bfIeWzzXR307aoMhNiT6vRs=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -27,11 +27,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "PortfolioPerformance";
|
||||
version = "0.64.0";
|
||||
version = "0.64.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
|
||||
hash = "sha256-8LebPYIML3YV8DsoLPQiH4Q6ETBTgZ7IpeGJDN2R7ro=";
|
||||
hash = "sha256-R3Cj24dZ2wD1c29zRLGnuJm3wfc9+n/sNNW316HT9N4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flowblade";
|
||||
version = "2.8.0.3";
|
||||
version = "2.10.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jliljebl";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/EkI3qiceB5eKTVQnpG+z4e6yaE9hDtn6I+iN/J+h/g=";
|
||||
sha256 = "sha256-lXMVtWsTyMaGIpEglHvnUgDSaFlnWtB3lSyg6ljNIdQ=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
|
|||
makeWrapper $out/flowblade/flowblade $out/bin/flowblade \
|
||||
--set FREI0R_PATH ${frei0r}/lib/frei0r-1 \
|
||||
--set LADSPA_PATH ${ladspaPlugins}/lib/ladspa \
|
||||
--prefix PATH : "${lib.makeBinPath [ ffmpeg ]}" \
|
||||
''${gappsWrapperArgs[@]}
|
||||
|
||||
runHook postInstall
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
buildKodiAddon rec {
|
||||
pname = "inputstreamhelper";
|
||||
namespace = "script.module.inputstreamhelper";
|
||||
version = "0.5.10+matrix.1";
|
||||
version = "0.6.1+matrix.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
|
||||
sha256 = "sha256-FcOktwtOT7kDM+3y9qPDk3xU1qVeCduyAdUzebtJzv4=";
|
||||
sha256 = "sha256-v5fRikswmP+KVbxYibD0NbCK8leUnFbya5EtF1FmS0I=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,31 @@
|
|||
{ lib, buildKodiBinaryAddon, fetchFromGitHub, libretro, twenty-fortyeight }:
|
||||
|
||||
buildKodiBinaryAddon rec {
|
||||
pname = "libretro-2048";
|
||||
namespace = "game.libretro.2048";
|
||||
version = "1.0.0.136";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kodi-game";
|
||||
repo = "game.libretro.2048";
|
||||
rev = "${version}-Nexus";
|
||||
hash = "sha256-cIo56ZGansBlAj6CFw51UOYJUivN9n1qhVTWAX9c5Tc=";
|
||||
};
|
||||
|
||||
extraCMakeFlags = [
|
||||
"-D2048_LIB=${twenty-fortyeight}/lib/retroarch/cores/2048_libretro.so"
|
||||
];
|
||||
|
||||
extraBuildInputs = [ twenty-fortyeight ];
|
||||
propagatedBuildInputs = [
|
||||
libretro
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/kodi-game/game.libretro.2048";
|
||||
description = "2048 GameClient for Kodi";
|
||||
platforms = platforms.all;
|
||||
license = licenses.publicDomain;
|
||||
maintainers = with maintainers; teams.kodi.members ++ [ kazenyuk ];
|
||||
};
|
||||
}
|
||||
22
pkgs/applications/video/kodi/addons/vfs-rar/default.nix
Normal file
22
pkgs/applications/video/kodi/addons/vfs-rar/default.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, tinyxml }:
|
||||
buildKodiBinaryAddon rec {
|
||||
pname = namespace;
|
||||
namespace = "vfs.rar";
|
||||
version = "20.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xbmc";
|
||||
repo = namespace;
|
||||
rev = "${version}-${rel}";
|
||||
sha256 = "sha256-8IEYA2gNchCa7O9kzrCbO5DxYWJqPzQN3SJIr9zCWc8=";
|
||||
};
|
||||
|
||||
extraBuildInputs = [ tinyxml ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "RAR archive Virtual Filesystem add-on for Kodi";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.all;
|
||||
maintainers = teams.kodi.members;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,8 +1,11 @@
|
|||
# Arguments that this derivation gets when it is created with `callPackage`
|
||||
{ stdenv
|
||||
, buildEnv
|
||||
, lib
|
||||
, makeWrapper
|
||||
, mpvScripts
|
||||
, symlinkJoin
|
||||
, writeTextDir
|
||||
, yt-dlp
|
||||
}:
|
||||
|
||||
|
|
@ -71,6 +74,20 @@ let
|
|||
|
||||
passthru.unwrapped = mpv;
|
||||
|
||||
passthru.tests.mpv-scripts-should-not-collide = buildEnv {
|
||||
name = "mpv-scripts-env";
|
||||
paths = lib.pipe mpvScripts [
|
||||
# filters "override" "overrideDerivation" "recurseForDerivations"
|
||||
(lib.filterAttrs (key: script: lib.isDerivation script))
|
||||
# replaces unfree and meta.broken scripts with decent placeholders
|
||||
(lib.mapAttrsToList (key: script:
|
||||
if (builtins.tryEval script.outPath).success
|
||||
then script
|
||||
else writeTextDir "share/mpv/scripts/${script.scriptName}" "placeholder of ${script.name}"
|
||||
))
|
||||
];
|
||||
};
|
||||
|
||||
postBuild = ''
|
||||
# wrapProgram can't operate on symlinks
|
||||
rm "$out/bin/mpv"
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
, pkg-config
|
||||
, vala
|
||||
, libgee
|
||||
, libhandy
|
||||
, granite
|
||||
, gtk3
|
||||
, switchboard
|
||||
|
|
@ -15,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "switchboard-plug-applications";
|
||||
version = "6.0.1";
|
||||
version = "7.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "18izmzhqp6x5ivha9yl8gyz9adyrsylw7w5p0cwm1bndgqbi7yh5";
|
||||
sha256 = "sha256-M9JMrxhMiDC/qrrnPaBm6Kf3CAkxrhGWwJF8jVm2G5c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -36,6 +37,7 @@ stdenv.mkDerivation rec {
|
|||
granite
|
||||
gtk3
|
||||
libgee
|
||||
libhandy
|
||||
switchboard
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -21,17 +21,18 @@
|
|||
, gnome-settings-daemon
|
||||
, wrapGAppsHook
|
||||
, gexiv2
|
||||
, systemd
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gala";
|
||||
version = "7.0.3";
|
||||
version = "7.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-RLKPYDWVqT2WfjLPXRFPCNNvcW+fJ0OUKjSLLgPBqdw=";
|
||||
sha256 = "sha256-x0EIah/iTluJk7P3k0g23cQldx++W58FbjnHNlF31AQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -63,12 +64,7 @@ stdenv.mkDerivation rec {
|
|||
libgee
|
||||
mesa # for libEGL
|
||||
mutter
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
# TODO: enable this and remove --builtin flag from session-settings
|
||||
# https://github.com/NixOS/nixpkgs/pull/140429
|
||||
"-Dsystemd=false"
|
||||
systemd
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xdg-desktop-portal-pantheon";
|
||||
version = "7.0.0";
|
||||
version = "7.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "portals";
|
||||
rev = version;
|
||||
sha256 = "sha256-Rfo9Z5rCJgk36Db3ce8dYBJswy8owjvRMrJVB/RfwyI=";
|
||||
sha256 = "sha256-uy/etQiJuaROw8bWg2PUdptNr4I8uqqUZ8BWK6D2bog=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch
|
||||
, cmake, which, m4, python3, bison, flex, llvmPackages, ncurses
|
||||
, cmake, which, m4, python3, bison, flex, llvmPackages, ncurses, xcode
|
||||
|
||||
# the default test target is sse4, but that is not supported by all Hydra agents
|
||||
, testedTargets ? if stdenv.isAarch64 || stdenv.isAarch32 then [ "neon-i32x4" ] else [ "sse2-i32x4" ]
|
||||
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-WBAVgjQjW4x9JGx6xotPoTVOePsPjBJEyBYA7TCTBvc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev ];
|
||||
nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev ] ++ lib.lists.optionals stdenv.isDarwin [ xcode ];
|
||||
buildInputs = with llvmPackages; [
|
||||
libllvm libclang openmp ncurses
|
||||
];
|
||||
|
|
@ -30,8 +30,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
inherit testedTargets;
|
||||
|
||||
# needs 'transcendentals' executable, which is only on linux
|
||||
doCheck = stdenv.isLinux;
|
||||
doCheck = true;
|
||||
|
||||
# the compiler enforces -Werror, and -fno-strict-overflow makes it mad.
|
||||
# hilariously this is something of a double negative: 'disable' the
|
||||
|
|
@ -60,6 +59,8 @@ stdenv.mkDerivation rec {
|
|||
"-DISPC_INCLUDE_UTILS=OFF"
|
||||
("-DARM_ENABLED=" + (if stdenv.isAarch64 || stdenv.isAarch32 then "TRUE" else "FALSE"))
|
||||
("-DX86_ENABLED=" + (if stdenv.isx86_64 || stdenv.isx86_32 then "TRUE" else "FALSE"))
|
||||
] ++ lib.lists.optionals stdenv.isDarwin [
|
||||
"-DISPC_MACOS_SDK_PATH=${xcode}/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
, libGL
|
||||
, libGLU
|
||||
, libjpeg
|
||||
, xorg
|
||||
, ncurses
|
||||
, libpng, libtool, mpfr, openssl, pango, poppler
|
||||
, readline, sqlite
|
||||
|
|
@ -25,7 +24,7 @@ let
|
|||
fontDirectories = [ freefont_ttf ];
|
||||
};
|
||||
|
||||
libPath = lib.makeLibraryPath [
|
||||
libPath = lib.makeLibraryPath ([
|
||||
cairo
|
||||
fontconfig
|
||||
glib
|
||||
|
|
@ -33,8 +32,6 @@ let
|
|||
gtk3
|
||||
gsettings-desktop-schemas
|
||||
libedit
|
||||
libGL
|
||||
libGLU
|
||||
libjpeg
|
||||
libpng
|
||||
mpfr
|
||||
|
|
@ -44,7 +41,10 @@ let
|
|||
poppler
|
||||
readline
|
||||
sqlite
|
||||
];
|
||||
] ++ lib.optionals (!stdenv.isDarwin) [
|
||||
libGL
|
||||
libGLU
|
||||
]);
|
||||
|
||||
in
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,15 @@
|
|||
{ lib, stdenv, fetchurl, cmake, libsodium, ncurses, libopus, msgpack
|
||||
, libvpx, check, libconfig, pkg-config }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, cmake
|
||||
, libsodium
|
||||
, ncurses
|
||||
, libopus
|
||||
, libvpx
|
||||
, check
|
||||
, libconfig
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
let buildToxAV = !stdenv.isAarch32;
|
||||
in stdenv.mkDerivation rec {
|
||||
|
|
@ -14,14 +24,18 @@ in stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-8pQFN5mIY1k+KLxqa19W8JZ19s2KKDJre8MbSDbAiUI=";
|
||||
};
|
||||
|
||||
cmakeFlags =
|
||||
[ "-DBUILD_NTOX=ON" "-DDHT_BOOTSTRAP=ON" "-DBOOTSTRAP_DAEMON=ON" ]
|
||||
++ lib.optional buildToxAV "-DMUST_BUILD_TOXAV=ON";
|
||||
cmakeFlags = [
|
||||
"-DDHT_BOOTSTRAP=ON"
|
||||
"-DBOOTSTRAP_DAEMON=ON"
|
||||
] ++ lib.optional buildToxAV "-DMUST_BUILD_TOXAV=ON";
|
||||
|
||||
buildInputs = [
|
||||
libsodium msgpack ncurses libconfig
|
||||
libsodium
|
||||
ncurses
|
||||
libconfig
|
||||
] ++ lib.optionals buildToxAV [
|
||||
libopus libvpx
|
||||
libopus
|
||||
libvpx
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,65 +1,131 @@
|
|||
{ lib, stdenv, fetchFromGitHub, makeWrapper
|
||||
, SDL, ffmpeg_4, frei0r, libjack2, libdv, libsamplerate, libexif
|
||||
, libvorbis, libxml2, movit, pkg-config, sox, fftw, opencv4, SDL2
|
||||
, gtk2, gitUpdater, libebur128, rubberband
|
||||
, jack2, ladspa-sdk, swig, which, ncurses
|
||||
, enablePython ? false, python3
|
||||
{ config
|
||||
, lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, which
|
||||
, ffmpeg
|
||||
, fftw
|
||||
, frei0r
|
||||
, libdv
|
||||
, libjack2
|
||||
, libsamplerate
|
||||
, libvorbis
|
||||
, libxml2
|
||||
, movit
|
||||
, opencv4
|
||||
, rtaudio
|
||||
, rubberband
|
||||
, sox
|
||||
, vid-stab
|
||||
, darwin
|
||||
, cudaSupport ? config.cudaSupport or false
|
||||
, cudaPackages ? { }
|
||||
, enableJackrack ? stdenv.isLinux
|
||||
, ladspa-sdk
|
||||
, ladspaPlugins
|
||||
, enablePython ? false
|
||||
, python3
|
||||
, swig
|
||||
, enableQt ? false
|
||||
, libsForQt5
|
||||
, enableSDL1 ? stdenv.isLinux
|
||||
, SDL
|
||||
, enableSDL2 ? true
|
||||
, SDL2
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mlt";
|
||||
version = "6.26.0";
|
||||
version = "7.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mltframework";
|
||||
repo = "mlt";
|
||||
rev = "v${version}";
|
||||
sha256 = "FPXROiX7A6oB1VMipw3slyhk7q4fO6m9amohnC67lnA=";
|
||||
hash = "sha256-Ed9CHaeJ8Rkrvfq/dZVOn/5lhHLH7B6A1Qf2xOQfWik=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
which
|
||||
] ++ lib.optionals cudaSupport [
|
||||
cudaPackages.cuda_nvcc
|
||||
] ++ lib.optionals enablePython [
|
||||
python3
|
||||
swig
|
||||
] ++ lib.optionals enableQt [
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
SDL ffmpeg_4 frei0r libjack2 libdv libsamplerate libvorbis libxml2.dev
|
||||
movit sox libexif gtk2 fftw libebur128 opencv4 SDL2 jack2
|
||||
ladspa-sdk rubberband
|
||||
] ++ lib.optional enablePython ncurses;
|
||||
ffmpeg
|
||||
fftw
|
||||
frei0r
|
||||
libdv
|
||||
libjack2
|
||||
libsamplerate
|
||||
libvorbis
|
||||
libxml2
|
||||
movit
|
||||
opencv4
|
||||
rtaudio
|
||||
rubberband
|
||||
sox
|
||||
vid-stab
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk_11_0.frameworks.Accelerate
|
||||
] ++ lib.optionals cudaSupport [
|
||||
cudaPackages.cuda_cudart
|
||||
] ++ lib.optionals enableJackrack [
|
||||
ladspa-sdk
|
||||
ladspaPlugins
|
||||
] ++ lib.optionals enableQt [
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtsvg
|
||||
] ++ lib.optionals enableSDL1 [
|
||||
SDL
|
||||
] ++ lib.optionals enableSDL2 [
|
||||
SDL2
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper which ]
|
||||
++ lib.optionals enablePython [ python3 swig ];
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
strictDeps = true;
|
||||
cmakeFlags = [
|
||||
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||
"-DMOD_OPENCV=ON"
|
||||
] ++ lib.optionals enablePython [
|
||||
"-DSWIG_PYTHON=ON"
|
||||
];
|
||||
|
||||
# Mostly taken from:
|
||||
# http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine
|
||||
configureFlags = [
|
||||
"--avformat-swscale" "--enable-gpl" "--enable-gpl3" "--enable-opengl"
|
||||
] ++ lib.optional enablePython "--swig-languages=python";
|
||||
qtWrapperArgs = [
|
||||
"--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1"
|
||||
] ++ lib.optionals enableJackrack [
|
||||
"--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
outPythonPath = lib.optionalString enablePython "$(toPythonPath $out)";
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/melt --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1
|
||||
|
||||
# Remove an unnecessary reference to movit.dev.
|
||||
s=${movit.dev}/include
|
||||
t=$(for ((i = 0; i < ''${#s}; i++)); do echo -n X; done)
|
||||
sed -i $out/lib/mlt/libmltopengl.so -e "s|$s|$t|g"
|
||||
'' + lib.optionalString enablePython ''
|
||||
mkdir -p ${outPythonPath}/mlt
|
||||
cp -a src/swig/python/_mlt.so ${outPythonPath}/mlt/
|
||||
cp -a src/swig/python/mlt.py ${outPythonPath}/mlt/__init__.py
|
||||
sed -i ${outPythonPath}/mlt/__init__.py -e "s|return importlib.import_module('_mlt')|return importlib.import_module('mlt._mlt')|g"
|
||||
postFixup = ''
|
||||
substituteInPlace "$dev"/lib/pkgconfig/mlt-framework-7.pc \
|
||||
--replace '=''${prefix}//' '=/'
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit ffmpeg;
|
||||
};
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
rev-prefix = "v";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open source multimedia framework, designed for television broadcasting";
|
||||
homepage = "https://www.mltframework.org";
|
||||
license = with licenses; [ gpl3Only gpl2Only lgpl21Only ];
|
||||
maintainers = with maintainers; [ peti ];
|
||||
platforms = platforms.linux;
|
||||
homepage = "https://www.mltframework.org/";
|
||||
license = with licenses; [ lgpl21Plus gpl2Plus ];
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,124 +0,0 @@
|
|||
{ config
|
||||
, lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, which
|
||||
, wrapQtAppsHook
|
||||
, SDL2
|
||||
, ffmpeg
|
||||
, fftw
|
||||
, frei0r
|
||||
, libdv
|
||||
, libjack2
|
||||
, libsamplerate
|
||||
, libvorbis
|
||||
, libxml2
|
||||
, movit
|
||||
, opencv4
|
||||
, qtbase
|
||||
, qtsvg
|
||||
, rtaudio
|
||||
, rubberband
|
||||
, sox
|
||||
, vid-stab
|
||||
, darwin
|
||||
, cudaSupport ? config.cudaSupport or false
|
||||
, cudaPackages ? { }
|
||||
, jackrackSupport ? stdenv.isLinux
|
||||
, ladspa-sdk
|
||||
, ladspaPlugins
|
||||
, pythonSupport ? false
|
||||
, python3
|
||||
, swig
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mlt";
|
||||
version = "7.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mltframework";
|
||||
repo = "mlt";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Ed9CHaeJ8Rkrvfq/dZVOn/5lhHLH7B6A1Qf2xOQfWik=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
which
|
||||
wrapQtAppsHook
|
||||
] ++ lib.optionals cudaSupport [
|
||||
cudaPackages.cuda_nvcc
|
||||
] ++ lib.optionals pythonSupport [
|
||||
python3
|
||||
swig
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
ffmpeg
|
||||
fftw
|
||||
frei0r
|
||||
libdv
|
||||
libjack2
|
||||
libsamplerate
|
||||
libvorbis
|
||||
libxml2
|
||||
movit
|
||||
opencv4
|
||||
qtbase
|
||||
qtsvg
|
||||
rtaudio
|
||||
rubberband
|
||||
sox
|
||||
vid-stab
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk_11_0.frameworks.Accelerate
|
||||
] ++ lib.optionals cudaSupport [
|
||||
cudaPackages.cuda_cudart
|
||||
] ++ lib.optionals jackrackSupport [
|
||||
ladspa-sdk
|
||||
ladspaPlugins
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
cmakeFlags = [
|
||||
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||
"-DMOD_OPENCV=ON"
|
||||
] ++ lib.optionals pythonSupport [
|
||||
"-DSWIG_PYTHON=ON"
|
||||
];
|
||||
|
||||
qtWrapperArgs = [
|
||||
"--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1"
|
||||
] ++ lib.optionals jackrackSupport [
|
||||
"--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
substituteInPlace "$dev"/lib/pkgconfig/mlt-framework-7.pc \
|
||||
--replace '=''${prefix}//' '=/'
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit ffmpeg;
|
||||
};
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
rev-prefix = "v";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open source multimedia framework, designed for television broadcasting";
|
||||
homepage = "https://www.mltframework.org/";
|
||||
license = with licenses; [ lgpl21Plus gpl2Plus ];
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wlr-protocols";
|
||||
version = "unstable-2021-11-01";
|
||||
version = "unstable-2022-09-05";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "wlroots";
|
||||
repo = "wlr-protocols";
|
||||
rev = "d998ee6fc64ea7e066014023653d1271b7702c09";
|
||||
sha256 = "1vw8b10d1pwsj6f4sr3imvwsy55d3435sp068sj4hdszkxc6axsr";
|
||||
rev = "4264185db3b7e961e7f157e1cc4fd0ab75137568";
|
||||
sha256 = "Ztc07RLg+BZPondP/r6Jo3Fw1QY/z1QsFvdEuOqQshA=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "camel-converter";
|
||||
version = "3.0.0";
|
||||
version = "3.0.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sanders41";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-SUuSaQU6o2OtjDNrDcO3nS0EZH2ammEkP7AEp4H5ysI=";
|
||||
hash = "sha256-t0wZ03xMNuBEUeXC+DizNSVJmnlt2SH9f0qw6F4UXg8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "empty-files";
|
||||
version = "0.0.3";
|
||||
version = "0.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "approvals";
|
||||
repo = "EmptyFiles.Python";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-K4rlVO1X1AWxYI3EqLsyQ5/Ist/jlwFrmOM4aMojtKU=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-sXatMH2QEGxzDGszAoFXUoPzB00rYaQIasz93vsfyz8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fastnumbers
|
||||
, fetchFromGitHub
|
||||
, hypothesis
|
||||
, numpy
|
||||
|
|
@ -43,6 +42,10 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"--hypothesis-profile=standard"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"fastnumbers"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
, hatchling
|
||||
, importlib-metadata
|
||||
, importlib-resources
|
||||
, pkgutil-resolve-name
|
||||
, pyrsistent
|
||||
, pythonOlder
|
||||
, twisted
|
||||
|
|
@ -54,6 +55,7 @@ buildPythonPackage rec {
|
|||
typing-extensions
|
||||
] ++ lib.optionals (pythonOlder "3.9") [
|
||||
importlib-resources
|
||||
pkgutil-resolve-name
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "langchain";
|
||||
version = "0.0.207";
|
||||
version = "0.0.216";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -86,7 +86,7 @@ buildPythonPackage rec {
|
|||
owner = "hwchase17";
|
||||
repo = "langchain";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-/gPkgHcHHyFAhPF4hqEMkOaHV9Z1159ZdB2lwtsJEKE=";
|
||||
hash = "sha256-g01EMquASxXl9drLhKtTwG9+gSa17aBq0c8UXcErCjI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "langchainplus-sdk";
|
||||
version = "0.0.16";
|
||||
version = "0.0.17";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "langchainplus_sdk";
|
||||
hash = "sha256-L8Bn3QOO3PGAhtNC2ixpCYTE03+b+mhP/MrqNLQ+2yg=";
|
||||
hash = "sha256-ZSDIZKI9ytvm+3IzoRc0f2rMMnJal3WOWTVHBMUN4wM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "msgspec";
|
||||
version = "0.15.1";
|
||||
version = "0.16.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "jcrist";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-U3mCnp7MojWcw1pZExG6pYAToVjzGXqc2TeDyhm39TY=";
|
||||
hash = "sha256-FhYNQ6ODLJSdXRzEwmE5CLxzeImBKj6brx2CBeVC7BM=";
|
||||
};
|
||||
|
||||
# Requires libasan to be accessible
|
||||
|
|
|
|||
|
|
@ -0,0 +1,31 @@
|
|||
{ buildPythonPackage
|
||||
, fetchPypi
|
||||
, lib
|
||||
, nix-update-script
|
||||
, pythonOlder
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "pkgutil-resolve-name";
|
||||
version = "1.3.10";
|
||||
format = "flit";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "pkgutil_resolve_name";
|
||||
inherit version;
|
||||
hash = "sha256-NX1snmp1VlPP14iTgXwIU682XdUeyX89NYqBk3O70XQ=";
|
||||
};
|
||||
|
||||
# has no tests
|
||||
doCheck = false;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://pypi.org/project/pkgutil_resolve_name/";
|
||||
description = "A backport of Python 3.9’s pkgutil.resolve_name.";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ yajo ];
|
||||
};
|
||||
}
|
||||
|
|
@ -23,11 +23,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "py3status";
|
||||
version = "3.50";
|
||||
version = "3.51";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-LUFLc7GNEoPIAsTQDhVTt0/NqhwaZHBRLoHF+2nqTUg=";
|
||||
hash = "sha256-x4MftAC1TyR4FEvl+ytwCYg2cm5qAG/X/MJUhJRGlkU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "skodaconnect";
|
||||
version = "1.3.5";
|
||||
version = "1.3.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "lendy007";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-gLk+Dj2x2OHa6VIIoA7FesDKtg180MuCud2nYk9mYpM=";
|
||||
hash = "sha256-gV/+mt6XxY1UcA1H8zM4pG1ugrDo0m876e3XG1yV32A=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -16,12 +16,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "steamship";
|
||||
version = "2.17.7";
|
||||
version = "2.17.11";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-NkSyX+ajNFwkgO0Lq4UfrvjADgHXiT2oLp2RCQDJv0w=";
|
||||
hash = "sha256-Jy7ORAMnrBSeDZob3KcAnqhLBI1az/g6s30BYPA0bTE=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "trimesh";
|
||||
version = "3.22.0";
|
||||
version = "3.22.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-KuE8EVl4VbIFRlddd+Cqvj+aLWU/9ZMgmgyem9inY3Q=";
|
||||
hash = "sha256-9AVG1CFOFnlIAsoKlJ0QzVSx9aYwsIGa/dr08OFsZLI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
|
|
|||
|
|
@ -2,17 +2,20 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, click
|
||||
, pythonOlder
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "vsure";
|
||||
version = "2.6.1";
|
||||
version = "2.6.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-D6Q76L1BVx5hpFSShP1rUOmgTogEO+6Jj5x8GaepC+c=";
|
||||
hash = "sha256-8AqxLIrsFtAazH+ZqhXbkYNhlAhQ5XL/tNFRAGLh2kk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -30,6 +33,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python library for working with verisure devices";
|
||||
homepage = "https://github.com/persandstrom/python-verisure";
|
||||
changelog = "https://github.com/persandstrom/python-verisure#version-history";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -22,14 +22,14 @@ with py.pkgs;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.3.301";
|
||||
version = "2.3.303";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-jhyMQZGy9iNbT5M+gp0/oB4Ke3nX3cCX4N8cgRXkbeY=";
|
||||
hash = "sha256-h9O9hYAQX2CqSwEWs3gWDOOisfWa3taDmSjxSw44Kt4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sbt";
|
||||
version = "1.9.0";
|
||||
version = "1.9.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/sbt/sbt/releases/download/v${finalAttrs.version}/sbt-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-zFWTSOr5z75s4i9omx5EDI4FtOSc1r6jmHZHd7N5SMQ=";
|
||||
hash = "sha256-KcylFTzJYxXW5CN3flgAuDHkVyO0dzLCB6Zu+lyk/Cs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
buildGoModule
|
||||
rec {
|
||||
pname = "eclint";
|
||||
version = "0.3.8";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "greut";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wAT+lc8cFf9zOZ72EwIeE2z5mCjGN8vpRoS1k15X738=";
|
||||
sha256 = "sha256-/WSxhdPekCNgeWf+ObIOblCUj3PyJvykGyCXrFmCXLA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-6aIE6MyNDOLRxn+CYSCVNj4Q50HywSh/Q0WxnxCEtg8=";
|
||||
vendorHash = "sha256-hdMBd0QI2uWktBV+rH73rCnnkIlw2zDT9OabUuWIGks=";
|
||||
|
||||
ldflags = [ "-X main.version=${version}" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,48 @@
|
|||
{ lib
|
||||
, crystal
|
||||
, fetchFromGitHub
|
||||
, llvmPackages
|
||||
, openssl
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.9.0";
|
||||
in
|
||||
crystal.buildCrystalPackage {
|
||||
pname = "crystalline";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elbywan";
|
||||
repo = "crystalline";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kx3rdGqIbrOaHY7V3uXLqIFEYzzsMKzNwZ6Neq8zM3c=";
|
||||
};
|
||||
|
||||
format = "crystal";
|
||||
shardsFile = ./shards.nix;
|
||||
|
||||
nativeBuildInputs = [ llvmPackages.llvm openssl makeWrapper ];
|
||||
|
||||
doCheck = false;
|
||||
doInstallCheck = false;
|
||||
|
||||
crystalBinaries.crystalline = {
|
||||
src = "src/crystalline.cr";
|
||||
options = [ "--release" "--no-debug" "--progress" "-Dpreview_mt" ];
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/crystalline" --prefix PATH : '${
|
||||
lib.makeBinPath [llvmPackages.llvm.dev]
|
||||
}'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Language Server Protocol implementation for Crystal";
|
||||
homepage = "https://github.com/elbywan/crystalline";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ donovanglover ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
{
|
||||
bisect = {
|
||||
url = "https://github.com/spider-gazelle/bisect.git";
|
||||
rev = "v1.2.1";
|
||||
sha256 = "1ddz7fag1l65m6g0vw6xa96yv00rdwjj2z69k26rvyz37qk9ccqg";
|
||||
};
|
||||
lsp = {
|
||||
url = "https://github.com/elbywan/crystal-lsp.git";
|
||||
rev = "v0.1.2";
|
||||
sha256 = "0knw8xaq3ssyb34w77a390j79m4w6bks5hlwr8m8fci2gq9a0r6z";
|
||||
};
|
||||
priority-queue = {
|
||||
url = "https://github.com/spider-gazelle/priority-queue.git";
|
||||
rev = "v1.0.1";
|
||||
sha256 = "1rkppd8win4yalxcvsxikqcq6sw0npdqjajqbj57m78bzlxpyjv6";
|
||||
};
|
||||
sentry = {
|
||||
url = "https://github.com/samueleaton/sentry.git";
|
||||
rev = "e448ce83486f99ef016c311e10ec0cac805cded3";
|
||||
sha256 = "13yp7805xpd605jpfpb3srqb0psy25w7n6x9mpkcyvzhqmpnpfyq";
|
||||
};
|
||||
version_from_shard = {
|
||||
url = "https://github.com/hugopl/version_from_shard.git";
|
||||
rev = "v1.2.5";
|
||||
sha256 = "0xizj0q4rd541rwjbx04cjifc2gfx4l5v6q2y7gmd0ndjmkgb8ik";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,17 +1,17 @@
|
|||
{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, stdenv, Security }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
version = "0.5.3";
|
||||
version = "0.5.4";
|
||||
pname = "sccache";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mozilla";
|
||||
repo = "sccache";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oyuXpb0K2lUnjenYrSHhJ+JaRzfoSSkbPyzA4xersQY=";
|
||||
sha256 = "sha256-CaZM8c1dref98VL240PEUQE8XtWAvVlQSGnPQspg+jw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-StPUajNtHLd8YcjUDTd+X75PeldWltV9Wp/L3QhB3Vs=";
|
||||
cargoSha256 = "sha256-F4lnE5ig3UnZJOdxpnGLesDP3rgEOFzZO0WGQ8mtj+o=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ let
|
|||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
update-all-grammars = callPackage ./update.nix {};
|
||||
update-all-grammars = callPackage ./update.nix { };
|
||||
|
||||
fetchGrammar = (v: fetchgit { inherit (v) url rev sha256 fetchSubmodules; });
|
||||
|
||||
|
|
@ -62,6 +62,7 @@ let
|
|||
inherit version;
|
||||
src = grammar.src or (fetchGrammar grammar);
|
||||
location = grammar.location or null;
|
||||
generate = grammar.generate or false;
|
||||
};
|
||||
grammars' = import ./grammars { inherit lib; } // extraGrammars;
|
||||
grammars = grammars' //
|
||||
|
|
@ -111,7 +112,7 @@ rustPlatform.buildRustPackage {
|
|||
inherit src version cargoSha256;
|
||||
|
||||
buildInputs =
|
||||
lib.optionals stdenv.isDarwin [ Security CoreServices];
|
||||
lib.optionals stdenv.isDarwin [ Security CoreServices ];
|
||||
nativeBuildInputs =
|
||||
[ which ]
|
||||
++ lib.optionals webUISupport [ emscripten ];
|
||||
|
|
|
|||
|
|
@ -28,10 +28,10 @@ stdenv.mkDerivation ({
|
|||
|
||||
stripDebugList = [ "parser" ];
|
||||
|
||||
configurePhase = lib.optionalString generate ''
|
||||
tree-sitter generate
|
||||
'' + lib.optionalString (location != null) ''
|
||||
configurePhase = lib.optionalString (location != null) ''
|
||||
cd ${location}
|
||||
'' + lib.optionalString generate ''
|
||||
tree-sitter generate
|
||||
'';
|
||||
|
||||
# When both scanner.{c,cc} exist, we should not link both since they may be the same but in
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rust-analyzer-unwrapped";
|
||||
version = "2023-06-19";
|
||||
cargoSha256 = "sha256-aQZkiIRD5r5MSENjrtD2qM/h3ByYfYgOxYx62RgLX7o=";
|
||||
version = "2023-06-26";
|
||||
cargoSha256 = "sha256-ZA2FaEc2RHYhPllhf4ztpboEabglJRF2mfAJSoqLHtY=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-lang";
|
||||
repo = "rust-analyzer";
|
||||
rev = version;
|
||||
sha256 = "sha256-dzTROlAzRR8LIHEud2brANXDV8be1jsBV8aQynxj4UI=";
|
||||
sha256 = "sha256-5Jn/Nj/xgcjTT289Itng55GLUBTEIULPndl/XrGkUwQ=";
|
||||
};
|
||||
|
||||
cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
and out-of-tree mod packages (mod.nix).
|
||||
*/
|
||||
{ lib, makeSetupHook, curl, unzip, dos2unix, pkg-config, makeWrapper
|
||||
, lua, mono, dotnetPackages, python3
|
||||
, lua, mono, python3
|
||||
, libGL, freetype, openal, SDL2
|
||||
, zenity
|
||||
}:
|
||||
|
|
@ -40,24 +40,7 @@ in {
|
|||
'';
|
||||
|
||||
packageAttrs = {
|
||||
buildInputs = with dotnetPackages; [
|
||||
FuzzyLogicLibrary
|
||||
MaxMindDb
|
||||
MaxMindGeoIP2
|
||||
MonoNat
|
||||
NewtonsoftJson
|
||||
NUnit3
|
||||
NUnitConsole
|
||||
OpenNAT
|
||||
RestSharp
|
||||
SharpFont
|
||||
SharpZipLib
|
||||
SmartIrc4net
|
||||
StyleCopMSBuild
|
||||
StyleCopPlusMSBuild
|
||||
] ++ [
|
||||
libGL
|
||||
];
|
||||
buildInputs = [ libGL ];
|
||||
|
||||
# TODO: Test if this is correct.
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,9 +6,7 @@
|
|||
Additional engines or mods can be added with `openraPackages.buildOpenRAEngine` (function around `engine.nix`)
|
||||
and `openraPackages.buildOpenRAMod` (function around `mod.nix`), respectively.
|
||||
*/
|
||||
pkgs:
|
||||
|
||||
with pkgs.lib;
|
||||
{ pkgs, lib }:
|
||||
|
||||
let
|
||||
/* Building an engine or out-of-tree mod is very similar,
|
||||
|
|
@ -21,7 +19,10 @@ let
|
|||
so either the attributes added by `makeOverridable` have to be removed
|
||||
or the engine and mod package definitions will need to add `...` to the argument list.
|
||||
*/
|
||||
common = let f = import ./common.nix; in f (builtins.intersectAttrs (functionArgs f) pkgs // {
|
||||
common = let
|
||||
f = import ./common.nix;
|
||||
fArgs = lib.functionArgs f;
|
||||
in f (builtins.intersectAttrs fArgs pkgs // {
|
||||
lua = pkgs.lua5_1;
|
||||
# It is not necessary to run the game, but it is nicer to be given an error dialog in the case of failure,
|
||||
# rather than having to look to the logs why it is not starting.
|
||||
|
|
@ -40,8 +41,8 @@ let
|
|||
to base the name on the attribute name instead, preventing the need to specify the name twice
|
||||
if the attribute name and engine/mod name are equal.
|
||||
*/
|
||||
callWithName = name: value: if isFunction value then value name else value;
|
||||
buildOpenRASet = f: args: pkgs.recurseIntoAttrs (mapAttrs callWithName (f ({
|
||||
callWithName = name: value: if lib.isFunction value then value name else value;
|
||||
buildOpenRASet = f: args: pkgs.recurseIntoAttrs (lib.mapAttrs callWithName (f ({
|
||||
inherit (pkgs) fetchFromGitHub;
|
||||
postFetch = ''
|
||||
sed -i 's/curl/curl --insecure/g' $out/thirdparty/{fetch-thirdparty-deps,noget}.sh
|
||||
|
|
@ -56,14 +57,16 @@ in pkgs.recurseIntoAttrs rec {
|
|||
# Allow specifying the name at a later point if no name has been given.
|
||||
let builder = name: pkgs.callPackage ./engine.nix (common // {
|
||||
engine = engine // { inherit name; };
|
||||
}); in if name == null then builder else builder name;
|
||||
});
|
||||
in if name == null then builder else builder name;
|
||||
|
||||
# See `buildOpenRAEngine`.
|
||||
buildOpenRAMod = { name ? null, version, title, description, homepage, src, engine, assetsError ? "" }@mod: ({ version, mods ? [], src }@engine:
|
||||
let builder = name: pkgs.callPackage ./mod.nix (common // {
|
||||
mod = mod // { inherit name assetsError; };
|
||||
engine = engine // { inherit mods; };
|
||||
}); in if name == null then builder else builder name) engine;
|
||||
});
|
||||
in if name == null then builder else builder name) engine;
|
||||
|
||||
# See `buildOpenRASet`.
|
||||
engines = buildOpenRASet (import ./engines.nix) { inherit buildOpenRAEngine; };
|
||||
|
|
|
|||
|
|
@ -14,9 +14,7 @@
|
|||
, engine
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation (recursiveUpdate packageAttrs rec {
|
||||
stdenv.mkDerivation (lib.recursiveUpdate packageAttrs rec {
|
||||
pname = "openra_2019";
|
||||
version = "${engine.name}-${engine.version}";
|
||||
|
||||
|
|
@ -27,7 +25,7 @@ stdenv.mkDerivation (recursiveUpdate packageAttrs rec {
|
|||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
|
||||
make version VERSION=${escapeShellArg version}
|
||||
make version VERSION=${lib.escapeShellArg version}
|
||||
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
|
@ -48,7 +46,7 @@ stdenv.mkDerivation (recursiveUpdate packageAttrs rec {
|
|||
postInstall = ''
|
||||
${wrapLaunchGame "" "openra"}
|
||||
|
||||
${concatStrings (map (mod: ''
|
||||
${lib.concatStrings (map (mod: ''
|
||||
makeWrapper $out/bin/openra $out/bin/openra-${mod} --add-flags Game.Mod=${mod}
|
||||
'') engine.mods)}
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -14,14 +14,12 @@
|
|||
, engine
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
engineSourceName = engine.src.name or "engine";
|
||||
modSourceName = mod.src.name or "mod";
|
||||
|
||||
# Based on: https://build.opensuse.org/package/show/home:fusion809/openra-ura
|
||||
in stdenv.mkDerivation (recursiveUpdate packageAttrs rec {
|
||||
in stdenv.mkDerivation (lib.recursiveUpdate packageAttrs rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "openra_2019-${mod.name}";
|
||||
inherit (mod) version;
|
||||
|
|
@ -54,8 +52,8 @@ in stdenv.mkDerivation (recursiveUpdate packageAttrs rec {
|
|||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
|
||||
make version VERSION=${escapeShellArg version}
|
||||
make -C ${engineSourceName} version VERSION=${escapeShellArg engine.version}
|
||||
make version VERSION=${lib.escapeShellArg version}
|
||||
make -C ${engineSourceName} version VERSION=${lib.escapeShellArg engine.version}
|
||||
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
|
@ -67,22 +65,22 @@ in stdenv.mkDerivation (recursiveUpdate packageAttrs rec {
|
|||
|
||||
make -C ${engineSourceName} install-engine install-common-mod-files DATA_INSTALL_DIR=$out/lib/${pname}
|
||||
|
||||
cp -r ${engineSourceName}/mods/{${concatStringsSep "," ([ "common" "modcontent" ] ++ engine.mods)}} mods/* \
|
||||
cp -r ${engineSourceName}/mods/{${lib.concatStringsSep "," ([ "common" "modcontent" ] ++ engine.mods)}} mods/* \
|
||||
$out/lib/${pname}/mods/
|
||||
|
||||
substitute ${./mod-launch-game.sh} $out/lib/openra_2019-${mod.name}/launch-game.sh \
|
||||
--subst-var out \
|
||||
--subst-var-by name ${escapeShellArg mod.name} \
|
||||
--subst-var-by title ${escapeShellArg mod.title} \
|
||||
--subst-var-by assetsError ${escapeShellArg mod.assetsError}
|
||||
--subst-var-by name ${lib.escapeShellArg mod.name} \
|
||||
--subst-var-by title ${lib.escapeShellArg mod.title} \
|
||||
--subst-var-by assetsError ${lib.escapeShellArg mod.assetsError}
|
||||
chmod +x $out/lib/openra_2019-${mod.name}/launch-game.sh
|
||||
|
||||
${wrapLaunchGame "_2019-${mod.name}" "openra-${mod.name}"}
|
||||
|
||||
substitute ${./openra-mod.desktop} $(mkdirp $out/share/applications)/${pname}.desktop \
|
||||
--subst-var-by name ${escapeShellArg mod.name} \
|
||||
--subst-var-by title ${escapeShellArg mod.title} \
|
||||
--subst-var-by description ${escapeShellArg mod.description}
|
||||
--subst-var-by name ${lib.escapeShellArg mod.name} \
|
||||
--subst-var-by title ${lib.escapeShellArg mod.title} \
|
||||
--subst-var-by description ${lib.escapeShellArg mod.description}
|
||||
|
||||
cp README.md $(mkdirp $out/share/doc/packages/${pname})/README.md
|
||||
|
||||
|
|
|
|||
5
pkgs/games/space-station-14-launcher/deps.nix
generated
5
pkgs/games/space-station-14-launcher/deps.nix
generated
|
|
@ -25,8 +25,6 @@
|
|||
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.1-preview.108"; sha256 = "0n6ymn9jqms3mk5hg0ar4y9jmh96myl6q0jimn7ahb1a8viq55k1"; })
|
||||
(fetchNuGet { pname = "JetBrains.Annotations"; version = "10.3.0"; sha256 = "1grdx28ga9fp4hwwpwv354rizm8anfq4lp045q4ss41gvhggr3z8"; })
|
||||
(fetchNuGet { pname = "libsodium"; version = "1.0.18.2"; sha256 = "02xd4phd6wfixhdq48ma92c166absqw41vdq5kvjch8p0vc9cdl2"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.19"; sha256 = "1r41m93kacyyhgjxmhx84n9wv9c2ckwa8295qa4kj8rn73gg4x28"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.19"; sha256 = "1izm1kx4rwi6cp6r6qzjn9h1lmqdcx87yj4gnf291gnabgwpdg9i"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "2.9.6"; sha256 = "18mr1f0wpq0fir8vjnq0a8pz50zpnblr7sabff0yqx37c975934a"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.4.0"; sha256 = "12rn6gl4viycwk3pz5hp5df63g66zvba4hnkwr3f0876jj5ivmsw"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.4.0"; sha256 = "0rhylcwa95bxawcgixk64knv7p7xrykdjcabmx3gknk8hvj1ai9y"; })
|
||||
|
|
@ -35,9 +33,6 @@
|
|||
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; })
|
||||
(fetchNuGet { pname = "Microsoft.Data.Sqlite"; version = "7.0.4"; sha256 = "0lsbzwqiwqv2qq6858aphq7rsp6fs3i0di132w7c0r2r081szql9"; })
|
||||
(fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "7.0.4"; sha256 = "0mhfj8bj8dlc01y20ihq6j9r59f67cry6yd6qi6rg9zh93m43jpv"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.19"; sha256 = "0xf920dcy92gyf1a4ply370m1k82ja9srql5sq7wm2prl1y77wxp"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.19"; sha256 = "0r0q5jd7a0dbc2w767clz460pn6lhvrmimsrn3jqw9irgm7g2xns"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.19"; sha256 = "0slhgkjlwcmz4xjl0x6rwhhcdc6f7hz0vb4lg5ak85inl5m98xa9"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; })
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ buildDotnetModule rec {
|
|||
updateScript = ./update.sh;
|
||||
};
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_7_0;
|
||||
dotnet-sdk = with dotnetCorePackages; combinePackages [ sdk_7_0 sdk_6_0 ];
|
||||
dotnet-runtime = dotnetCorePackages.runtime_7_0;
|
||||
|
||||
dotnetFlags = [
|
||||
|
|
|
|||
694
pkgs/servers/search/qdrant/Cargo.lock
generated
694
pkgs/servers/search/qdrant/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -11,20 +11,21 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "qdrant";
|
||||
version = "1.2.2";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qdrant";
|
||||
repo = "qdrant";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-1UJZibj7twM/4z9w+ebOI0AVjPZGz7B1BWw0M0pMQ+k=";
|
||||
sha256 = "sha256-f81CepXjU+w56yGZGJJzwp1IVOQ8vB+5WNC5icVOieA=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"quantization-0.1.0" = "sha256-mhiVicQXj8639bX2mGp9XnjTNVFdd6mnk+B1B1f3ywA=";
|
||||
"wal-0.1.2" = "sha256-oZ6xij59eIpCGcFL2Ds6E180l1SGIRMOq7OcLc1TpxY=";
|
||||
"tonic-0.9.2" = "sha256-ZlcDUZy/FhxcgZE7DtYhAubOq8DMSO17T+TCmXar1jE=";
|
||||
"wal-0.1.2" = "sha256-J+r1SaYa2ZPEfjNeVJkLYERIPLZfll02RyXeS6J/R8U=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "sftpgo";
|
||||
version = "2.5.1";
|
||||
version = "2.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "drakkan";
|
||||
repo = "sftpgo";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-wFJ1PKGzEvB0fIqGbqoI4qmA485YJtD6Y4VVyKHSUoM=";
|
||||
hash = "sha256-yGbnnva3Uhdl8Pii6DvHzF8PugLDdGsjm+Izf7lh0HI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-0GfJw/RPfPGf0yds3QUpi3GLrDE3IXexBatReqU10Pg=";
|
||||
vendorHash = "sha256-9x421lU9K1qfJroIu+obxD3H1R+8QUawlnQnPFQ0P6o=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -1,121 +1,134 @@
|
|||
{
|
||||
"name": "lemmy-ui",
|
||||
"version": "0.18.0",
|
||||
"description": "An isomorphic UI for lemmy",
|
||||
"version": "0.17.4",
|
||||
"author": "Dessalines <tyhou13@gmx.com>",
|
||||
"repository": "https://github.com/LemmyNet/lemmy-ui",
|
||||
"license": "AGPL-3.0",
|
||||
"author": "Dessalines <tyhou13@gmx.com>",
|
||||
"scripts": {
|
||||
"prebuild:dev": "yarn clean && node generate_translations.js",
|
||||
"build:dev": "webpack --mode=development",
|
||||
"prebuild:prod": "yarn clean && node generate_translations.js",
|
||||
"build:prod": "webpack --mode=production",
|
||||
"clean": "yarn run rimraf dist",
|
||||
"dev": "yarn start",
|
||||
"lint": "node generate_translations.js && tsc --noEmit && eslint --report-unused-disable-directives --ext .js,.ts,.tsx src && prettier --check 'src/**/*.tsx'",
|
||||
"prebuild:dev": "yarn clean && node generate_translations.js",
|
||||
"prebuild:prod": "yarn clean && node generate_translations.js",
|
||||
"lint": "yarn translations:generate && tsc --noEmit && eslint --report-unused-disable-directives --ext .js,.ts,.tsx \"src/**\" && prettier --check \"src/**/*.{ts,tsx,js,css,scss}\"",
|
||||
"prepare": "husky install",
|
||||
"start": "yarn build:dev --watch"
|
||||
"start": "yarn build:dev --watch",
|
||||
"themes:build": "sass src/assets/css/themes/:src/assets/css/themes",
|
||||
"themes:watch": "sass --watch src/assets/css/themes/:src/assets/css/themes",
|
||||
"translations:generate": "node generate_translations.js",
|
||||
"translations:init": "git submodule init && yarn translations:update",
|
||||
"translations:update": "git submodule update --remote --recursive"
|
||||
},
|
||||
"repository": "https://github.com/LemmyNet/lemmy-ui",
|
||||
"dependencies": {
|
||||
"@babel/plugin-proposal-decorators": "^7.21.0",
|
||||
"@babel/plugin-transform-runtime": "^7.21.0",
|
||||
"@babel/plugin-transform-typescript": "^7.21.0",
|
||||
"@babel/preset-env": "7.20.2",
|
||||
"@babel/preset-typescript": "^7.21.0",
|
||||
"@babel/runtime": "^7.21.0",
|
||||
"autosize": "^6.0.1",
|
||||
"babel-loader": "^9.1.2",
|
||||
"babel-plugin-inferno": "^6.6.0",
|
||||
"check-password-strength": "^2.0.7",
|
||||
"choices.js": "^10.2.0",
|
||||
"classnames": "^2.3.1",
|
||||
"clean-webpack-plugin": "^4.0.0",
|
||||
"copy-webpack-plugin": "^11.0.0",
|
||||
"css-loader": "^6.7.3",
|
||||
"emoji-short-name": "^2.0.0",
|
||||
"express": "~4.18.2",
|
||||
"html-to-text": "^9.0.4",
|
||||
"i18next": "^22.4.10",
|
||||
"inferno": "^8.0.6",
|
||||
"inferno-create-element": "^8.0.6",
|
||||
"inferno-helmet": "^5.2.1",
|
||||
"inferno-hydrate": "^8.0.6",
|
||||
"inferno-i18next-dess": "0.0.2",
|
||||
"inferno-router": "^8.0.6",
|
||||
"inferno-server": "^8.0.6",
|
||||
"isomorphic-cookie": "^1.2.4",
|
||||
"jwt-decode": "^3.1.2",
|
||||
"lemmy-js-client": "0.17.2-rc.1",
|
||||
"markdown-it": "^13.0.1",
|
||||
"markdown-it-container": "^3.0.0",
|
||||
"markdown-it-footnote": "^3.0.3",
|
||||
"markdown-it-html5-embed": "^1.0.0",
|
||||
"markdown-it-sub": "^1.0.0",
|
||||
"markdown-it-sup": "^1.0.0",
|
||||
"mini-css-extract-plugin": "^2.7.2",
|
||||
"moment": "^2.29.4",
|
||||
"node-fetch": "^2.6.1",
|
||||
"register-service-worker": "^1.7.2",
|
||||
"run-node-webpack-plugin": "^1.3.0",
|
||||
"rxjs": "^7.8.0",
|
||||
"sanitize-html": "^2.10.0",
|
||||
"sass": "^1.58.3",
|
||||
"sass-loader": "^13.2.0",
|
||||
"serialize-javascript": "^6.0.1",
|
||||
"tippy.js": "^6.3.7",
|
||||
"toastify-js": "^1.12.0",
|
||||
"tributejs": "^5.1.3",
|
||||
"webpack": "5.75.0",
|
||||
"webpack-cli": "^5.0.1",
|
||||
"webpack-node-externals": "^3.0.0",
|
||||
"websocket-ts": "^1.1.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/core": "^7.21.0",
|
||||
"@types/autosize": "^4.0.0",
|
||||
"@types/express": "^4.17.17",
|
||||
"@types/html-to-text": "^9.0.0",
|
||||
"@types/markdown-it": "^12.2.3",
|
||||
"@types/markdown-it-container": "^2.0.5",
|
||||
"@types/node": "^18.14.0",
|
||||
"@types/node-fetch": "^2.6.2",
|
||||
"@types/sanitize-html": "^2.8.0",
|
||||
"@types/serialize-javascript": "^5.0.1",
|
||||
"@types/toastify-js": "^1.11.1",
|
||||
"@typescript-eslint/eslint-plugin": "^5.53.0",
|
||||
"@typescript-eslint/parser": "^5.53.0",
|
||||
"bootstrap": "^5.2.3",
|
||||
"bootswatch": "^5.2.3",
|
||||
"eslint": "^8.34.0",
|
||||
"eslint-plugin-inferno": "^7.32.1",
|
||||
"eslint-plugin-prettier": "^4.2.1",
|
||||
"husky": "^8.0.3",
|
||||
"import-sort-style-module": "^6.0.0",
|
||||
"lint-staged": "^13.1.2",
|
||||
"prettier": "^2.8.4",
|
||||
"prettier-plugin-import-sort": "^0.0.7",
|
||||
"prettier-plugin-organize-imports": "^3.2.2",
|
||||
"prettier-plugin-packagejson": "^2.4.3",
|
||||
"rimraf": "^4.1.2",
|
||||
"sortpack": "^2.3.3",
|
||||
"style-loader": "^3.3.1",
|
||||
"terser": "^5.16.4",
|
||||
"typescript": "^4.9.5",
|
||||
"webpack-dev-server": "4.11.1"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8.9.0"
|
||||
},
|
||||
"engineStrict": true,
|
||||
"lint-staged": {
|
||||
"*.{ts,tsx,js}": [
|
||||
"prettier --write",
|
||||
"eslint --fix"
|
||||
],
|
||||
"*.{css, scss}": [
|
||||
"prettier --write"
|
||||
],
|
||||
"package.json": [
|
||||
"sortpack"
|
||||
]
|
||||
},
|
||||
"dependencies": {
|
||||
"@babel/plugin-proposal-decorators": "^7.21.0",
|
||||
"@babel/plugin-transform-runtime": "^7.21.4",
|
||||
"@babel/plugin-transform-typescript": "^7.21.3",
|
||||
"@babel/preset-env": "7.21.5",
|
||||
"@babel/preset-typescript": "^7.21.5",
|
||||
"@babel/runtime": "^7.21.5",
|
||||
"@emoji-mart/data": "^1.1.0",
|
||||
"autosize": "^6.0.1",
|
||||
"babel-loader": "^9.1.2",
|
||||
"babel-plugin-inferno": "^6.6.0",
|
||||
"bootstrap": "^5.2.3",
|
||||
"check-password-strength": "^2.0.7",
|
||||
"classnames": "^2.3.1",
|
||||
"clean-webpack-plugin": "^4.0.0",
|
||||
"copy-webpack-plugin": "^11.0.0",
|
||||
"cross-fetch": "^3.1.5",
|
||||
"css-loader": "^6.7.3",
|
||||
"emoji-mart": "^5.4.0",
|
||||
"emoji-short-name": "^2.0.0",
|
||||
"express": "~4.18.2",
|
||||
"history": "^5.3.0",
|
||||
"html-to-text": "^9.0.5",
|
||||
"i18next": "^22.4.15",
|
||||
"inferno": "^8.1.1",
|
||||
"inferno-create-element": "^8.1.1",
|
||||
"inferno-helmet": "^5.2.1",
|
||||
"inferno-hydrate": "^8.1.1",
|
||||
"inferno-i18next-dess": "0.0.2",
|
||||
"inferno-router": "^8.1.1",
|
||||
"inferno-server": "^8.1.1",
|
||||
"isomorphic-cookie": "^1.2.4",
|
||||
"jwt-decode": "^3.1.2",
|
||||
"lemmy-js-client": "0.18.0-rc.2",
|
||||
"lodash": "^4.17.21",
|
||||
"markdown-it": "^13.0.1",
|
||||
"markdown-it-container": "^3.0.0",
|
||||
"markdown-it-emoji": "^2.0.2",
|
||||
"markdown-it-footnote": "^3.0.3",
|
||||
"markdown-it-html5-embed": "^1.0.0",
|
||||
"markdown-it-sub": "^1.0.0",
|
||||
"markdown-it-sup": "^1.0.0",
|
||||
"mini-css-extract-plugin": "^2.7.5",
|
||||
"moment": "^2.29.4",
|
||||
"register-service-worker": "^1.7.2",
|
||||
"run-node-webpack-plugin": "^1.3.0",
|
||||
"sanitize-html": "^2.10.0",
|
||||
"sass": "^1.62.1",
|
||||
"sass-loader": "^13.2.2",
|
||||
"serialize-javascript": "^6.0.1",
|
||||
"service-worker-webpack": "^1.0.0",
|
||||
"sharp": "^0.32.1",
|
||||
"tippy.js": "^6.3.7",
|
||||
"toastify-js": "^1.12.0",
|
||||
"tributejs": "^5.1.3",
|
||||
"webpack": "5.82.1",
|
||||
"webpack-cli": "^5.1.1",
|
||||
"webpack-node-externals": "^3.0.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/core": "^7.21.8",
|
||||
"@types/autosize": "^4.0.0",
|
||||
"@types/bootstrap": "^5.2.6",
|
||||
"@types/express": "^4.17.17",
|
||||
"@types/html-to-text": "^9.0.0",
|
||||
"@types/markdown-it": "^12.2.3",
|
||||
"@types/markdown-it-container": "^2.0.5",
|
||||
"@types/node": "^20.1.2",
|
||||
"@types/sanitize-html": "^2.9.0",
|
||||
"@types/serialize-javascript": "^5.0.1",
|
||||
"@types/toastify-js": "^1.11.1",
|
||||
"@typescript-eslint/eslint-plugin": "^5.59.5",
|
||||
"@typescript-eslint/parser": "^5.59.5",
|
||||
"eslint": "^8.40.0",
|
||||
"eslint-plugin-inferno": "^7.32.2",
|
||||
"eslint-plugin-jsx-a11y": "^6.7.1",
|
||||
"eslint-plugin-prettier": "^4.2.1",
|
||||
"husky": "^8.0.3",
|
||||
"import-sort-style-module": "^6.0.0",
|
||||
"lint-staged": "^13.2.2",
|
||||
"prettier": "^2.8.8",
|
||||
"prettier-plugin-import-sort": "^0.0.7",
|
||||
"prettier-plugin-organize-imports": "^3.2.2",
|
||||
"prettier-plugin-packagejson": "^2.4.3",
|
||||
"rimraf": "^5.0.0",
|
||||
"sortpack": "^2.3.4",
|
||||
"style-loader": "^3.3.2",
|
||||
"terser": "^5.17.3",
|
||||
"typescript": "^5.0.4",
|
||||
"webpack-dev-server": "4.15.0"
|
||||
},
|
||||
"packageManager": "yarn@1.22.19",
|
||||
"engines": {
|
||||
"node": ">=8.9.0"
|
||||
},
|
||||
"engineStrict": true,
|
||||
"importSort": {
|
||||
".js, .jsx, .ts, .tsx": {
|
||||
"style": "module",
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"version": "0.17.4",
|
||||
"serverSha256": "sha256-nztT6o5Tur64dMWII+wf5CBVJBJ59MGXKdS5OJO0SSc=",
|
||||
"serverCargoSha256": "sha256-3In2W+cSVtMkaKrn1hWOVL/V/qkKlH30qGPi3rNdpQI=",
|
||||
"uiSha256": "sha256-Ebc4VzuCJhPoO16qCgSVyYFXH7YcymxcGcN/Sgyg5Gs=",
|
||||
"uiYarnDepsSha256": "sha256-aZAclSaFZJvuK+FpCBWboGaVEOEJTxq2jnWk0A6iAFw="
|
||||
"version": "0.18.0",
|
||||
"serverSha256": "sha256-KzEelj2/+wfp570Vw1+FoqiYZd1PxELTdopGSeel97E=",
|
||||
"serverCargoSha256": "sha256-p1ZytuaXouKFkKjsEsaNjndoioTSVVM2pf72qE8/qyM=",
|
||||
"uiSha256": "sha256-pB6uEL9gDwvsi+FbooKBhTCJ+Qmc6Vl2bBTMiL1hUJI=",
|
||||
"uiYarnDepsSha256": "sha256-NtluS6Cr39L9nGwNA17c7xsM5xoJraS02a7sp7r9KPI="
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,6 +26,15 @@ rustPlatform.buildRustPackage rec {
|
|||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# `cargo test` fails as `tokio::test` relies on the macros feature which wasn't specified in Cargo.toml
|
||||
./tokio-macros.patch
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
echo 'pub const VERSION: &str = "${version}";' > crates/utils/src/version.rs
|
||||
'';
|
||||
|
||||
cargoSha256 = pinData.serverCargoSha256;
|
||||
|
||||
buildInputs = [ postgresql ]
|
||||
|
|
|
|||
37
pkgs/servers/web-apps/lemmy/tokio-macros.patch
Normal file
37
pkgs/servers/web-apps/lemmy/tokio-macros.patch
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
From f8c83b48774d152f9bc590db83c032235ef502a9 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Klass <kissaki@posteo.de>
|
||||
Date: Sat, 24 Jun 2023 17:57:59 +0200
|
||||
Subject: [PATCH] test: Fix missing tokio test macro dependency
|
||||
|
||||
The tests make use of the `#[tokio::test]` macro, but the tokio dependency default feature does not include them. Running cargo test fails.
|
||||
|
||||
By including the `macros` feature on the tokio dependency, cargo test will work.
|
||||
|
||||
---
|
||||
|
||||
cargo test fails with
|
||||
|
||||
```
|
||||
error[E0433]: failed to resolve: could not find `test` in `tokio`
|
||||
--> src\scheduled_tasks.rs:295:12
|
||||
|
|
||||
295 | #[tokio::test]
|
||||
| ^^^^ could not find `test` in `tokio`
|
||||
```
|
||||
---
|
||||
Cargo.toml | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index 430deb082c..d4c5ab8ef0 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -89,7 +89,7 @@ anyhow = "1.0.71"
|
||||
diesel_ltree = "0.3.0"
|
||||
typed-builder = "0.10.0"
|
||||
serial_test = "0.9.0"
|
||||
-tokio = "1.28.2"
|
||||
+tokio = { version = "1.28.2", features = ["macros"] }
|
||||
sha2 = "0.10.6"
|
||||
regex = "1.8.4"
|
||||
once_cell = "1.18.0"
|
||||
|
|
@ -7,6 +7,8 @@
|
|||
, fetchFromGitHub
|
||||
, fetchYarnDeps
|
||||
, nixosTests
|
||||
, vips
|
||||
, nodePackages
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -21,6 +23,13 @@ let
|
|||
rm build/config.gypi
|
||||
'';
|
||||
};
|
||||
sharp = {
|
||||
nativeBuildInputs = [ pkg-config nodePackages.semver ];
|
||||
buildInputs = [ vips ];
|
||||
postInstall = ''
|
||||
yarn --offline run install
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
name = "lemmy-ui";
|
||||
|
|
@ -55,6 +64,7 @@ mkYarnPackage {
|
|||
export HOME=$PWD/yarn_home
|
||||
|
||||
ln -sf $PWD/node_modules $PWD/deps/lemmy-ui/
|
||||
echo 'export const VERSION = "${version}";' > $PWD/deps/lemmy-ui/src/shared/version.ts
|
||||
|
||||
yarn --offline build:prod
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchurl, writeText, nixosTests }:
|
||||
{ lib, stdenvNoCC, fetchurl, nixosTests }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "mediawiki";
|
||||
version = "1.39.3";
|
||||
|
||||
|
|
@ -13,18 +13,14 @@ stdenv.mkDerivation rec {
|
|||
sed -i 's|$vars = Installer::getExistingLocalSettings();|$vars = null;|' includes/installer/CliInstaller.php
|
||||
'';
|
||||
|
||||
installPhase = let
|
||||
phpConfig = writeText "LocalSettings.php" ''
|
||||
<?php
|
||||
return require(getenv('MEDIAWIKI_CONFIG'));
|
||||
?>
|
||||
'';
|
||||
in ''
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/mediawiki
|
||||
cp -r * $out/share/mediawiki
|
||||
cp ${phpConfig} $out/share/mediawiki/LocalSettings.php
|
||||
echo "<?php
|
||||
return require(getenv('MEDIAWIKI_CONFIG'));
|
||||
?>" > $out/share/mediawiki/LocalSettings.php
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nifi";
|
||||
version = "1.21.0";
|
||||
version = "1.22.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "mirror://apache/nifi/${version}/nifi-${version}-bin.zip";
|
||||
sha256 = "sha256-AnDvZ9SV+VFdsP6KoqZIPNinAe2erT/IBY4c6i+2iTQ=";
|
||||
hash = "sha256-IzTGsD6nL7UrXuHrJc8Dt1C6r137UjT/V4vES2m/8cg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fuse, libuuid, lz4 }:
|
||||
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fuse, util-linux, lz4
|
||||
, fuseSupport ? stdenv.isLinux
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "erofs-utils";
|
||||
|
|
@ -12,14 +14,15 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
buildInputs = [ fuse libuuid lz4 ];
|
||||
buildInputs = [ util-linux lz4 ]
|
||||
++ lib.optionals fuseSupport [ fuse ];
|
||||
|
||||
configureFlags = [ "--enable-fuse" ];
|
||||
configureFlags = lib.optionals fuseSupport [ "--enable-fuse" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Userspace utilities for linux-erofs file system";
|
||||
license = with licenses; [ gpl2Plus ];
|
||||
maintainers = with maintainers; [ ehmry ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ehmry nikstur ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -6,6 +6,7 @@
|
|||
, qttools
|
||||
, qtsvg
|
||||
, nix-update-script
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
|
|
@ -19,6 +20,15 @@ mkDerivation rec {
|
|||
sha256 = "sha256-omyMN8d+g1uYsEw41KmpJCwOmVWLokEfbW19vIvG79w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/flameshot-org/flameshot/pull/3166
|
||||
(fetchpatch {
|
||||
name = "10-fix-wayland.patch";
|
||||
url = "https://github.com/flameshot-org/flameshot/commit/5fea9144501f7024344d6f29c480b000b2dcd5a6.patch";
|
||||
sha256 = "sha256-SnjVbFMDKD070vR4vGYrwLw6scZAFaQA4b+MbI+0W9E=";
|
||||
})
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "topgrade";
|
||||
version = "11.0.2";
|
||||
version = "12.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "topgrade-rs";
|
||||
repo = "topgrade";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0pMaFEkzyZkZ7bkPK4hJDjCo/OWYreG+/zyaPl1sNso=";
|
||||
hash = "sha256-l8/X2PGdUZa9r0E95wpbvag6XW5jV+7H8TJMm/D4yqk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-RqJKwk3MeSYx4kfyzF55A7GltM5PZynHbRYCFFj9JkQ=";
|
||||
cargoHash = "sha256-W+NrhHxPDo+WfNMxDmmPlCdTB/YavLDQ2+JEMDF9qJ4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -304,6 +304,7 @@ class ManualHTMLRenderer(RendererMixin, HTMLRenderer):
|
|||
'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"',
|
||||
' "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
|
||||
'<html xmlns="http://www.w3.org/1999/xhtml">',
|
||||
' <head>',
|
||||
' <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />',
|
||||
f' <title>{toc.target.title}</title>',
|
||||
"".join((f'<link rel="stylesheet" type="text/css" href="{html.escape(style, True)}" />'
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
}:
|
||||
buildGoModule rec {
|
||||
pname = "cosign";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sigstore";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-fZIkRmQAnLTllA0UBOIlbYCfjvEQ9LTXymGJ480gtb0=";
|
||||
hash = "sha256-5dRrq+mV2fDGTi2WZHlCP8+GH3cBJIE8AHGuch7hv/I=";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
|
@ -28,7 +28,7 @@ buildGoModule rec {
|
|||
|
||||
nativeBuildInputs = [ pkg-config installShellFiles ];
|
||||
|
||||
vendorHash = "sha256-CYDhr9E8xg/mn8yUP6xy5gFl15tNEcUfGUTpmHyDGaY=";
|
||||
vendorHash = "sha256-y9bUwyQMYw4m7JZ6RpTlcYZOiCoxaQRiWYKNmgzEXJA=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/cosign"
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2023-06-24";
|
||||
version = "2023-06-27";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "exploit-database";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-uQQ/TPE+64VeUSbnzNlRBdG1Nv4QcsQvfLyoRH68OhA=";
|
||||
hash = "sha256-2LPLVy43uHzvWruGCKOKh4pn9/RHIdhpYQnNwG9/+Sw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,4 +2,8 @@
|
|||
|
||||
source "https://rubygems.org"
|
||||
|
||||
gem "net-ftp"
|
||||
gem "net-imap"
|
||||
gem "net-pop"
|
||||
gem "net-smtp"
|
||||
gem "ronin"
|
||||
|
|
|
|||
|
|
@ -1,46 +1,50 @@
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
activemodel (7.0.4.3)
|
||||
activesupport (= 7.0.4.3)
|
||||
activerecord (7.0.4.3)
|
||||
activemodel (= 7.0.4.3)
|
||||
activesupport (= 7.0.4.3)
|
||||
activesupport (7.0.4.3)
|
||||
activemodel (7.0.5.1)
|
||||
activesupport (= 7.0.5.1)
|
||||
activerecord (7.0.5.1)
|
||||
activemodel (= 7.0.5.1)
|
||||
activesupport (= 7.0.5.1)
|
||||
activesupport (7.0.5.1)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 1.6, < 2)
|
||||
minitest (>= 5.1)
|
||||
tzinfo (~> 2.0)
|
||||
addressable (2.8.2)
|
||||
addressable (2.8.4)
|
||||
public_suffix (>= 2.0.2, < 6.0)
|
||||
async (2.5.0)
|
||||
async (2.6.2)
|
||||
console (~> 1.10)
|
||||
fiber-annotation
|
||||
io-event (~> 1.1)
|
||||
timers (~> 4.1)
|
||||
async-io (1.34.3)
|
||||
async-io (1.35.0)
|
||||
async
|
||||
chars (0.3.2)
|
||||
combinatorics (0.4.4)
|
||||
command_kit (0.4.0)
|
||||
command_mapper (0.3.1)
|
||||
concurrent-ruby (1.2.2)
|
||||
connection_pool (2.4.0)
|
||||
console (1.16.2)
|
||||
connection_pool (2.4.1)
|
||||
console (1.17.2)
|
||||
fiber-annotation
|
||||
fiber-local
|
||||
date (3.3.3)
|
||||
domain_name (0.5.20190701)
|
||||
unf (>= 0.0.5, < 1.0.0)
|
||||
fake_io (0.1.0)
|
||||
fiber-annotation (0.2.0)
|
||||
fiber-local (1.0.0)
|
||||
hexdump (1.0.0)
|
||||
http-cookie (1.0.5)
|
||||
domain_name (~> 0.5)
|
||||
i18n (1.12.0)
|
||||
i18n (1.14.1)
|
||||
concurrent-ruby (~> 1.0)
|
||||
io-console (0.6.0)
|
||||
io-event (1.1.7)
|
||||
irb (1.6.3)
|
||||
io-event (1.2.2)
|
||||
irb (1.7.0)
|
||||
reline (>= 0.3.0)
|
||||
mechanize (2.8.5)
|
||||
mechanize (2.9.1)
|
||||
addressable (~> 2.8)
|
||||
domain_name (~> 0.5, >= 0.5.20190701)
|
||||
http-cookie (~> 1.0, >= 1.0.3)
|
||||
|
|
@ -54,15 +58,27 @@ GEM
|
|||
mime-types (3.4.1)
|
||||
mime-types-data (~> 3.2015)
|
||||
mime-types-data (3.2023.0218.1)
|
||||
mini_portile2 (2.8.1)
|
||||
minitest (5.18.0)
|
||||
mini_portile2 (2.8.2)
|
||||
minitest (5.18.1)
|
||||
mustermann (3.0.0)
|
||||
ruby2_keywords (~> 0.0.1)
|
||||
net-ftp (0.2.0)
|
||||
net-protocol
|
||||
time
|
||||
net-http-digest_auth (1.4.1)
|
||||
net-http-persistent (4.0.2)
|
||||
connection_pool (~> 2.2)
|
||||
nokogiri (1.14.2)
|
||||
mini_portile2 (~> 2.8.0)
|
||||
net-imap (0.3.6)
|
||||
date
|
||||
net-protocol
|
||||
net-pop (0.1.2)
|
||||
net-protocol
|
||||
net-protocol (0.2.1)
|
||||
timeout
|
||||
net-smtp (0.3.3)
|
||||
net-protocol
|
||||
nokogiri (1.15.2)
|
||||
mini_portile2 (~> 2.8.2)
|
||||
racc (~> 1.4)
|
||||
nokogiri-diff (0.2.0)
|
||||
nokogiri (~> 1.5)
|
||||
|
|
@ -71,16 +87,16 @@ GEM
|
|||
nokogiri (~> 1.0)
|
||||
open_namespace (0.4.1)
|
||||
public_suffix (5.0.1)
|
||||
racc (1.6.2)
|
||||
rack (2.2.6.4)
|
||||
rack-protection (3.0.5)
|
||||
racc (1.7.1)
|
||||
rack (2.2.7)
|
||||
rack-protection (3.0.6)
|
||||
rack
|
||||
rack-user_agent (0.5.3)
|
||||
rack (>= 1.5)
|
||||
woothee (>= 1.0.0)
|
||||
reline (0.3.3)
|
||||
reline (0.3.5)
|
||||
io-console (~> 0.5)
|
||||
ronin (2.0.1)
|
||||
ronin (2.0.3)
|
||||
async-io (~> 1.0)
|
||||
open_namespace (~> 0.4)
|
||||
ronin-code-asm (~> 1.0)
|
||||
|
|
@ -98,21 +114,21 @@ GEM
|
|||
wordlist (~> 1.0)
|
||||
ronin-code-asm (1.0.0)
|
||||
ruby-yasm (~> 0.3)
|
||||
ronin-code-sql (2.0.0)
|
||||
ronin-code-sql (2.1.0)
|
||||
ronin-support (~> 1.0)
|
||||
ronin-core (0.1.1)
|
||||
command_kit (~> 0.4)
|
||||
irb (~> 1.0)
|
||||
reline (~> 0.1)
|
||||
ronin-db (0.1.0)
|
||||
ronin-db (0.1.1)
|
||||
ronin-core (~> 0.1)
|
||||
ronin-db-activerecord (~> 0.1)
|
||||
ronin-support (~> 1.0)
|
||||
sqlite3 (~> 1.0)
|
||||
ronin-db-activerecord (0.1.0)
|
||||
ronin-db-activerecord (0.1.1)
|
||||
activerecord (~> 7.0)
|
||||
uri-query_params (~> 0.6)
|
||||
ronin-exploits (1.0.1)
|
||||
ronin-exploits (1.0.2)
|
||||
ronin-code-sql (~> 2.0)
|
||||
ronin-core (~> 0.1)
|
||||
ronin-payloads (~> 0.1, >= 0.1.1)
|
||||
|
|
@ -125,7 +141,7 @@ GEM
|
|||
combinatorics (~> 0.4)
|
||||
ronin-core (~> 0.1)
|
||||
ronin-support (~> 1.0)
|
||||
ronin-payloads (0.1.1)
|
||||
ronin-payloads (0.1.3)
|
||||
ronin-code-asm (~> 1.0)
|
||||
ronin-core (~> 0.1)
|
||||
ronin-post_ex (~> 0.1)
|
||||
|
|
@ -135,9 +151,9 @@ GEM
|
|||
fake_io (~> 0.1)
|
||||
hexdump (~> 1.0)
|
||||
ronin-core (~> 0.1)
|
||||
ronin-repos (0.1.0)
|
||||
ronin-repos (0.1.1)
|
||||
ronin-core (~> 0.1)
|
||||
ronin-support (1.0.1)
|
||||
ronin-support (1.0.2)
|
||||
addressable (~> 2.0)
|
||||
chars (~> 0.3, >= 0.3.2)
|
||||
combinatorics (~> 0.4)
|
||||
|
|
@ -146,7 +162,7 @@ GEM
|
|||
ronin-vulns (0.1.2)
|
||||
ronin-core (~> 0.1)
|
||||
ronin-support (~> 1.0, >= 1.0.1)
|
||||
ronin-web (1.0.1)
|
||||
ronin-web (1.0.2)
|
||||
mechanize (~> 2.0)
|
||||
nokogiri (~> 1.4)
|
||||
nokogiri-diff (~> 0.2)
|
||||
|
|
@ -172,17 +188,20 @@ GEM
|
|||
command_mapper (~> 0.1)
|
||||
ruby2_keywords (0.0.5)
|
||||
rubyntlm (0.6.3)
|
||||
sinatra (3.0.5)
|
||||
sinatra (3.0.6)
|
||||
mustermann (~> 3.0)
|
||||
rack (~> 2.2, >= 2.2.4)
|
||||
rack-protection (= 3.0.5)
|
||||
rack-protection (= 3.0.6)
|
||||
tilt (~> 2.0)
|
||||
spidr (0.7.0)
|
||||
nokogiri (~> 1.3)
|
||||
sqlite3 (1.6.2)
|
||||
sqlite3 (1.6.3)
|
||||
mini_portile2 (~> 2.8.0)
|
||||
tdiff (0.3.4)
|
||||
tilt (2.1.0)
|
||||
tilt (2.2.0)
|
||||
time (0.2.2)
|
||||
date
|
||||
timeout (0.4.0)
|
||||
timers (4.3.5)
|
||||
tzinfo (2.0.6)
|
||||
concurrent-ruby (~> 1.0)
|
||||
|
|
@ -199,7 +218,11 @@ PLATFORMS
|
|||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
net-ftp
|
||||
net-imap
|
||||
net-pop
|
||||
net-smtp
|
||||
ronin
|
||||
|
||||
BUNDLED WITH
|
||||
2.3.7
|
||||
2.4.10
|
||||
|
|
|
|||
|
|
@ -1,18 +1,19 @@
|
|||
{ pkgs, lib, bundlerApp, bundlerUpdateScript }:
|
||||
{ lib, bundlerEnv, bundlerUpdateScript, defaultGemConfig, yasm }:
|
||||
|
||||
bundlerApp {
|
||||
pname = "ronin";
|
||||
bundlerEnv {
|
||||
name = "ronin";
|
||||
gemdir = ./.;
|
||||
exes = [
|
||||
"ronin"
|
||||
"ronin-db"
|
||||
"ronin-exploits"
|
||||
"ronin-fuzzer"
|
||||
"ronin-payloads"
|
||||
"ronin-repos"
|
||||
"ronin-vulns"
|
||||
"ronin-web"
|
||||
];
|
||||
|
||||
gemConfig = defaultGemConfig // {
|
||||
ronin-code-asm = attrs: {
|
||||
dontBuild = false;
|
||||
postPatch = ''
|
||||
substituteInPlace lib/ronin/code/asm/program.rb \
|
||||
--replace "YASM::Command.run(" "YASM::Command.run(
|
||||
command_path: '${yasm}/bin/yasm',"
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
passthru.updateScript = bundlerUpdateScript "ronin";
|
||||
|
||||
|
|
|
|||
|
|
@ -5,10 +5,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0ymhsxgdb68zgf4zp07g2bymmpgn0b9r38avn9pagz1p5zy1ql9v";
|
||||
sha256 = "12f89hxs4s26ggsg4bnz9qxlcsclcgx9gdsl8dni5jc0gk47h14y";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.0.4.3";
|
||||
version = "7.0.5.1";
|
||||
};
|
||||
activerecord = {
|
||||
dependencies = ["activemodel" "activesupport"];
|
||||
|
|
@ -16,10 +16,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "01wb98i2zsbb4jcb4i6z72vb05wiks4hv9chc66h1rsxrv0zi4dv";
|
||||
sha256 = "1sfdq2slmsc0ygncl36dq1lmjww1y3b42izrnn62cyisiag28796";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.0.4.3";
|
||||
version = "7.0.5.1";
|
||||
};
|
||||
activesupport = {
|
||||
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
|
||||
|
|
@ -27,10 +27,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "15m0b1im6i401ab51vzr7f8nk8kys1qa0snnl741y3sir3xd07jp";
|
||||
sha256 = "0m1sa6djlm9cz6mz3lcbqqahvm6qj75dmq3phpn2ysyxnlz2hr0c";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.0.4.3";
|
||||
version = "7.0.5.1";
|
||||
};
|
||||
addressable = {
|
||||
dependencies = ["public_suffix"];
|
||||
|
|
@ -38,21 +38,21 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0km8qw6qzximlg9iz24acqbpbzjw0r05bgavc6zqs3282xkyhimy";
|
||||
sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.8.2";
|
||||
version = "2.8.4";
|
||||
};
|
||||
async = {
|
||||
dependencies = ["console" "io-event" "timers"];
|
||||
dependencies = ["console" "fiber-annotation" "io-event" "timers"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0gj166ij131c5d53dj51ad8v25dsrn9xym3vx8wkma1n40x3d6la";
|
||||
sha256 = "0gk3mbwrzyrc1a5669x8cw83qkddjyg42dxwdx3xb4rf7rwnzdx3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.5.0";
|
||||
version = "2.6.2";
|
||||
};
|
||||
async-io = {
|
||||
dependencies = ["async"];
|
||||
|
|
@ -60,10 +60,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "10qxdz7hi136gp4pgzmw49vp8mz4fk89lc2319lp3d8iqn8w1swj";
|
||||
sha256 = "1cx4kgyr8yhg0rfcasmny9sbxjxvf07dmcw85yzismadfli1sndz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.34.3";
|
||||
version = "1.35.0";
|
||||
};
|
||||
chars = {
|
||||
groups = ["default"];
|
||||
|
|
@ -120,21 +120,31 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0dndngqvkm2ih3wqn5ilf9980c1cc57lqn5lywx3myalzpilq05z";
|
||||
sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.4.0";
|
||||
version = "2.4.1";
|
||||
};
|
||||
console = {
|
||||
dependencies = ["fiber-local"];
|
||||
dependencies = ["fiber-annotation" "fiber-local"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0y1bv3kd1l9p0k5n3anvvjxdrcq113pyngz2g29i9mvdgbbx7kq2";
|
||||
sha256 = "1kxcxm3ynrsv6d60r2pzbw6rzdbg506hn3536pflaf747c5y2db7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.16.2";
|
||||
version = "1.17.2";
|
||||
};
|
||||
date = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.3.3";
|
||||
};
|
||||
domain_name = {
|
||||
dependencies = ["unf"];
|
||||
|
|
@ -157,6 +167,16 @@
|
|||
};
|
||||
version = "0.1.0";
|
||||
};
|
||||
fiber-annotation = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "00vcmynyvhny8n4p799rrhcx0m033hivy0s1gn30ix8rs7qsvgvs";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.2.0";
|
||||
};
|
||||
fiber-local = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
|
|
@ -194,10 +214,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi";
|
||||
sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.12.0";
|
||||
version = "1.14.1";
|
||||
};
|
||||
io-console = {
|
||||
groups = ["default"];
|
||||
|
|
@ -214,10 +234,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1mk579b88kvv5r4as0f6niq02176c6lmph305ml4piklgx6a1fsa";
|
||||
sha256 = "0j36a76mbcvp5516liiv01z5gz3f64waiqgskj1zrxqbwyirx5h7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.7";
|
||||
version = "1.2.2";
|
||||
};
|
||||
irb = {
|
||||
dependencies = ["reline"];
|
||||
|
|
@ -225,10 +245,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1h9s07n5v3z029v18924ws9vdkdc80n6llp9ccx77yg1krv2g0f3";
|
||||
sha256 = "0z7ksjik7phf6ygshg9bp6ldd38dfgxmgr73yipkpqq7b426hclq";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.6.3";
|
||||
version = "1.7.0";
|
||||
};
|
||||
mechanize = {
|
||||
dependencies = ["addressable" "domain_name" "http-cookie" "mime-types" "net-http-digest_auth" "net-http-persistent" "nokogiri" "rubyntlm" "webrick" "webrobots"];
|
||||
|
|
@ -236,10 +256,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1adjnzvq3rxqz7xf3qr7c0p85ccfwmn0l3fcmch6cjwz0i9vc5ah";
|
||||
sha256 = "08lcl3qwgi8r3q0hm5ysmj7j5xqb289kqrd15w09anirj36jc80z";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.8.5";
|
||||
version = "2.9.1";
|
||||
};
|
||||
mime-types = {
|
||||
dependencies = ["mime-types-data"];
|
||||
|
|
@ -267,20 +287,20 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp";
|
||||
sha256 = "0z7f38iq37h376n9xbl4gajdrnwzq284c9v1py4imw3gri2d5cj6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.8.1";
|
||||
version = "2.8.2";
|
||||
};
|
||||
minitest = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0ic7i5z88zcaqnpzprf7saimq2f6sad57g5mkkqsrqrcd6h3mx06";
|
||||
sha256 = "1kg9wh7jlc9zsr3hkhpzkbn0ynf4np5ap9m2d8xdrb8shy0y6pmb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.18.0";
|
||||
version = "5.18.1";
|
||||
};
|
||||
mustermann = {
|
||||
dependencies = ["ruby2_keywords"];
|
||||
|
|
@ -293,6 +313,17 @@
|
|||
};
|
||||
version = "3.0.0";
|
||||
};
|
||||
net-ftp = {
|
||||
dependencies = ["net-protocol" "time"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0bqy9xg5225x102873j1qqq1bvnwfbi8lnf4357mpq6wimnw9pf9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.2.0";
|
||||
};
|
||||
net-http-digest_auth = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
|
|
@ -314,16 +345,60 @@
|
|||
};
|
||||
version = "4.0.2";
|
||||
};
|
||||
net-imap = {
|
||||
dependencies = ["date" "net-protocol"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1k1qyjr9lkk5y3483k6wk6d9h1jx4v5hzby1mf0pj3b4kr2arxbm";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.3.6";
|
||||
};
|
||||
net-pop = {
|
||||
dependencies = ["net-protocol"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1wyz41jd4zpjn0v1xsf9j778qx1vfrl24yc20cpmph8k42c4x2w4";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.2";
|
||||
};
|
||||
net-protocol = {
|
||||
dependencies = ["timeout"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0dxckrlw4q1lcn3qg4mimmjazmg9bma5gllv72f8js3p36fb3b91";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.2.1";
|
||||
};
|
||||
net-smtp = {
|
||||
dependencies = ["net-protocol"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1c6md06hm5bf6rv53sk54dl2vg038pg8kglwv3rayx0vk2mdql9x";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.3.3";
|
||||
};
|
||||
nokogiri = {
|
||||
dependencies = ["mini_portile2" "racc"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1djq4rp4m967mn6sxmiw75vz24gfp0w602xv22kk1x3cmi5afrf7";
|
||||
sha256 = "1mr2ibfk874ncv0qbdkynay738w2mfinlkhnbd5lyk5yiw5q1p10";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.14.2";
|
||||
version = "1.15.2";
|
||||
};
|
||||
nokogiri-diff = {
|
||||
dependencies = ["nokogiri" "tdiff"];
|
||||
|
|
@ -372,20 +447,20 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq";
|
||||
sha256 = "11v3l46mwnlzlc371wr3x6yylpgafgwdf0q7hc7c1lzx6r414r5g";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.6.2";
|
||||
version = "1.7.1";
|
||||
};
|
||||
rack = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1qgwkcb8kxns8d5187cxjaxf18b7dmg9gh6cr9c1125m0bj2pnfk";
|
||||
sha256 = "16w217k9z02c4hqizym8dkj6bqmmzx4qdvqpnskgzf174a5pwdxk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.2.6.4";
|
||||
version = "2.2.7";
|
||||
};
|
||||
rack-protection = {
|
||||
dependencies = ["rack"];
|
||||
|
|
@ -393,10 +468,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1a12m1mv8dc0g90fs1myvis8vsgr427k1arg1q4a9qlfw6fqyhis";
|
||||
sha256 = "1kpm67az1wxlg76h620in2r7agfyhv177ps268j5ggsanzddzih8";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.0.5";
|
||||
version = "3.0.6";
|
||||
};
|
||||
rack-user_agent = {
|
||||
dependencies = ["rack" "woothee"];
|
||||
|
|
@ -415,10 +490,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0zpz436h6gxyh000bdsm1m53kb5zgl97cfb45rxk2w5z2fgl30f3";
|
||||
sha256 = "0k5rqi4b7qnwxslc54k0nnfg97842i6hmjnyy79pqyydwwcjhj0i";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.3.3";
|
||||
version = "0.3.5";
|
||||
};
|
||||
ronin = {
|
||||
dependencies = ["async-io" "open_namespace" "ronin-code-asm" "ronin-code-sql" "ronin-core" "ronin-db" "ronin-exploits" "ronin-fuzzer" "ronin-payloads" "ronin-repos" "ronin-support" "ronin-vulns" "ronin-web" "rouge" "wordlist"];
|
||||
|
|
@ -426,10 +501,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "10jnlhacvcqhfd31hi1208xhmxv8fqa3yz6nwc0g1bb5271v2j16";
|
||||
sha256 = "0z56vz0ndakxyngivpa6zn4ja2g5lzaz51aws9778bpcai5i300x";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.1";
|
||||
version = "2.0.3";
|
||||
};
|
||||
ronin-code-asm = {
|
||||
dependencies = ["ruby-yasm"];
|
||||
|
|
@ -448,10 +523,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0mdnjvfvazyn0pnsjm1vdj906wmh97vvvi8mizjkvvipxkzizr40";
|
||||
sha256 = "1z6ynbrbzlkab1fbhccghr2xm6dak9xb2djqjlc6nai3fdhid1v8";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
};
|
||||
ronin-core = {
|
||||
dependencies = ["command_kit" "irb" "reline"];
|
||||
|
|
@ -470,10 +545,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0r0ybr2pw7can5sgnibmmlh97aicq1m31l8ldsswj56fkrjjn7r1";
|
||||
sha256 = "0x2mmwbmhc2fh4lk7nx6jbp894mg4aa6n35pkiaf8n527kksa9cd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.0";
|
||||
version = "0.1.1";
|
||||
};
|
||||
ronin-db-activerecord = {
|
||||
dependencies = ["activerecord" "uri-query_params"];
|
||||
|
|
@ -481,10 +556,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "13a39x9dwr4ismfrz2vf4yv7abmx9vzgfdj0diiz79ysfmbmj6a4";
|
||||
sha256 = "1vygs09ib2dsna1w2lgv4f1qxa6q1niyqvihy4f49f9ppk52mwhh";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.0";
|
||||
version = "0.1.1";
|
||||
};
|
||||
ronin-exploits = {
|
||||
dependencies = ["ronin-code-sql" "ronin-core" "ronin-payloads" "ronin-post_ex" "ronin-repos" "ronin-support" "ronin-vulns" "uri-query_params"];
|
||||
|
|
@ -492,10 +567,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0niw585sg40wj23d9j0l98bnhyxvlaif92s7dynznf7x4igmp9rj";
|
||||
sha256 = "078p7fkrgzkjip11wgcvifc5xwcysfy3r1qsh5pid97ysp1qg477";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
};
|
||||
ronin-fuzzer = {
|
||||
dependencies = ["combinatorics" "ronin-core" "ronin-support"];
|
||||
|
|
@ -514,10 +589,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0z8k5g9r0bi8mhkmzbgx4lpw1civnmc6adl5hy0k3dp9wm3qs002";
|
||||
sha256 = "15n2nfrrf695i2fk1vr3f84sgnnhn6v2dhdmfxzrdknr5fckvbic";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.1";
|
||||
version = "0.1.3";
|
||||
};
|
||||
ronin-post_ex = {
|
||||
dependencies = ["fake_io" "hexdump" "ronin-core"];
|
||||
|
|
@ -536,10 +611,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "054zm9bcri9gklsr7xh1z8qqzm7a6n0j8m7mm0553hr1mnpah94p";
|
||||
sha256 = "0c453qw7xr4vsq2y5dlnihfmzy95q3xjbfl5cm1y0xwzdm7ibbzx";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.0";
|
||||
version = "0.1.1";
|
||||
};
|
||||
ronin-support = {
|
||||
dependencies = ["addressable" "chars" "combinatorics" "hexdump" "uri-query_params"];
|
||||
|
|
@ -547,10 +622,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0pysnsgdn8hxn2wikgs0x3kcz0r4a1n5fdsys6c1z0kmslh4f52k";
|
||||
sha256 = "0ds32mk7s96gsi3q0m2ljgl122glalya1cbjx1xjjq8wbrbsxdjr";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
};
|
||||
ronin-vulns = {
|
||||
dependencies = ["ronin-core" "ronin-support"];
|
||||
|
|
@ -569,10 +644,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0wzd7dibc7lkqvw0kqx4py6srqd3ic2mbr7jzyq7d7wrx4inbpgs";
|
||||
sha256 = "06rh7hrkj4yl6pn1m3isfim2sk5vb3ap3rba91bw7drcqsra7fmw";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
};
|
||||
ronin-web-server = {
|
||||
dependencies = ["rack" "rack-user_agent" "ronin-support" "sinatra" "webrick"];
|
||||
|
|
@ -653,10 +728,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1ryfja9yd3fq8n1p5yi3qnd0pjk7bkycmxxmbb1bj0axlr1pdv20";
|
||||
sha256 = "1q0ghxfqgjhg2dq9699mn5qx6m6q2cgldg312kh41pzwwy71a7hx";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.0.5";
|
||||
version = "3.0.6";
|
||||
};
|
||||
spidr = {
|
||||
dependencies = ["nokogiri"];
|
||||
|
|
@ -675,10 +750,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1i47n6nkyigkyag00yqf9f3nj11bm1lb0ds5nkvkdvm7lxbna5jq";
|
||||
sha256 = "0h95kr5529qv786mfk8r2jjdsdi6v7v3k3dpz69mrcc9i0vpdd37";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.6.2";
|
||||
version = "1.6.3";
|
||||
};
|
||||
tdiff = {
|
||||
groups = ["default"];
|
||||
|
|
@ -695,10 +770,31 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1qmhi6d9przjzhsyk9g5pq2j75c656msh6xzprqd2mxgphf23jxs";
|
||||
sha256 = "0bmjgbv8158klwp2r3klxjwaj93nh1sbl4xvj9wsha0ic478avz7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.1.0";
|
||||
version = "2.2.0";
|
||||
};
|
||||
time = {
|
||||
dependencies = ["date"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "13pzdsgf3v06mymzipcpa7p80shyw328ybn775nzpnhc6n8y9g30";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.2.2";
|
||||
};
|
||||
timeout = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1d9cvm0f4zdpwa795v3zv4973y5zk59j7s1x3yn90jjrhcz1yvfd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.4.0";
|
||||
};
|
||||
timers = {
|
||||
groups = ["default"];
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "trufflehog";
|
||||
version = "3.40.0";
|
||||
version = "3.41.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trufflesecurity";
|
||||
repo = "trufflehog";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-gPHvkqpNPcOBDN7eNTPrpWhTrhmCRj03gz0bLFKNxAs=";
|
||||
hash = "sha256-U8GNGeBGqL4p35ogV07NZdOYgRVAMW5MMXje/s/zthM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-bgptNmWChJkz8KaxSCDUDOsQ+Tel5WoIlzatDYgVQbE=";
|
||||
vendorHash = "sha256-U0qYNJwJpyUwCycwhu1XY83xPKiQdwzc1YuN5JGQE08=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -7203,6 +7203,8 @@ with pkgs;
|
|||
|
||||
ecmtools = callPackage ../tools/cd-dvd/ecm-tools { };
|
||||
|
||||
erofs-utils = callPackage ../tools/filesystems/erofs-utils { };
|
||||
|
||||
e2tools = callPackage ../tools/filesystems/e2tools { };
|
||||
|
||||
e2fsprogs = callPackage ../tools/filesystems/e2fsprogs { };
|
||||
|
|
@ -15046,6 +15048,10 @@ with pkgs;
|
|||
|
||||
crystal2nix = callPackage ../development/compilers/crystal2nix { };
|
||||
|
||||
crystalline = callPackage ../development/tools/language-servers/crystalline {
|
||||
llvmPackages = llvmPackages_15;
|
||||
};
|
||||
|
||||
icr = callPackage ../development/tools/icr { };
|
||||
|
||||
scry = callPackage ../development/tools/scry { crystal = crystal_1_2; };
|
||||
|
|
@ -21576,6 +21582,7 @@ with pkgs;
|
|||
|
||||
ispc = callPackage ../development/compilers/ispc {
|
||||
inherit (llvmPackages) stdenv;
|
||||
xcode = darwin.xcode_14;
|
||||
};
|
||||
|
||||
isso = callPackage ../servers/isso {
|
||||
|
|
@ -23349,7 +23356,7 @@ with pkgs;
|
|||
|
||||
mlc = callPackage ../tools/system/mlc { };
|
||||
|
||||
mlt = callPackage ../development/libraries/mlt { };
|
||||
mlt = darwin.apple_sdk_11_0.callPackage ../development/libraries/mlt { };
|
||||
|
||||
mlib = callPackage ../development/libraries/mlib { };
|
||||
|
||||
|
|
@ -27065,8 +27072,6 @@ with pkgs;
|
|||
|
||||
dstat = callPackage ../os-specific/linux/dstat { };
|
||||
|
||||
erofs-utils = callPackage ../os-specific/linux/erofs-utils { };
|
||||
|
||||
evdev-proto = callPackage ../os-specific/bsd/freebsd/evdev-proto { };
|
||||
|
||||
fscryptctl = callPackage ../os-specific/linux/fscryptctl { };
|
||||
|
|
@ -37242,7 +37247,10 @@ with pkgs;
|
|||
|
||||
otto-matic = callPackage ../games/otto-matic { };
|
||||
|
||||
openraPackages_2019 = import ../games/openra_2019 pkgs.__splicedPackages;
|
||||
openraPackages_2019 = import ../games/openra_2019 {
|
||||
inherit lib;
|
||||
pkgs = pkgs.__splicedPackages;
|
||||
};
|
||||
|
||||
openra_2019 = openraPackages_2019.engines.release;
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
let
|
||||
inherit (libretro) genesis-plus-gx mgba snes9x;
|
||||
inherit (libretro) genesis-plus-gx mgba snes9x twenty-fortyeight;
|
||||
in
|
||||
|
||||
let self = rec {
|
||||
|
|
@ -62,6 +62,8 @@ let self = rec {
|
|||
|
||||
libretro = callPackage ../applications/video/kodi/addons/libretro { };
|
||||
|
||||
libretro-2048 = callPackage ../applications/video/kodi/addons/libretro-2048 { inherit twenty-fortyeight; };
|
||||
|
||||
libretro-genplus = callPackage ../applications/video/kodi/addons/libretro-genplus { inherit genesis-plus-gx; };
|
||||
|
||||
libretro-mgba = callPackage ../applications/video/kodi/addons/libretro-mgba { inherit mgba; };
|
||||
|
|
@ -96,10 +98,12 @@ let self = rec {
|
|||
|
||||
osmc-skin = callPackage ../applications/video/kodi/addons/osmc-skin { };
|
||||
|
||||
vfs-sftp = callPackage ../applications/video/kodi/addons/vfs-sftp { };
|
||||
|
||||
vfs-libarchive = callPackage ../applications/video/kodi/addons/vfs-libarchive { };
|
||||
|
||||
vfs-rar = callPackage ../applications/video/kodi/addons/vfs-rar { };
|
||||
|
||||
vfs-sftp = callPackage ../applications/video/kodi/addons/vfs-sftp { };
|
||||
|
||||
visualization-fishbmc = callPackage ../applications/video/kodi/addons/visualization-fishbmc { };
|
||||
|
||||
visualization-goom = callPackage ../applications/video/kodi/addons/visualization-goom { };
|
||||
|
|
|
|||
|
|
@ -7594,6 +7594,8 @@ self: super: with self; {
|
|||
|
||||
phonenumbers = callPackage ../development/python-modules/phonenumbers { };
|
||||
|
||||
pkgutil-resolve-name = callPackage ../development/python-modules/pkgutil-resolve-name { };
|
||||
|
||||
micloud = callPackage ../development/python-modules/micloud { };
|
||||
|
||||
msgraph-core = callPackage ../development/python-modules/msgraph-core { };
|
||||
|
|
|
|||
|
|
@ -154,8 +154,8 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea
|
|||
|
||||
maui-core = libsForQt5.callPackage ../development/libraries/maui-core { };
|
||||
|
||||
mlt = callPackage ../development/libraries/mlt/qt-5.nix {
|
||||
stdenv = if pkgs.stdenv.isDarwin then pkgs.darwin.apple_sdk_11_0.stdenv else pkgs.stdenv;
|
||||
mlt = pkgs.mlt.override {
|
||||
enableQt = true;
|
||||
};
|
||||
|
||||
phonon = callPackage ../development/libraries/phonon { };
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue