mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
GitHub
commit
3a1e0e088b
84 changed files with 1740 additions and 1618 deletions
|
|
@ -26,6 +26,10 @@
|
|||
- `linux-kernel.DTB` is available as the `buildDTBs` parameter and passthru attribute on the kernel builders.
|
||||
- `linux-kernel.{autoModules,preferBuiltin,extraConfig}` were already available as kernel builder parameters.
|
||||
|
||||
- The `img` argument of `vmTools` has been renamed to `kernelImage`, as it collided with the top-level `img` package.
|
||||
Additionally, the kernel module tree used inside the VM has been split out of the `kernel` argument into a new `kernelModules` argument (defaulting to `kernel`).
|
||||
Callers that overrode `kernel` with a module tree (e.g. from `pkgs.aggregateModules`) to make extra modules available must now pass it via `kernelModules` instead, keeping `kernel` pointing at a bootable kernel derivation.
|
||||
|
||||
- The ARMv5 Linux kernel build now uses a standard configuration and generates a standard compressed image instead of the deprecated legacy U‐Boot image format.
|
||||
`lib.systems.{examples,platforms}.{sheevaplug,pogoplug4}` have been unified into `lib.systems.examples.armv5tel-multiplatform`.
|
||||
Note that there is no official support for ARMv5 and it is not possible to build even a simple NixOS configuration out of the box.
|
||||
|
|
|
|||
|
|
@ -19808,6 +19808,11 @@
|
|||
github = "nigelgbanks";
|
||||
githubId = 487373;
|
||||
};
|
||||
nikhilmaddirala = {
|
||||
name = "Nikhil Maddirala";
|
||||
github = "nikhilmaddirala";
|
||||
githubId = 4138581;
|
||||
};
|
||||
nikitavoloboev = {
|
||||
email = "nikita.voloboev@gmail.com";
|
||||
github = "nikivdev";
|
||||
|
|
@ -27126,7 +27131,7 @@
|
|||
email = "taranarmo@gmail.com";
|
||||
github = "taranarmo";
|
||||
githubId = 11619234;
|
||||
name = "Sergey Volkov";
|
||||
name = "Sergei Volkov";
|
||||
};
|
||||
tarantoj = {
|
||||
email = "taranto.james@gmail.com";
|
||||
|
|
|
|||
|
|
@ -262,7 +262,8 @@ let
|
|||
"virtiofs"
|
||||
"zfs"
|
||||
];
|
||||
kernel = modulesTree;
|
||||
kernel = config.boot.kernelPackages.kernel;
|
||||
kernelModules = modulesTree;
|
||||
}).runInLinuxVM
|
||||
(
|
||||
pkgs.runCommand name
|
||||
|
|
|
|||
|
|
@ -250,7 +250,8 @@ let
|
|||
"virtiofs"
|
||||
"zfs"
|
||||
];
|
||||
kernel = modulesTree;
|
||||
kernel = config.boot.kernelPackages.kernel;
|
||||
kernelModules = modulesTree;
|
||||
}).runInLinuxVM
|
||||
(
|
||||
pkgs.runCommand name
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ let
|
|||
escapeShellArg
|
||||
filter
|
||||
flatten
|
||||
foldl'
|
||||
getName
|
||||
hasPrefix
|
||||
hasSuffix
|
||||
|
|
@ -31,13 +32,13 @@ let
|
|||
nameValuePair
|
||||
optionalString
|
||||
removePrefix
|
||||
removeSuffix
|
||||
replaceStrings
|
||||
splitString
|
||||
stringToCharacters
|
||||
types
|
||||
;
|
||||
|
||||
inherit (lib.strings) toJSON normalizePath escapeC;
|
||||
inherit (lib.strings) toJSON escapeC;
|
||||
in
|
||||
|
||||
let
|
||||
|
|
@ -98,26 +99,60 @@ let
|
|||
|| hasPrefix a'.mountPoint b'.mountPoint
|
||||
|| any (hasPrefix a'.mountPoint) b'.depends;
|
||||
|
||||
# Escape a path according to the systemd rules. FIXME: slow
|
||||
# Escape a path according to the systemd rules.
|
||||
# The rules are described in systemd.unit(5) as follows:
|
||||
# The escaping algorithm operates as follows: given a string, any "/" character is replaced by "-", and all other characters which are not ASCII alphanumerics, ":", "_" or "." are replaced by C-style "\x2d" escapes. In addition, "." is replaced with such a C-style escape when it would appear as the first character in the escaped string.
|
||||
# When the input qualifies as absolute file system path, this algorithm is extended slightly: the path to the root directory "/" is encoded as single dash "-". In addition, any leading, trailing or duplicate "/" characters are removed from the string before transformation. Example: /foo//bar/baz/ becomes "foo-bar-baz".
|
||||
escapeSystemdPath =
|
||||
s:
|
||||
let
|
||||
# These don't depend on the path being escaped, so build them once
|
||||
# rather than on every call.
|
||||
escapeChar = escapeC (stringToCharacters " !\"#$%&'()*+,;<=>?@[\\]^`{|}~-");
|
||||
escapeLeadingDot = escapeC [ "." ] ".";
|
||||
slashesToDashes = replaceStrings [ "/" ] [ "-" ];
|
||||
replacePrefix =
|
||||
p: r: s:
|
||||
(if (hasPrefix p s) then r + (removePrefix p s) else s);
|
||||
trim = s: removeSuffix "/" (removePrefix "/" s);
|
||||
normalizedPath = normalizePath s;
|
||||
(if hasPrefix p s then r + removePrefix p s else s);
|
||||
in
|
||||
replaceStrings [ "/" ] [ "-" ] (
|
||||
replacePrefix "." (escapeC [ "." ] ".") (
|
||||
escapeC (stringToCharacters " !\"#$%&'()*+,;<=>=@[\\]^`{|}~-") (
|
||||
if normalizedPath == "/" then normalizedPath else trim normalizedPath
|
||||
)
|
||||
)
|
||||
);
|
||||
s:
|
||||
let
|
||||
isAbsolute = hasPrefix "/" s;
|
||||
# path_simplify(): collapse duplicate slashes and drop "." components.
|
||||
rawComponents = filter (c: c != "" && c != ".") (splitString "/" s);
|
||||
# systemd accepts ".." only where it is redundant: a leading ".." in an
|
||||
# absolute path refers to the root's parent, i.e. the root itself, and is
|
||||
# dropped. Any other ".." cannot be resolved without the filesystem, so
|
||||
# the path is not normalized and systemd-escape errors on it.
|
||||
simplified =
|
||||
foldl'
|
||||
(
|
||||
acc: c:
|
||||
if c == ".." then
|
||||
# A leading ".." in an absolute path is the only redundant case.
|
||||
if isAbsolute && acc.components == [ ] then acc else acc // { normalized = false; }
|
||||
else
|
||||
acc // { components = acc.components ++ [ c ]; }
|
||||
)
|
||||
{
|
||||
components = [ ];
|
||||
normalized = true;
|
||||
}
|
||||
rawComponents;
|
||||
notNormalized = throw "escapeSystemdPath: ${s} is not a normalized path";
|
||||
simplifiedPath =
|
||||
if !simplified.normalized then
|
||||
notNormalized
|
||||
else if simplified.components != [ ] then
|
||||
concatStringsSep "/" simplified.components
|
||||
# The root directory, and - matching systemd-escape - the empty string.
|
||||
else if isAbsolute || s == "" then
|
||||
"/"
|
||||
# A relative path that reduces to nothing (e.g. "."), which has no
|
||||
# valid escaping.
|
||||
else
|
||||
notNormalized;
|
||||
in
|
||||
slashesToDashes (replacePrefix "." escapeLeadingDot (escapeChar simplifiedPath));
|
||||
|
||||
# Quotes an argument for use in Exec* service lines.
|
||||
# systemd accepts "-quoted strings with escape sequences, toJSON produces
|
||||
|
|
|
|||
|
|
@ -133,6 +133,7 @@ let
|
|||
"v2ray"
|
||||
"varnish"
|
||||
"wireguard"
|
||||
"xray"
|
||||
"zfs-siebenmann"
|
||||
"zfs"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -0,0 +1,86 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
options,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.services.prometheus.exporters.xray;
|
||||
inherit (lib)
|
||||
mkOption
|
||||
types
|
||||
concatStringsSep
|
||||
optionalString
|
||||
;
|
||||
in
|
||||
{
|
||||
port = 9550;
|
||||
|
||||
extraOpts = {
|
||||
xrayEndpoint = mkOption {
|
||||
type = types.str;
|
||||
default = "127.0.0.1:8080";
|
||||
description = ''
|
||||
Xray gRPC API endpoint.
|
||||
'';
|
||||
};
|
||||
|
||||
metricsPath = mkOption {
|
||||
type = types.str;
|
||||
default = "/scrape";
|
||||
description = ''
|
||||
Path under which to expose metrics.
|
||||
'';
|
||||
};
|
||||
|
||||
scrapeTimeout = mkOption {
|
||||
type = types.int;
|
||||
default = 5;
|
||||
description = ''
|
||||
Timeout in seconds for every individual scrape.
|
||||
'';
|
||||
};
|
||||
|
||||
logPath = mkOption {
|
||||
type = types.str;
|
||||
default = "/var/log/xray/access.log";
|
||||
description = ''
|
||||
Path to Xray access log file. Set to empty string to disable user metrics.
|
||||
'';
|
||||
};
|
||||
|
||||
logTimeWindow = mkOption {
|
||||
type = types.int;
|
||||
default = 5;
|
||||
description = ''
|
||||
Time window in minutes for user metrics.
|
||||
'';
|
||||
};
|
||||
|
||||
withUserMetrics = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Collect user metrics from the Xray access log.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
serviceOpts = {
|
||||
serviceConfig = {
|
||||
ExecStart = ''
|
||||
${pkgs.prometheus-xray-exporter}/bin/xray-exporter \
|
||||
--listen ${cfg.listenAddress}:${toString cfg.port} \
|
||||
--metrics-path ${cfg.metricsPath} \
|
||||
--xray-endpoint ${cfg.xrayEndpoint} \
|
||||
--scrape-timeout ${toString cfg.scrapeTimeout} \
|
||||
${optionalString (cfg.logPath != "") "--log-path ${cfg.logPath}"} \
|
||||
--log-time-window ${toString cfg.logTimeWindow} \
|
||||
${optionalString cfg.withUserMetrics "--with-user-metrics"} \
|
||||
${concatStringsSep " \\\n " cfg.extraFlags}
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -24,6 +24,9 @@ let
|
|||
rc-manager = if config.networking.resolvconf.enable then "resolvconf" else "unmanaged";
|
||||
};
|
||||
keyfile = {
|
||||
# NM's compiled-in default; made explicit so the tmpfiles rule below
|
||||
# can follow it when the user redirects the keyfile store elsewhere.
|
||||
path = "/etc/NetworkManager/system-connections";
|
||||
unmanaged-devices = if cfg.unmanaged == [ ] then null else lib.concatStringsSep ";" cfg.unmanaged;
|
||||
};
|
||||
logging = {
|
||||
|
|
@ -601,13 +604,27 @@ in
|
|||
|
||||
systemd.packages = packages;
|
||||
|
||||
systemd.tmpfiles.rules = [
|
||||
"d /etc/NetworkManager/system-connections 0700 root root -"
|
||||
"d /var/lib/misc 0755 root root -" # for dnsmasq.leases
|
||||
systemd.tmpfiles.settings.networkmanager = {
|
||||
${configAttrs.keyfile.path}.d = {
|
||||
mode = "0700";
|
||||
user = "root";
|
||||
group = "root";
|
||||
};
|
||||
# for dnsmasq.leases
|
||||
"/var/lib/misc".d = {
|
||||
mode = "0755";
|
||||
user = "root";
|
||||
group = "root";
|
||||
};
|
||||
# ppp isn't able to mkdir that directory at runtime
|
||||
"d /run/pppd/lock 0700 root root -"
|
||||
]
|
||||
++ pluginTmpfilesRules;
|
||||
"/run/pppd/lock".d = {
|
||||
mode = "0700";
|
||||
user = "root";
|
||||
group = "root";
|
||||
};
|
||||
};
|
||||
|
||||
systemd.tmpfiles.rules = pluginTmpfilesRules;
|
||||
|
||||
systemd.services.NetworkManager = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
|
|
|||
|
|
@ -36,6 +36,19 @@ in
|
|||
assert !(builtins.tryEval (utils.escapeSystemdExecArgs [ null ])).success;
|
||||
assert !(builtins.tryEval (utils.escapeSystemdExecArgs [ false ])).success;
|
||||
assert !(builtins.tryEval (utils.escapeSystemdExecArgs [ (_: _) ])).success;
|
||||
# escapeSystemdPath simplifies the path like systemd-escape --path does:
|
||||
# "." components are dropped and duplicate/leading/trailing slashes removed.
|
||||
assert utils.escapeSystemdPath "/mnt/./foo" == "mnt-foo";
|
||||
assert utils.escapeSystemdPath "/foo//bar/baz/" == "foo-bar-baz";
|
||||
assert utils.escapeSystemdPath "/" == "-";
|
||||
assert utils.escapeSystemdPath "" == "-";
|
||||
assert utils.escapeSystemdPath "/.hidden/x" == "\\x2ehidden-x";
|
||||
assert utils.escapeSystemdPath "/foo?bar" == "foo\\x3fbar";
|
||||
# A leading ".." in an absolute path is the root's parent, i.e. the root.
|
||||
assert utils.escapeSystemdPath "/../foo" == "foo";
|
||||
# Non-normalized paths can't be escaped, matching systemd-escape.
|
||||
assert !(builtins.tryEval (utils.escapeSystemdPath "/mnt/../foo")).success;
|
||||
assert !(builtins.tryEval (utils.escapeSystemdPath ".")).success;
|
||||
{
|
||||
description = "Echo to the journal";
|
||||
serviceConfig.Type = "oneshot";
|
||||
|
|
|
|||
|
|
@ -1014,6 +1014,13 @@ assertNoAdditions {
|
|||
|
||||
copilot-cmp = super.copilot-cmp.overrideAttrs {
|
||||
dependencies = [ self.copilot-lua ];
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-deprecated-function-call.patch";
|
||||
url = "https://github.com/zbirenbaum/copilot-cmp/commit/06430ebf99834ebc5d86c63816e409f4cb51fe79.patch";
|
||||
sha256 = "sha256-YOJPFC+qbyURFU58tAiAqbamQLmi7ovnJGkOeOTUPH0=";
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
copilot-lualine = super.copilot-lualine.overrideAttrs {
|
||||
|
|
|
|||
|
|
@ -1174,8 +1174,8 @@ let
|
|||
mktplcRef = {
|
||||
publisher = "DanielSanMedium";
|
||||
name = "dscodegpt";
|
||||
version = "3.20.14";
|
||||
hash = "sha256-jD+e+s4iaX1p+KR3neJUwvPm/DQiX1gSTt595ryw8xE=";
|
||||
version = "3.22.1";
|
||||
hash = "sha256-ln9DcfjW0QO7V6hF+QNqy+V13hbjWwhsisrgZPrk1R4=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/DanielSanMedium.dscodegpt/changelog";
|
||||
|
|
@ -1226,8 +1226,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "databricks";
|
||||
publisher = "databricks";
|
||||
version = "2.10.8";
|
||||
hash = "sha256-pBfD6HwPP9CybROC2W27CAq2RSAgRJ3ZrxvUOBzRyC8=";
|
||||
version = "2.11.0";
|
||||
hash = "sha256-9izhQvZmfUVeKS0H89XXkN1bNP4+AZyUuetfD0kRJ/c=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/databricks.databricks/changelog";
|
||||
|
|
@ -1760,8 +1760,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "foam-vscode";
|
||||
publisher = "foam";
|
||||
version = "0.42.0";
|
||||
hash = "sha256-mk4ZgaBxLFPvrm3EU+hdidorhdWp7EGfRP0e/kARd1A=";
|
||||
version = "0.43.1";
|
||||
hash = "sha256-rZjdBzqXpSG4aCMjRCmIrWtQdmmh7vEJQLIuH65Ewf0=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/foam.foam-vscode/changelog";
|
||||
|
|
@ -4534,8 +4534,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "svelte-vscode";
|
||||
publisher = "svelte";
|
||||
version = "110.1.0";
|
||||
hash = "sha256-i6FObecuMylaCZYl/KLMscE07JIzQz+NSkfRdxtSfgg=";
|
||||
version = "110.2.0";
|
||||
hash = "sha256-5WCaYhWA6soB2AALFY/5Z7Y8IBAj5/4XSR/I4jHhth8=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://github.com/sveltejs/language-tools/releases";
|
||||
|
|
|
|||
|
|
@ -128,13 +128,13 @@
|
|||
"vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8="
|
||||
},
|
||||
"buildkite_buildkite": {
|
||||
"hash": "sha256-R9jG7ww2iEU1qif6NeV0lpgG6Nv5rsh5h+IVhSscuKI=",
|
||||
"hash": "sha256-MoucQgeikKMh4P8nRWIJ5SkLFGeVfDutsSBUSowz6VM=",
|
||||
"homepage": "https://registry.terraform.io/providers/buildkite/buildkite",
|
||||
"owner": "buildkite",
|
||||
"repo": "terraform-provider-buildkite",
|
||||
"rev": "v1.33.0",
|
||||
"rev": "v1.34.0",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-n6+8mufcH3rNe4yLkc+7NkV7UwNwyIVzDFStSC7iqE4="
|
||||
"vendorHash": "sha256-uYyj6GSV5bWEfRTOODMuReEHe9wnF4cVoHM9rBMpgmM="
|
||||
},
|
||||
"camptocamp_pass": {
|
||||
"hash": "sha256-GQ2g7VyK+eeBqW3LMR4U0gMYsvQnG3y+KEKKkvnmfsk=",
|
||||
|
|
@ -409,13 +409,13 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"fastly_fastly": {
|
||||
"hash": "sha256-dWT0E6eugOD79Cn51P0KQbwwY1seSL1NvZVzjWxtGNs=",
|
||||
"hash": "sha256-S6VIwqwTPr276TTqgEFTxhE5c97lCd8/5dJnDGori4s=",
|
||||
"homepage": "https://registry.terraform.io/providers/fastly/fastly",
|
||||
"owner": "fastly",
|
||||
"repo": "terraform-provider-fastly",
|
||||
"rev": "v9.2.0",
|
||||
"rev": "v9.2.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-+5eeZdU5iS/StHuo/7KRkdM+DW4IDvJ52BDKNZI7lAc="
|
||||
"vendorHash": "sha256-8QF9gOuvuZwAoFWePjti4h6VzmA+TGiFaC/ShuEAZqA="
|
||||
},
|
||||
"flexibleenginecloud_flexibleengine": {
|
||||
"hash": "sha256-yEZ9JiUSqFFbfqzOOD59ZBv4yFCeUBBKlp6aiUqDqiM=",
|
||||
|
|
|
|||
|
|
@ -30,7 +30,22 @@
|
|||
# ----------------------------
|
||||
customQemu ? null,
|
||||
kernel ? linux,
|
||||
img ? kernel.target,
|
||||
# Name of the kernel image file inside the `kernel` output.
|
||||
kernelImage ?
|
||||
kernel.target or (throw ''
|
||||
vmTools: the `kernel` argument (${kernel.name or "<unknown>"}) has no
|
||||
`target` attribute, so the kernel image filename cannot be determined.
|
||||
|
||||
If you are passing a module tree (e.g. from `pkgs.aggregateModules`) to
|
||||
make extra modules available, pass it via `kernelModules` instead and
|
||||
keep `kernel` pointing at a real kernel derivation. Alternatively, pass
|
||||
`kernelImage` explicitly with the path of the bootable image relative
|
||||
to the `kernel` derivation output (e.g. "bzImage" or "Image").
|
||||
''),
|
||||
# Package providing `lib/modules` for the VM initrd. Override this (e.g.
|
||||
# with `pkgs.aggregateModules [ ... ]`) to make extra kernel modules
|
||||
# available inside the VM without replacing the boot kernel.
|
||||
kernelModules ? kernel,
|
||||
storeDir ? builtins.storeDir,
|
||||
rootModules ? [
|
||||
"virtio_pci"
|
||||
|
|
@ -50,9 +65,9 @@ let
|
|||
qemu = buildPackages.qemu_kvm;
|
||||
|
||||
modulesClosure = makeModulesClosure {
|
||||
kernel = lib.getOutput "modules" kernel;
|
||||
kernel = lib.getOutput "modules" kernelModules;
|
||||
inherit rootModules;
|
||||
firmware = kernel;
|
||||
firmware = kernelModules;
|
||||
};
|
||||
|
||||
hd = "vda"; # either "sda" or "vda"
|
||||
|
|
@ -220,7 +235,7 @@ let
|
|||
fi
|
||||
|
||||
# Set up automatic kernel module loading.
|
||||
export MODULE_DIR=${lib.getOutput "modules" kernel}/lib/modules/
|
||||
export MODULE_DIR=${lib.getOutput "modules" kernelModules}/lib/modules/
|
||||
${coreutils}/bin/cat <<EOF > /run/modprobe
|
||||
#! ${bash}/bin/sh
|
||||
export MODULE_DIR=$MODULE_DIR
|
||||
|
|
@ -260,7 +275,7 @@ let
|
|||
-chardev socket,id=xchg,path=virtio-xchg.sock \
|
||||
-device vhost-user-fs-pci,chardev=xchg,tag=xchg \
|
||||
''${diskImage:+-drive file=$diskImage,if=virtio,cache=unsafe,werror=report} \
|
||||
-kernel ${kernel}/${img} \
|
||||
-kernel ${kernel}/${kernelImage} \
|
||||
-initrd ${initrd}/initrd \
|
||||
-append "console=${qemu-common.qemuSerialDevice} panic=1 command=${stage2Init} mountDisk=$mountDisk loglevel=4" \
|
||||
$QEMU_OPTS
|
||||
|
|
@ -417,7 +432,7 @@ let
|
|||
name = "extract-file";
|
||||
buildInputs = [ util-linux ];
|
||||
buildCommand = ''
|
||||
ln -s ${kernel}/lib /lib
|
||||
ln -s ${kernelModules}/lib /lib
|
||||
${kmod}/bin/modprobe loop
|
||||
${kmod}/bin/modprobe ext4
|
||||
${kmod}/bin/modprobe hfs
|
||||
|
|
@ -449,7 +464,7 @@ let
|
|||
mtdutils
|
||||
];
|
||||
buildCommand = ''
|
||||
ln -s ${kernel}/lib /lib
|
||||
ln -s ${kernelModules}/lib /lib
|
||||
${kmod}/bin/modprobe mtd
|
||||
${kmod}/bin/modprobe mtdram total_size=131072
|
||||
${kmod}/bin/modprobe mtdchar
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "aliyun-cli";
|
||||
version = "3.3.18";
|
||||
version = "3.3.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aliyun";
|
||||
repo = "aliyun-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-tTwVcvBk6SMDbDM3dPZZZdkbzlOAwg+K6gbeUc6XEqw=";
|
||||
hash = "sha256-0AsrdD9ans1CmyJVK9tcAKGLeptpxdNAtOUuSv4i4zU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ansilove";
|
||||
version = "4.2.1";
|
||||
version = "4.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ansilove";
|
||||
repo = "ansilove";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-13v2NLVJt11muwocBiQYz/rxQkte/W6LXwB/H/E9Nvk=";
|
||||
hash = "sha256-U8SKh+GBwtuJbHeB7x430YmbOdS38CIBsNXCWvs8XY8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "aocl-utils";
|
||||
version = "5.3.0";
|
||||
version = "5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "amd";
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
let
|
||||
pname = "apidog";
|
||||
version = "2.8.32";
|
||||
version = "2.8.33";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://file-assets.apidog.com/download/${version}/Apidog-${version}.AppImage";
|
||||
hash = "sha256-7MaDC9VsiC+iHe83Vd4vDJQPoDLwUFmCu3R1OwVcTjM=";
|
||||
hash = "sha256-RimlzPkIAFmsTgtSBocZy4g2S3eCvGq/r993u0Gjj/4=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract {
|
||||
|
|
|
|||
|
|
@ -23,13 +23,13 @@
|
|||
}:
|
||||
gcc15Stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "aquamarine";
|
||||
version = "0.12.0";
|
||||
version = "0.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "aquamarine";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-TtAhxedbRAl1u6OyT+4eRxZ417G2NMJNoqEbIhjvWo0=";
|
||||
hash = "sha256-cUQENbJn0PHQUttXame5+PbGGew+BckHZFTfpb8XGI8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,19 +9,19 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "atlas";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ariga";
|
||||
repo = "atlas";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-hTRD3QndYlW564UJMhjj7EP+Otlgkt59nGkd5aXbOSU=";
|
||||
hash = "sha256-2wmmvNezi/AJ86r5m0rZOskqxfaT49870Pe615QycHg=";
|
||||
};
|
||||
|
||||
modRoot = "cmd/atlas";
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-bPw1Gq+g69W09nU8vbNXwLcLxG4jcQOx9il7X2xZZSg=";
|
||||
vendorHash = "sha256-9yg8VkRtyaMQjCAAOHIG4A9QSV1VOFOLBK9cTrE83a4=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "camunda-modeler";
|
||||
version = "5.46.1";
|
||||
version = "5.48.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz";
|
||||
hash = "sha256-uB+EAZgpll81RifNjKp9AkPLupbDLYHG+zFj0atsXRA=";
|
||||
hash = "sha256-92KWs2mLcKMhM/v3GRkX5CFcRrtPA1viczZVFkAdVLQ=";
|
||||
};
|
||||
sourceRoot = "camunda-modeler-${version}-linux-x64";
|
||||
|
||||
|
|
|
|||
|
|
@ -35,14 +35,14 @@ let
|
|||
in
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "checkov";
|
||||
version = "3.2.533";
|
||||
version = "3.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = "checkov";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-WuHmMqtDcivwsZpvZB5wQuKWm5BoDSX4LGJEW7oKJrA=";
|
||||
hash = "sha256-1hm3ZNvrO+U3PWb5gBSwKSXgOHQLU4avncSZOH/ijCM=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "cliamp";
|
||||
version = "1.56.0";
|
||||
version = "1.57.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bjarneo";
|
||||
repo = "cliamp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-07hKE13eX6IWo77mMbgvPgJZjymfsGn9xMN7XIVIB1g=";
|
||||
hash = "sha256-tfPtc+YgtmuzdWod6EM0MJSoYLxLnQskuNRQbLRp4g8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-A2Ygc1a9e2flZzaNAEXvr8Ui1cE89TxBfUNALmDzIo0=";
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildNpmPackage {
|
||||
pname = "coc-rust-analyzer";
|
||||
version = "0-unstable-2026-06-01";
|
||||
version = "0-unstable-2026-06-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fannheyward";
|
||||
repo = "coc-rust-analyzer";
|
||||
rev = "c21b850ab4f2c9fc80840450ece29f9abc4e2325";
|
||||
hash = "sha256-2ntLQ2qBqZZ9vPJHQR0JzqR8wUVRCLRGTEu3Q4Is2Jo=";
|
||||
rev = "cadaeed1edf1bc289c616d21f5818cf835ae45b2";
|
||||
hash = "sha256-eo+3K40JhktADVN2SWJg8AQAXBndx6u2L56ZXGbhqdE=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-4AdpOBXLqWzFQrI7MyWdEqkiE8BuxOV+SmHcFMKlkBk=";
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "crowdin-cli";
|
||||
version = "4.14.2";
|
||||
version = "4.14.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/crowdin/crowdin-cli/releases/download/${finalAttrs.version}/crowdin-cli.zip";
|
||||
hash = "sha256-XfOBmMkbi3XrjRBfDrJ86y1+BuJIcvhJ1tULQDsGCqE=";
|
||||
hash = "sha256-Jtj1WcKkJF0toa2/xK/cR0r4+lzzMFkoQnG6jCFSAM4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "olm";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fosrl";
|
||||
repo = "olm";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-OnHOfP3dCduTe0xnZD77YZcI3GOKxGsen5i7dOiCjy8=";
|
||||
hash = "sha256-USwTaQd8Aqq1Azsp4fXz3xSoxiqzYRSnUoBiqrepOXY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+KQpYGoyNI2SnEjj23GM0FqZFX6lHx7oNw9qdkkgcPU=";
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
polkit,
|
||||
nss,
|
||||
pam,
|
||||
systemd,
|
||||
systemdLibs,
|
||||
libfprint,
|
||||
python3,
|
||||
}:
|
||||
|
|
@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
polkit
|
||||
nss
|
||||
pam
|
||||
systemd
|
||||
systemdLibs
|
||||
libfprint
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,19 +5,20 @@
|
|||
nodejs,
|
||||
faketty,
|
||||
openssl,
|
||||
prisma_6,
|
||||
prisma-engines_6,
|
||||
prisma_7,
|
||||
prisma-engines_7,
|
||||
runtimeShell,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "ghostfolio";
|
||||
version = "2.254.0";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ghostfolio";
|
||||
repo = "ghostfolio";
|
||||
tag = version;
|
||||
hash = "sha256-bcUr0tzq/X2pOmg7ZYj46+TQO9NBKmevm+C6PbyV/yc=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-74CqCDyLrn3//FiTfo6xR5jLyo4jU+daBF9ES/uQE3E=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
|
|
@ -27,10 +28,21 @@ buildNpmPackage rec {
|
|||
'';
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-Wa15OSsd2IXTO1OjZoiFsSF0UhrzvS6fsymvxyPm0s8=";
|
||||
npmDepsHash = "sha256-klWmB6LYf6h1WPi3AasDrdVdaPCyb5ePWuO9zqMcXys=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace replace.build.mjs \
|
||||
--replace-fail 'new Date()' "new Date(''$(<SOURCE_DATE_EPOCH))"
|
||||
# SyntaxError: Named export 'PrismaClient' not found
|
||||
substituteInPlace prisma/seed.mts \
|
||||
--replace-fail "import { PrismaClient } from '@prisma/client';" \
|
||||
"import prismaClientPkg from '@prisma/client'; const { PrismaClient } = prismaClientPkg;"
|
||||
# storybook output is not used, skip it
|
||||
substituteInPlace package.json --replace-fail "nx run ui:build-storybook" "true"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
prisma_6
|
||||
prisma_7
|
||||
faketty
|
||||
];
|
||||
|
||||
|
|
@ -42,14 +54,10 @@ buildNpmPackage rec {
|
|||
|
||||
prisma generate
|
||||
|
||||
substituteInPlace replace.build.mjs \
|
||||
--replace-fail 'new Date()' "new Date(''$(<SOURCE_DATE_EPOCH))"
|
||||
|
||||
# Workaround for https://github.com/nrwl/nx/issues/22445
|
||||
faketty npm run build:production
|
||||
|
||||
cp -r node_modules dist/apps/api/
|
||||
cp -r prisma dist/apps/api/
|
||||
npm prune --omit=dev --no-save
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
|
@ -57,33 +65,66 @@ buildNpmPackage rec {
|
|||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p "$out/lib/node_modules/ghostfolio"
|
||||
cp -r dist/apps/{api,client} "$out/lib/node_modules/ghostfolio/"
|
||||
cp -r {node_modules,prisma} dist/apps/api/
|
||||
|
||||
mkdir -p $out/lib/ghostfolio
|
||||
cp -r dist/apps/{api,client} "$out/lib/ghostfolio/"
|
||||
|
||||
substituteInPlace .config/prisma.ts \
|
||||
--replace-fail "__dirname, '..', 'prisma'" "'$out/lib/ghostfolio/api/prisma'" \
|
||||
--replace-fail "node " "${lib.getExe nodejs} "
|
||||
install -Dm444 .config/prisma.ts "$out/lib/ghostfolio/api/prisma.config.ts"
|
||||
|
||||
mkdir "$out/bin"
|
||||
makeWrapper ${lib.getExe nodejs} "$out/bin/ghostfolio" \
|
||||
--add-flags "$out/lib/node_modules/ghostfolio/api/main" "''${user_args[@]}" \
|
||||
--add-flags "$out/lib/ghostfolio/api/main" "''${user_args[@]}" \
|
||||
--prefix PATH : ${lib.makeBinPath [ openssl ]} \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl ]} \
|
||||
${lib.concatStringsSep " " (
|
||||
lib.mapAttrsToList (name: value: "--set ${name} ${lib.escapeShellArg value}") {
|
||||
PRISMA_SCHEMA_ENGINE_BINARY = lib.getExe' prisma-engines_6 "schema-engine";
|
||||
PRISMA_QUERY_ENGINE_BINARY = lib.getExe' prisma-engines_6 "query-engine";
|
||||
PRISMA_QUERY_ENGINE_LIBRARY = "${prisma-engines_6}/lib/libquery_engine.node";
|
||||
PRISMA_INTROSPECTION_ENGINE_BINARY = lib.getExe' prisma-engines_6 "introspection-engine";
|
||||
PRISMA_FMT_BINARY = lib.getExe' prisma-engines_6 "prisma-fmt";
|
||||
PRISMA_SCHEMA_ENGINE_BINARY = lib.getExe' prisma-engines_7 "schema-engine";
|
||||
PRISMA_QUERY_ENGINE_BINARY = lib.getExe' prisma-engines_7 "query-engine";
|
||||
PRISMA_QUERY_ENGINE_LIBRARY = "${prisma-engines_7}/lib/libquery_engine.node";
|
||||
PRISMA_INTROSPECTION_ENGINE_BINARY = lib.getExe' prisma-engines_7 "introspection-engine";
|
||||
PRISMA_FMT_BINARY = lib.getExe' prisma-engines_7 "prisma-fmt";
|
||||
}
|
||||
)}
|
||||
|
||||
cat > $out/bin/ghostfolio-migrate <<EOF
|
||||
#!${runtimeShell}
|
||||
set -euo pipefail
|
||||
${lib.getExe prisma_7} migrate deploy --config "$out/lib/ghostfolio/api/prisma.config.ts"
|
||||
${lib.getExe prisma_7} db seed --config "$out/lib/ghostfolio/api/prisma.config.ts"
|
||||
EOF
|
||||
chmod +x $out/bin/ghostfolio-migrate
|
||||
|
||||
# For compatibility
|
||||
mkdir -p $out/lib/node_modules
|
||||
ln -sr $out/lib/ghostfolio $out/lib/node_modules/ghostfolio
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# Remove dev deps not needed at runtime
|
||||
preFixup = ''
|
||||
find $out/lib -name "*.py" -delete
|
||||
apiModules="$out/lib/ghostfolio/api/node_modules"
|
||||
rm -rf \
|
||||
"$out/lib/ghostfolio/client/development" \
|
||||
"$apiModules"/sass-embedded* \
|
||||
"$apiModules"/{@,}esbuild \
|
||||
"$apiModules"/{@,}rollup \
|
||||
"$apiModules"/@rolldown \
|
||||
"$apiModules"/@parcel/watcher-* \
|
||||
"$apiModules"/typescript \
|
||||
"$apiModules"/.{bin,cache} \
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Open Source Wealth Management Software";
|
||||
homepage = "https://github.com/ghostfolio/ghostfolio";
|
||||
changelog = "https://github.com/ghostfolio/ghostfolio/blob/${src.rev}/CHANGELOG.md";
|
||||
changelog = "https://github.com/ghostfolio/ghostfolio/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [ moraxyc ];
|
||||
mainProgram = "ghostfolio";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -179,11 +179,11 @@ let
|
|||
|
||||
linux = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "149.0.7827.102";
|
||||
version = "149.0.7827.114";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
|
||||
hash = "sha256-ETp7EURoN0p45cNnwcp6/aoPyKHSf+WPyUvKh+R7bp4=";
|
||||
hash = "sha256-GVvehY+e5thM3nHYMQd/uI8HTnjvL/w8UeRpUWouzlA=";
|
||||
};
|
||||
|
||||
# With strictDeps on, some shebangs were not being patched correctly
|
||||
|
|
@ -289,11 +289,11 @@ let
|
|||
|
||||
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "149.0.7827.103";
|
||||
version = "149.0.7827.115";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.google.com/release2/chrome/kfbyzxups2p7z7m5ltrjh7htrm_149.0.7827.103/GoogleChrome-149.0.7827.103.dmg";
|
||||
hash = "sha256-N3U6RkBaPzVHl5JMkq+m17DJg3+XiwyS2AHinOs0sjo=";
|
||||
url = "http://dl.google.com/release2/chrome/ny2unjynyv52nhojnzjueghuma_149.0.7827.115/GoogleChrome-149.0.7827.115.dmg";
|
||||
hash = "sha256-q1jMxveB5FFA+wA5a5mnSPWoQFkNHQ20x51R8A/yUsk=";
|
||||
};
|
||||
|
||||
dontPatch = true;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"branch": "v0.55.3-b",
|
||||
"commit_hash": "fe5fe79a29ac3adaf3e75560b2f4b7a6d58b31c9",
|
||||
"branch": "v0.55.4-b",
|
||||
"commit_hash": "a0136d8c04687bb36eb8a28eb9d1ff92aea99704",
|
||||
"commit_message": "[gha] Nix: update inputs",
|
||||
"date": "2026-06-07",
|
||||
"tag": "v0.55.3"
|
||||
"date": "2026-06-11",
|
||||
"tag": "v0.55.4"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -83,14 +83,14 @@ let
|
|||
in
|
||||
customStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprland" + optionalString debug "-debug";
|
||||
version = "0.55.3";
|
||||
version = "0.55.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "hyprland";
|
||||
fetchSubmodules = true;
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-g3kzroSoipkMXv5wJWVYQDL+gI1qRJ7UhOrUzyTk9Zs=";
|
||||
hash = "sha256-IuT0HnOr/0rAw+GXr+OwWx89FjA4Og1FqP7vywEwRJM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "hyprspace";
|
||||
version = "0.14.0";
|
||||
version = "0.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprspace";
|
||||
repo = "hyprspace";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-d8sCs81Va/RQL8k+6GIMp9z0C0AmWEhvZSijRKyVBC0=";
|
||||
hash = "sha256-BtotGhctQKfP68VgG6+NsrDdEOmN/wiAzvBqloHU5BQ=";
|
||||
};
|
||||
|
||||
env.CGO_ENABLED = "0";
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
flutter341.buildFlutterApplication (finalAttrs: {
|
||||
pname = "interstellar";
|
||||
version = "0.11.2";
|
||||
version = "0.11.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "interstellar-app";
|
||||
repo = "interstellar";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-WprvuIN7yS5yLR4eUF/M9yG25ZU1Sf1I1myujclF4oM=";
|
||||
hash = "sha256-76YMlcB0Go4EYFb4z7UEOUF+UkVsjxg04Ak06sIpkeQ=";
|
||||
};
|
||||
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "mongodb-atlas-cli";
|
||||
version = "1.55.0";
|
||||
version = "1.56.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mongodb";
|
||||
repo = "mongodb-atlas-cli";
|
||||
tag = "atlascli/v${finalAttrs.version}";
|
||||
hash = "sha256-VLX+EpXFo0ow6lvCiCFnobwtMh1DFmYcAA9YK7eOxro=";
|
||||
hash = "sha256-H3swDfgKS/m0mfVe6LH2k+EKLdpSmF86w1jcb/d2tcs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-SaY2ypCTlt4430TGcXuL97wHLm+2OnLsCZHJZDIi8F4=";
|
||||
vendorHash = "sha256-xBnwNBmJZNb19FM947iQubUPZpIwA2ZhuTBNXF6ki5U=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
gettext,
|
||||
libuv,
|
||||
|
|
@ -106,7 +105,7 @@ stdenv.mkDerivation (
|
|||
in
|
||||
{
|
||||
pname = "neovim-unwrapped";
|
||||
version = "0.12.2";
|
||||
version = "0.12.3";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
|
|
@ -114,7 +113,7 @@ stdenv.mkDerivation (
|
|||
owner = "neovim";
|
||||
repo = "neovim";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-V+jZiNv0SvG/GOOUPzmBkOQGrnrN3UW2BY2n9NxP2Eg=";
|
||||
hash = "sha256-JjDU3GZf+wvsMyDjIfu1btTUBkOlpp6E1HFLqBLR9po=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
@ -124,11 +123,6 @@ stdenv.mkDerivation (
|
|||
# necessary so that nix can handle `UpdateRemotePlugins` for the plugins
|
||||
# it installs. See https://github.com/neovim/neovim/issues/9413.
|
||||
./system_rplugin_manifest.patch
|
||||
(fetchpatch {
|
||||
name = "CVE-2026-11487.patch";
|
||||
url = "https://github.com/neovim/neovim/commit/f83e0dcaf8cf18de94828341b0a1a61a86c75baf.patch";
|
||||
hash = "sha256-iWnq0ezbKYJqjvevVlcTJBvUc17ZvrhsanhtuKrh8zM=";
|
||||
})
|
||||
];
|
||||
|
||||
inherit lua;
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "netfoil";
|
||||
version = "0.3.1";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tinfoil-factory";
|
||||
repo = "netfoil";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-vUYa5cxv8VyqF8QIWV+Gx3Ykp83A1+2Z5Xg8h5hPoHM=";
|
||||
hash = "sha256-HWAw3CxuVOinYhcJS5KjkscFURSamsiu4oLNU+z16zc=";
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "nu_scripts";
|
||||
version = "0-unstable-2026-05-31";
|
||||
version = "0-unstable-2026-06-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nushell";
|
||||
repo = "nu_scripts";
|
||||
rev = "3e869d0b5ad1fc76537226d0cc9cb1660f27bda6";
|
||||
hash = "sha256-C1/3ndIfVpxELsR2dojqwPylbOCdqYFh8+gIXSOrkvc=";
|
||||
rev = "ca79ff62bd3fe0d31cd50762dcb1c8a46883044e";
|
||||
hash = "sha256-pk29HELNbBfQZDoXeLotUUZlRbQx7k168Rcw1JUOnvU=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "oksh";
|
||||
version = "7.8";
|
||||
version = "7.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ibara";
|
||||
repo = "oksh";
|
||||
rev = "oksh-${version}";
|
||||
hash = "sha256-fgTwj1U/bySVkQReE799Z2gZ0/SEek08WSdpHUHCHhk=";
|
||||
hash = "sha256-7YgKRlu/5FGZivANa2z6RQp7qKFX44xFuqNV6nwbAXI=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
versionCheckHook,
|
||||
rolldown,
|
||||
installShellFiles,
|
||||
version ? "2026.6.1",
|
||||
version ? "2026.6.5",
|
||||
}:
|
||||
let
|
||||
pnpm = pnpm_11.override { nodejs-slim = nodejs-slim_22; };
|
||||
|
|
@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||
owner = "openclaw";
|
||||
repo = "openclaw";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-FjxiI7YHkt6fTzJD7G5A3/wsbcWgpO44IHMOwymDxpg=";
|
||||
hash = "sha256-hiYbIhE13XMFIeB0zmb6AHlfw8le6vpJgCqN81YWGsE=";
|
||||
};
|
||||
|
||||
pnpmDepsHash = "sha256-7RQJAVWqhauG8JrF8AD1VU1IJRM+SH05aHAfmFaXraU=";
|
||||
|
|
@ -134,6 +134,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||
maintainers = with lib.maintainers; [
|
||||
chrisportela
|
||||
mkg20001
|
||||
nikhilmaddirala
|
||||
];
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
knownVulnerabilities = [
|
||||
|
|
|
|||
|
|
@ -5,26 +5,28 @@
|
|||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
openocd.overrideAttrs (old: {
|
||||
pname = "openocd-adi";
|
||||
version = "0.12.0-1.3.1-1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "analogdevicesinc";
|
||||
repo = "openocd";
|
||||
tag = "0.12.0-1.3.1-1";
|
||||
hash = "sha256-e25mAxUmbF/hZC+aWRMt9HdwKY0FClNrZXwP3888Z9A=";
|
||||
# openocd disables the vendored libraries that use submodules and replaces them with nix versions.
|
||||
# this works out as one of the submodule sources seems to be flakey.
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
nativeBuildInputs = old.nativeBuildInputs ++ [
|
||||
autoreconfHook
|
||||
];
|
||||
meta = openocd.meta // {
|
||||
description = "ADI fork of OpenOCD";
|
||||
homepage = "https://github.com/analogdevicesinc/openocd";
|
||||
maintainers = with lib.maintainers; [
|
||||
aiyion
|
||||
openocd.overrideAttrs (
|
||||
finalAttrs: old: {
|
||||
pname = "openocd-adi";
|
||||
version = "0.12.0-1.3.1-2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "analogdevicesinc";
|
||||
repo = "openocd";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-MqpVZN6+kcu1bspwcCDOnydQ5tC+MtO4D35KmQFRm1o=";
|
||||
# openocd disables the vendored libraries that use submodules and replaces them with nix versions.
|
||||
# this works out as one of the submodule sources seems to be flakey.
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
nativeBuildInputs = old.nativeBuildInputs ++ [
|
||||
autoreconfHook
|
||||
];
|
||||
};
|
||||
})
|
||||
meta = openocd.meta // {
|
||||
description = "ADI fork of OpenOCD";
|
||||
homepage = "https://github.com/analogdevicesinc/openocd";
|
||||
maintainers = with lib.maintainers; [
|
||||
aiyion
|
||||
];
|
||||
};
|
||||
}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -23,25 +23,25 @@
|
|||
# runs without an external linter, which leaves `jsPlugins` configs inert.
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "oxlint";
|
||||
version = "1.68.0";
|
||||
version = "1.69.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oxc-project";
|
||||
repo = "oxc";
|
||||
tag = "oxlint_v${finalAttrs.version}";
|
||||
hash = "sha256-/AXBMb+EEpA10omlpxG1jkCqMrhbB8AdEewyQrMJqTk=";
|
||||
hash = "sha256-jbPKyQ1A7jrHWRaG2a2fIqOhTrzBI3e6fQD/b9wRUQM=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-JHTbbVzXWyigk8NGqvBjVKUuR2p6+gpFRY1GWZEvEFk=";
|
||||
hash = "sha256-VgrHzUfRPARd90kcCGHzhxPDOJzKsh7nvyg6TxbV9RU=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-mYwkBQZ3ik3yGoPXc3BtLFhavmkj+QzZNMnYG3qyzyc=";
|
||||
hash = "sha256-UTJMkkdIhBZSbGyjBLACfwWI6jKNsdK5zk322EgvJf8=";
|
||||
};
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "patch2pr";
|
||||
version = "0.44.0";
|
||||
version = "0.45.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bluekeyes";
|
||||
repo = "patch2pr";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-VevSvxGjASwEib8Kx91dYIMI2QC+Zl/igSnHy2w/1y4=";
|
||||
hash = "sha256-zVEZSbFrxWVmDcoMM+/zgRqIH9kKmKK272xDogmEZSI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-mv3otcLQiUfrnNcrSe29kA2xpcuRgMMnD9VQ/84DQeM=";
|
||||
vendorHash = "sha256-zziijcAoS5juDFAFM1p+B2N22YWt7dkjNktt5S6cj6k=";
|
||||
|
||||
ldflags = [
|
||||
"-X main.version=${finalAttrs.version}"
|
||||
|
|
|
|||
|
|
@ -14,16 +14,16 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage.override { inherit stdenv; } (finalAttrs: {
|
||||
pname = "pgdog";
|
||||
version = "0.1.43";
|
||||
version = "0.1.44";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pgdogdev";
|
||||
repo = "pgdog";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-0ilN89DChNOFcwsOZK7ZZPsbMCMH3NQlZlSvjT6F4oY=";
|
||||
hash = "sha256-t45oD6b3S7oVZP/of8x2uxumjKxilNYLsqMtv2bTZoA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-wh63mNo2dX4ngLW+dEu9UtWVuqNSBNrtYvK2ejHxNKg=";
|
||||
cargoHash = "sha256-VFxogmT4gLHld+MCdYwwEwU9XiIxS6YRuMzif6oAuyE=";
|
||||
|
||||
# Hardcoded paths for C compiler and linker
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
}:
|
||||
buildNpmPackage rec {
|
||||
pname = "playwright-mcp";
|
||||
version = "0.0.74";
|
||||
version = "0.0.76";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Microsoft";
|
||||
repo = "playwright-mcp";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-dGYZTBPNszVtxvYWTIF77dDm9elGvcLwbn+yG/lfR68=";
|
||||
hash = "sha256-0ED8MlH9ugFP+suBaKJ1WubfGq/agcMjys92RXql88s=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-IgoflKLyY4plURB++N4YSzqfG4Y7aGSUvND+WiHYiQo=";
|
||||
npmDepsHash = "sha256-cH37gqlEhJQnhtCzlQEqIHweFufbjft22z1rHXLJ/u8=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
|
|
|||
28
pkgs/by-name/pr/prometheus-xray-exporter/package.nix
Normal file
28
pkgs/by-name/pr/prometheus-xray-exporter/package.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{
|
||||
buildGoModule,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
__structuredAttrs = true;
|
||||
pname = "prometheus-xray-exporter";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "podocarp";
|
||||
repo = "xray-exporter";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Ocex/D1OYOlQ2BZ835qrlXaEuMdXaglIPpVzfo0OZ5g=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-yRxy44SnEFa7yOJyiOgFTk+Z4s5HOJ4cMjcf8VTTfQk=";
|
||||
|
||||
meta = {
|
||||
description = "Prometheus exporter for Xray-core metrics";
|
||||
mainProgram = "xray-exporter";
|
||||
homepage = "https://github.com/podocarp/xray-exporter";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ podocarp ];
|
||||
};
|
||||
})
|
||||
|
|
@ -23,13 +23,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pvz-portable-unwrapped";
|
||||
version = "0.1.23";
|
||||
version = "0.1.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wszqkzqk";
|
||||
repo = "PvZ-Portable";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-nVCODhjumC6R/1J5F0EvW4bwOr8Jn2Ed/AgdsUcFWr8=";
|
||||
hash = "sha256-vtJvVV03HZFhH3PJfmgxCn4R8SJFhCWP2ok5MKQOMD4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "pvzge";
|
||||
version = "0.8.2";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Gzh0821";
|
||||
repo = "pvzge_web";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-lCYkkFIis6roWicsU7SN1YzHFQbAdLkkRl6JHasQa8E=";
|
||||
hash = "sha256-QFHWTTwvhtVzcApehPfYCpFHjLXmq9SZcbBSc0eSkpM=";
|
||||
};
|
||||
|
||||
iconSrc = fetchurl {
|
||||
|
|
|
|||
1
pkgs/by-name/ro/roadtools/package.nix
Normal file
1
pkgs/by-name/ro/roadtools/package.nix
Normal file
|
|
@ -0,0 +1 @@
|
|||
{ python3Packages }: with python3Packages; toPythonApplication roadtools
|
||||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "sbom4python";
|
||||
version = "0.12.5";
|
||||
version = "0.12.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anthonyharrison";
|
||||
repo = "sbom4python";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-0+7NsnM2ovYKX5ngFKrQ5lGj9gTrK87B81XSVEnmBWA=";
|
||||
hash = "sha256-205QuBzO5ABxAh4p+yIs5mLbQENIr1K3GohTlYqReuQ=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGo126Module (finalAttrs: {
|
||||
pname = "scaleway-cli";
|
||||
version = "2.56.1";
|
||||
version = "2.56.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scaleway";
|
||||
repo = "scaleway-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-iQ91lhyMcpj5zHke/JxxD8csAYmmOCmdErlKvEEAMgA=";
|
||||
hash = "sha256-Sq/uTl7in/rrujY9UXoeAIbqgEowy3WeEROrxM5gV4I=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lZNlNfmFa26wXtZe79r5+k5hcC8XlbDRj0wz/odrNvU=";
|
||||
vendorHash = "sha256-ekQxkenKpVpzhj1n/HHXITCXDQUV9t9YxE6iUosQJlo=";
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
|
|
|
|||
1689
pkgs/by-name/sc/schildi-revenge/deps.json
generated
1689
pkgs/by-name/sc/schildi-revenge/deps.json
generated
File diff suppressed because it is too large
Load diff
|
|
@ -14,20 +14,20 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "schildi-revenge";
|
||||
version = "26.05.05";
|
||||
version = "26.06.06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SchildiChat";
|
||||
repo = "schildi-revenge";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-B12OcryErrrFyKFweCFQWnbt/L8HvceAhBI51TlT3pg=";
|
||||
hash = "sha256-bj2pSS+kUAs800c/OyK4fIrckB/hAWV3Iypwei8P/W4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoRoot = "matrix-rust-sdk";
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) src cargoRoot;
|
||||
hash = "sha256-8HI7UtuO2eg3/Zb2PhX0jvTDaIOpCCY0EHkrsdzSEkc=";
|
||||
hash = "sha256-ZUMX6Y2kT0CEUFVcn8fAlxoCnQT5ipAi5YqZ3Geet4A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -59,14 +59,14 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
BUILD_DIR="composeApp/build/compose/binaries/main-release/app/SchildiChatRevenge"
|
||||
BUILD_DIR="composeApp/build/compose/binaries/main-release/app/schildichat-revenge"
|
||||
|
||||
mkdir -p $out/share/{applications,icons/scalable}
|
||||
cp -r $BUILD_DIR/bin $out/bin
|
||||
cp -r $BUILD_DIR/lib $out/lib
|
||||
|
||||
cp -r graphics/ic_launcher_foreground.svg $out/share/icons/scalable/ic_launcher.svg
|
||||
cp -r launcher/SchildiChatRevenge.desktop $out/share/applications
|
||||
cp -r launcher/schildichat-revenge.desktop $out/share/applications
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
meta = {
|
||||
description = "Matrix client for desktop written in Kotlin and using the Matrix Rust SDK";
|
||||
mainProgram = "SchildiChatRevenge";
|
||||
mainProgram = "schildichat-revenge";
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.gpl3Only;
|
||||
homepage = "https://schildi.chat/revenge";
|
||||
|
|
|
|||
|
|
@ -2,34 +2,43 @@
|
|||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGoModule {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "sif";
|
||||
version = "0-unstable-2026-06-09";
|
||||
version = "0-unstable-2026-06-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmfunc";
|
||||
repo = "sif";
|
||||
rev = "83ac92a4b82a0ab92257c580c9b6a3b82ab66af9";
|
||||
hash = "sha256-VeURSRwvuh+VJd94mG2F8wQWD6NIitxqwRQr3IJ0QzU=";
|
||||
rev = "d62919523abfecd06e07ba6528b15e9861bd747c";
|
||||
hash = "sha256-T/HIvcXG3OpSK7xhZpYnCWv4KsRn0bnLhyouPjgwUoE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-fR63/dStMsZon22vancuLWIAvZiEYMLjMwY1kmRDNgM=";
|
||||
vendorHash = "sha256-rOAubGbeDPl0LJovksKRfYJmUvU6hmx3Ht12M7eLiOA=";
|
||||
|
||||
subPackages = [ "cmd/sif" ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
# upstream stamps the lowercase main.version, see cmd/sif/main.go
|
||||
"-X main.version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
# network-dependent tests
|
||||
doCheck = false;
|
||||
|
||||
postInstall = ''
|
||||
installManPage man/sif.1
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version=branch"
|
||||
|
|
@ -44,4 +53,4 @@ buildGoModule {
|
|||
maintainers = with lib.maintainers; [ vmfunc ];
|
||||
mainProgram = "sif";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "sonoscli";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "steipete";
|
||||
repo = "sonoscli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-q7YVZcEKBHAX5vcel24DNLHhx3t+V7jWOWS7mrUGHqQ=";
|
||||
hash = "sha256-PCHFK72HJtqjlxdLwOYKkMCXvp9UIyQRUBm0Nx5GUKQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-9jK3jKbFp+5WSQfMbNzwIB55bC5KScZOaFHItffTF00=";
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "tenv";
|
||||
version = "4.12.2";
|
||||
version = "4.14.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tofuutils";
|
||||
repo = "tenv";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-gWXBxw0dvaPCB9zCODFx5QM/6duVDuZgjI3l9VCPBtQ=";
|
||||
hash = "sha256-5a9xlpuv0ySEgaKk+HPJ/1tDuAG2dy8Bt38tocB5IjM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-8RHWpJ6cxnaIMeX9aL1144lOFmuKf74EB8cbT1yCXJc=";
|
||||
vendorHash = "sha256-7XWJXP9zGl+lan6lKnyYUFllAdGYYxpDWS6XEqmofBw=";
|
||||
|
||||
excludedPackages = [ "tools" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "tera-cli";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chevdor";
|
||||
repo = "tera-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-TN3zkxZC0Y9lev2wmvzwyLU+t4rNwut/dQILIA7+qbw=";
|
||||
hash = "sha256-//uF959hXiEL+jIGmQ5OnjYT4Z2jyzflxxIoF+hLnlk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-+qf/MlifpVXzDpADJoTqxU40wDntcPu+bW7eq6/iubk=";
|
||||
cargoHash = "sha256-6NzX8dODW106AjTneDSsZWRoPYvNrv5tUCGUanod+Bo=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
|
|
|||
37
pkgs/by-name/ua/uammd/package.nix
Normal file
37
pkgs/by-name/ua/uammd/package.nix
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "uammd";
|
||||
version = "3.1.0";
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RaulPPelaez";
|
||||
repo = "UAMMD";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-TgGtjERxor/82ueWbl4zW712MyoI7N7f6qloJg+mXRM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "C++14+ header-only fast generic multiscale CUDA Molecular Dynamics framework";
|
||||
homepage = "https://github.com/RaulPPelaez/UAMMD";
|
||||
changelog = "https://github.com/RaulPPelaez/UAMMD/blob/${finalAttrs.src.tag}/CHANGELOG.txt";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
|
@ -7,17 +7,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zed-discord-presence";
|
||||
version = "0.11.3";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xhyrom";
|
||||
repo = "zed-discord-presence";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-pDadm0mVcH5LuKAhA5t41dxcyLpApYqrAQRchpXyb0o=";
|
||||
hash = "sha256-E/W3HeQMvHuGgGI21It0nqsKUwCLrVmLGf3bSa8arwU=";
|
||||
};
|
||||
|
||||
cargoBuildFlags = [ "--package discord-presence-lsp" ];
|
||||
cargoHash = "sha256-k1lhH1vJ7GgYhxROo7NaUDo6Hg1FuFcfLWmSZm/qItA=";
|
||||
cargoHash = "sha256-oSUrQ6d5A4grI69j0NBr06WtIUnwV9AEkZuqW2IzKSQ=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
|
|
|||
|
|
@ -46,7 +46,9 @@ backendStdenv.mkDerivation (finalAttrs: {
|
|||
# by differences in assumed version of CCCL: using a newer CCCL with an older release of CUDA can (sometimes) allow
|
||||
# newer versions of NCCL than what we provide here.
|
||||
version =
|
||||
if cudaAtLeast "11.7" then
|
||||
if cudaAtLeast "12.0" then
|
||||
"2.30.7-1"
|
||||
else if cudaAtLeast "11.7" then
|
||||
"2.28.7-1"
|
||||
else if cudaAtLeast "11.6" then
|
||||
"2.26.6-1"
|
||||
|
|
@ -58,6 +60,7 @@ backendStdenv.mkDerivation (finalAttrs: {
|
|||
repo = "nccl";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = getAttr finalAttrs.version {
|
||||
"2.30.7-1" = "sha256-fdiQZweX0jYfGroP0bL5Sfv3+DkCzVBZZLEbPv8aqq8=";
|
||||
"2.28.7-1" = "sha256-NM19OiBBGmv3cGoVoRLKSh9Y59hiDoei9NIrRnTqWeA=";
|
||||
"2.26.6-1" = "sha256-vkWMGXCy+dIpYCecdafmOAGlnfRxIQ5Y2ZQuMjinraI=";
|
||||
"2.25.1-1" = "sha256-3snh0xdL9I5BYqdbqdl+noizJoI38mZRVOJChgEE1I8=";
|
||||
|
|
@ -102,6 +105,10 @@ backendStdenv.mkDerivation (finalAttrs: {
|
|||
--replace-fail \
|
||||
'-std=c++11' \
|
||||
'$(CXXSTD)'
|
||||
''
|
||||
+ optionalString (versionAtLeast finalAttrs.version "2.30.7-1") ''
|
||||
nixLog "patching shebang in $PWD/src/misc/generate_git_version.py"
|
||||
patchShebangs ./src/misc/generate_git_version.py
|
||||
'';
|
||||
|
||||
# TODO: This would likely break under cross; need to delineate between build and host packages.
|
||||
|
|
|
|||
|
|
@ -1003,6 +1003,11 @@ in
|
|||
# remove failing tests
|
||||
rm tests/plenary/colors/colors_spec.lua # colors depend on neovim version usually
|
||||
rm tests/plenary/capture/capture_spec.lua # because clipboard not available
|
||||
# trailing whitespace inconsistencies
|
||||
rm tests/plenary/api/api_spec.lua
|
||||
rm tests/plenary/babel/tangle_spec.lua
|
||||
rm tests/plenary/capture/datetree_spec.lua
|
||||
rm tests/plenary/init_spec.lua
|
||||
|
||||
# UI tests depend on the neovim version
|
||||
rm -r tests/plenary/ui/*
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
buildDunePackage,
|
||||
pkg-config,
|
||||
|
|
@ -12,24 +12,22 @@
|
|||
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "ocaml-r";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pveber";
|
||||
repo = "ocaml-r";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-jPyVMxjeh9+xu0dD1gelAxcOhxouKczyvzVoKZ5oSrs=";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/pveber/ocaml-r/releases/download/v${finalAttrs.version}/ocaml-r-${finalAttrs.version}.tbz";
|
||||
hash = "sha256-nbO36z/bSMb2vQjW5A9O2hjuF2RVzefFN53l/u3KF+o=";
|
||||
};
|
||||
|
||||
# Finds R and Rmathlib separately
|
||||
# Compatibility with R 4.6
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/pveber/ocaml-r/commit/aa96dc5.patch";
|
||||
sha256 = "sha256-xW33W2ciesyUkDKEH08yfOXv0wP0V6X80or2/n2Nrb4=";
|
||||
url = "https://github.com/pveber/ocaml-r/commit/c70704dd9ff1ed6b4035beef3316dc95275aaf4f.patch";
|
||||
hash = "sha256-I3SX+6gVo9l7epeFhtae8Ji4q51mr53sv7MPxvRBdJg=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/pveber/ocaml-r/commit/c90ce656bd55236e74907f2ef5bc70ff11a0cedc.patch";
|
||||
hash = "sha256-ACU4d8Npq1IXR3hysk6npHHU8ZRcAgRkHg/c+Sb8dkM=";
|
||||
})
|
||||
];
|
||||
|
||||
|
|
@ -48,7 +46,7 @@ buildDunePackage (finalAttrs: {
|
|||
|
||||
meta = {
|
||||
description = "OCaml bindings for the R interpreter";
|
||||
inherit (finalAttrs.src.meta) homepage;
|
||||
homepage = "https://github.com/pveber/ocaml-r/";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = [ lib.maintainers.bcdarwin ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aplpy";
|
||||
version = "2.2.0";
|
||||
version = "2.2.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "aplpy";
|
||||
inherit version;
|
||||
hash = "sha256-oUylUM7/6OyEJFrpkr9MjXilXC/ZIdBQ5au4cvyZiA0=";
|
||||
hash = "sha256-P7PVueaMYXgVwXW+ema2ofP9QiBtaN/gQXZq0yIFJhA=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "blebox-uniapi";
|
||||
version = "2.5.4";
|
||||
version = "2.5.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "blebox";
|
||||
repo = "blebox_uniapi";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-YiEOFxKqWVK7DzrSUvwzIvkyjSpTTFSuVh4pfz+lSg0=";
|
||||
hash = "sha256-vmVCXzfs/LYn2lT3lqdRy4cJcieF1idljH5IPKeH4QA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -358,13 +358,13 @@
|
|||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.43.26";
|
||||
version = "1.43.27";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "boto3_stubs";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-S8wFKxv8m2Z+tb2wnGDizSVCpnSTfmHLsZw8pWEnvoA=";
|
||||
hash = "sha256-p1ZVLxdk29KeJVq1xFwpEkbEE/u+kEe04IXvDxAQaI0=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@
|
|||
# dependencies
|
||||
einops,
|
||||
|
||||
# tests
|
||||
pytestCheckHook,
|
||||
# passthru
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -20,7 +20,7 @@ let
|
|||
in
|
||||
buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
|
||||
pname = "flash-attn-3";
|
||||
version = "3.0.0-unstable-2026-06-02";
|
||||
version = "3.0.0-unstable-2026-06-10";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
|
|
@ -33,8 +33,8 @@ buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
|
|||
src = fetchFromGitHub {
|
||||
owner = "Dao-AILab";
|
||||
repo = "flash-attention";
|
||||
rev = "b02b07e1a10238fe12831b80a8937ed59b1353a5";
|
||||
hash = "sha256-LALX4lYioJLYssoQ0rJCC5M2Ij28wtP7ucpGkKIzmmg=";
|
||||
rev = "fc8cbad6b6b90220cf6ef8121c29e299a3ba7d9a";
|
||||
hash = "sha256-6HxeLAahkWO5pghszfLS6i8Ju67sAxjWnDk0RYRuY88=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
@ -96,6 +96,13 @@ buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
|
|||
# Tests require access to a physical GPU
|
||||
doCheck = false;
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version=branch"
|
||||
"--version-regex=v(3.*)"
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Official implementation of FlashAttention-3";
|
||||
homepage = "https://github.com/Dao-AILab/flash-attention/blob/main/hopper";
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ let
|
|||
|
||||
self = buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
|
||||
pname = "flash-attention";
|
||||
version = "2.8.3";
|
||||
version = "2.8.3.post1";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
|
|
@ -40,7 +40,7 @@ let
|
|||
repo = "flash-attention";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-6I1O4E5K5IdbpzrXFHK06QVcOE8zuVkFE338ffk6N8M=";
|
||||
hash = "sha256-IgK517JorAf9ERcimusF20HgnuETBNKgnGaOxWBuV/M=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "ggml-python";
|
||||
version = "0.0.37";
|
||||
version = "0.0.41";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
|
|
@ -44,7 +44,7 @@ buildPythonPackage (finalAttrs: {
|
|||
tag = "v${finalAttrs.version}";
|
||||
# ggml-python expects an older version of ggml than pkgs.ggml's
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-QFpUGQ8m4c0SpHWnHhoyPdQkcywBToeLahDtG+JMcmA=";
|
||||
hash = "sha256-gtjoB62thkGx4N8gYsb8P8uFTHiGz0FrTLLqLBPA97M=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "glean-parser";
|
||||
version = "19.0.0";
|
||||
version = "19.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "glean_parser";
|
||||
inherit version;
|
||||
hash = "sha256-uy4KSra+fg2qcE5NTp40ogIPhFpx38bEU2apF8vL9LM=";
|
||||
hash = "sha256-oL2vnZWvaoZUPJb1IML0egeTU/ND/TsJqzC4fLnWyDY=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "llguidance";
|
||||
version = "1.7.5";
|
||||
version = "1.7.6";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
|
|
@ -31,12 +31,12 @@ buildPythonPackage (finalAttrs: {
|
|||
owner = "guidance-ai";
|
||||
repo = "llguidance";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-AXTsa+ehQN46QxS4ciRMrv9wYksh6MFa1EDnuDIMsDw=";
|
||||
hash = "sha256-6FaT8hHjmtl878YN9yOjPPVH3QKRpJ8/HPbg0D/Zz2Q=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) src pname version;
|
||||
hash = "sha256-rBc6cc76fELkXqpODh4IDXgjRKSZv1c9s8+VZVWjTvs=";
|
||||
hash = "sha256-tAo6hDWUNm6h/DTOCVU/+o69wQ545THQBBdvN01bhTY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -59,8 +59,8 @@ in
|
|||
"sha256-o5hZAxSZklg7hzL7MWCBYnnYTRoBSSAKPLpub1NVO74=";
|
||||
|
||||
mypy-boto3-amp =
|
||||
buildMypyBoto3Package "amp" "1.43.0"
|
||||
"sha256-yDDyrgINiqUb6lcpQI9oWDy6lw+NiJR4hwmxnAPpQeA=";
|
||||
buildMypyBoto3Package "amp" "1.43.27"
|
||||
"sha256-+4LZurLRAzKsHwrT3lxRZeQSpzKWzgnI49/NvyNGa8w=";
|
||||
|
||||
mypy-boto3-amplify =
|
||||
buildMypyBoto3Package "amplify" "1.43.0"
|
||||
|
|
@ -443,8 +443,8 @@ in
|
|||
"sha256-dXNkOcMonYrBh4yzeubd+v3mW42s9XpmpfvgbtgoJgY=";
|
||||
|
||||
mypy-boto3-ec2 =
|
||||
buildMypyBoto3Package "ec2" "1.43.26"
|
||||
"sha256-IGl4y8hDpdsqKcky6UgukfDlnSjbyYsa69sPiYZYcN4=";
|
||||
buildMypyBoto3Package "ec2" "1.43.27"
|
||||
"sha256-Cz3DhKTxDSluH14aqeY+lPuCGTEOoC0DJp7A3RCP7Gg=";
|
||||
|
||||
mypy-boto3-ec2-instance-connect =
|
||||
buildMypyBoto3Package "ec2-instance-connect" "1.43.0"
|
||||
|
|
@ -459,8 +459,8 @@ in
|
|||
"sha256-02BUkAFhr9sT8ohkJJFPYNni0O9/UI/G0GUee/Kx5Dw=";
|
||||
|
||||
mypy-boto3-ecs =
|
||||
buildMypyBoto3Package "ecs" "1.43.16"
|
||||
"sha256-0YWDS6MW3UhdLKzLaaZfrOZjZTrO15t5SDJoHM3MtSo=";
|
||||
buildMypyBoto3Package "ecs" "1.43.27"
|
||||
"sha256-wdq6dIF6tbjhIBVRUY8GKbOwkJVyKNFGPniisK7uzVU=";
|
||||
|
||||
mypy-boto3-efs =
|
||||
buildMypyBoto3Package "efs" "1.43.23"
|
||||
|
|
@ -798,8 +798,8 @@ in
|
|||
"sha256-kCI94Z4gBIthwj3Q7OqdIYPPWqavxLTKY3FQDeuPsmI=";
|
||||
|
||||
mypy-boto3-lightsail =
|
||||
buildMypyBoto3Package "lightsail" "1.43.7"
|
||||
"sha256-1ihwQoZTBK1w8AB+K3qtSZOqDQLTXmXLi47QpmOkCqU=";
|
||||
buildMypyBoto3Package "lightsail" "1.43.27"
|
||||
"sha256-avIJYgrtKA+qukx3aobMXieA564oCaAlqdSt58PFk+g=";
|
||||
|
||||
mypy-boto3-location =
|
||||
buildMypyBoto3Package "location" "1.43.0"
|
||||
|
|
@ -862,8 +862,8 @@ in
|
|||
"sha256-VaGwdqgERTszcGip4FytIsm6r9mADouitpOWVmBFBko=";
|
||||
|
||||
mypy-boto3-medialive =
|
||||
buildMypyBoto3Package "medialive" "1.43.16"
|
||||
"sha256-sOlkQEJXmjeAGlK9tpML+ZLKoYdqmRfr/RjajsNjkaQ=";
|
||||
buildMypyBoto3Package "medialive" "1.43.27"
|
||||
"sha256-0LntM7UfzKU0Pe0peTvZw2Ll59DNNRVajrB8L5ThgCs=";
|
||||
|
||||
mypy-boto3-mediapackage =
|
||||
buildMypyBoto3Package "mediapackage" "1.43.0"
|
||||
|
|
@ -1170,8 +1170,8 @@ in
|
|||
"sha256-T+JIJpHxD7IzAwq8yxgq6zbVMj/btpbhKnylMyfFvvU=";
|
||||
|
||||
mypy-boto3-sagemaker =
|
||||
buildMypyBoto3Package "sagemaker" "1.43.24"
|
||||
"sha256-jCg1JCbX32PdW2y/Fz41Uo37J3vzn2ACX3L20mSOMBw=";
|
||||
buildMypyBoto3Package "sagemaker" "1.43.27"
|
||||
"sha256-UnNJiqfI7G5hN3QkTIzKEcL1gwJPVsTUgUCAce3mmCs=";
|
||||
|
||||
mypy-boto3-sagemaker-a2i-runtime =
|
||||
buildMypyBoto3Package "sagemaker-a2i-runtime" "1.43.0"
|
||||
|
|
|
|||
|
|
@ -2,27 +2,28 @@
|
|||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
diff-cover,
|
||||
graphviz,
|
||||
hatchling,
|
||||
hatch-vcs,
|
||||
packaging,
|
||||
pytest-mock,
|
||||
pip-requirements-parser,
|
||||
pytestCheckHook,
|
||||
pip,
|
||||
pytest-mock,
|
||||
pytest-subprocess,
|
||||
rich,
|
||||
virtualenv,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pipdeptree";
|
||||
version = "2.30.0";
|
||||
version = "3.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tox-dev";
|
||||
repo = "pipdeptree";
|
||||
tag = version;
|
||||
hash = "sha256-nDCd4Bk5P65+fnFM/kC3cbfPanj5P35/bta86/E65i0=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-poUults9ev+5aryrZPxnxF/X9u0iivnlc1ceLxB7dys=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
@ -30,22 +31,25 @@ buildPythonPackage rec {
|
|||
hatch-vcs
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
pip
|
||||
packaging
|
||||
];
|
||||
dependencies = [ packaging ];
|
||||
|
||||
optional-dependencies = {
|
||||
graphviz = [ graphviz ];
|
||||
index = [
|
||||
# nab-index # Unstable + not packaged yet
|
||||
# nab-python # Same
|
||||
pip-requirements-parser
|
||||
];
|
||||
rich = [ rich ];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
diff-cover
|
||||
pytest-mock
|
||||
pytest-subprocess
|
||||
pytestCheckHook
|
||||
virtualenv
|
||||
]
|
||||
++ lib.concatAttrValues optional-dependencies;
|
||||
++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies;
|
||||
|
||||
pythonImportsCheck = [ "pipdeptree" ];
|
||||
|
||||
|
|
@ -57,7 +61,7 @@ buildPythonPackage rec {
|
|||
meta = {
|
||||
description = "Command line utility to show dependency tree of packages";
|
||||
homepage = "https://github.com/tox-dev/pipdeptree";
|
||||
changelog = "https://github.com/tox-dev/pipdeptree/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/tox-dev/pipdeptree/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
charlesbaynham
|
||||
|
|
@ -65,4 +69,4 @@ buildPythonPackage rec {
|
|||
];
|
||||
mainProgram = "pipdeptree";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@
|
|||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "redisvl";
|
||||
version = "0.20.0";
|
||||
version = "0.21.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "redis";
|
||||
repo = "redis-vl-python";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-qzGK/M2KXVR9FEutA8xQU9bMYWerOFS2BzNtuAW9n0Q=";
|
||||
hash = "sha256-Sk1XNFTxk3bOTqiqhpZBaYgrZSxSoJUc9XoJmNo0EZY=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
|
|
|||
|
|
@ -46,14 +46,14 @@ let
|
|||
in
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "rembg";
|
||||
version = "2.0.75";
|
||||
version = "2.0.76";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danielgatis";
|
||||
repo = "rembg";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-mHGdv47BXUIjE7O5m2Wkg+mkszlZUU1dmAbtpnttwjw=";
|
||||
hash = "sha256-Iv98z6LdQCkfndBOZubyUtN8teTlZsi8fmQ/Vec18yI=";
|
||||
};
|
||||
|
||||
env.POETRY_DYNAMIC_VERSIONING_BYPASS = finalAttrs.version;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
lib,
|
||||
aiohttp,
|
||||
cbor2,
|
||||
cryptography,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
|
|
@ -10,19 +11,22 @@
|
|||
sqlalchemy,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "roadlib";
|
||||
version = "1.6.0";
|
||||
version = "1.7.0";
|
||||
pyproject = true;
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-WKlbYTIw7A5d4UCxeFgtQ1/dTecqQVzSheImnrb2Hmw=";
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-al1FnLcKAFWRY43weXtsS8DN5pXCO1qFUw1vwLfZvGM=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
cbor2
|
||||
cryptography
|
||||
pyjwt
|
||||
requests
|
||||
|
|
@ -44,4 +48,4 @@ buildPythonPackage rec {
|
|||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -17,12 +17,14 @@
|
|||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "roadrecon";
|
||||
version = "1.7.4";
|
||||
version = "2.0.0";
|
||||
pyproject = true;
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-V/McstT+2LAlNe4HHQ0xNfAIM0ExFstyEL3qQrEfkoQ=";
|
||||
hash = "sha256-wzr0J6tGhsZdjTDeIeSzCRTquiw4iZ8FxqFEl1fC2iU=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
|
|||
|
|
@ -8,19 +8,21 @@
|
|||
roadtx,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "roadtools";
|
||||
version = "0.0.2";
|
||||
pyproject = true;
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-RxRbcT9uhQBYRDqq1asYDIwqrji14zi7dwRuQLXJiyQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
roadrecon
|
||||
roadlib
|
||||
roadtx
|
||||
|
|
@ -33,5 +35,6 @@ buildPythonPackage rec {
|
|||
homepage = "https://github.com/dirkjanm/ROADtools";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
mainProgram = "roadtools";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -7,19 +7,21 @@
|
|||
requests,
|
||||
roadlib,
|
||||
selenium,
|
||||
selenium-wire,
|
||||
selenium-wire-roadtx,
|
||||
setuptools,
|
||||
signxml,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "roadtx";
|
||||
version = "1.21.1";
|
||||
version = "1.22.0";
|
||||
pyproject = true;
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-UxyyvVWuRE/Uh7zUtSN6GdRdintNpFAHVQ+ufc+uFjU=";
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-2GIJAjLxOqy3E+5j1gnby8F5IAvdnChMT4Lfq5I5zeE=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
@ -30,7 +32,7 @@ buildPythonPackage rec {
|
|||
requests
|
||||
roadlib
|
||||
selenium
|
||||
selenium-wire
|
||||
selenium-wire-roadtx
|
||||
signxml
|
||||
];
|
||||
|
||||
|
|
@ -42,4 +44,4 @@ buildPythonPackage rec {
|
|||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -0,0 +1,91 @@
|
|||
{
|
||||
lib,
|
||||
blinker,
|
||||
brotli,
|
||||
buildPythonPackage,
|
||||
certifi,
|
||||
cryptography,
|
||||
fetchFromGitHub,
|
||||
gunicorn,
|
||||
h2,
|
||||
httpbin,
|
||||
hyperframe,
|
||||
kaitaistruct,
|
||||
nix-update-script,
|
||||
pyasn1,
|
||||
pyopenssl,
|
||||
pyparsing,
|
||||
pysocks,
|
||||
pytestCheckHook,
|
||||
ruamel-yaml,
|
||||
selenium,
|
||||
setuptools,
|
||||
wsproto,
|
||||
zstandard,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "selenium-wire-roadtx";
|
||||
version = "0-unstable-2026-05-20";
|
||||
pyproject = true;
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dirkjanm";
|
||||
repo = "selenium-wire-roadtx";
|
||||
rev = "98e91ea9e2472902d19b4a328a2ea08539b488b9";
|
||||
hash = "sha256-WhGsgIuJrbc6Emq9B0uin7FUKc/qPH9E1DUjt/FIVZs=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
blinker
|
||||
brotli
|
||||
certifi
|
||||
cryptography
|
||||
h2
|
||||
hyperframe
|
||||
kaitaistruct
|
||||
pyasn1
|
||||
pyopenssl
|
||||
pyparsing
|
||||
pysocks
|
||||
ruamel-yaml
|
||||
selenium
|
||||
wsproto
|
||||
zstandard
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
gunicorn
|
||||
httpbin
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "seleniumwire" ];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Don't run End2End tests
|
||||
"tests/end2end/test_end2end.py"
|
||||
# Don't run MitM tests
|
||||
"tests/seleniumwire/test_server.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Tests require setup
|
||||
"BackendIntegrationTest"
|
||||
# AssertionError
|
||||
"test_save_response"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Extends Selenium's Python bindings to give you the ability to inspect requests made by the browser";
|
||||
homepage = "https://github.com/dirkjanm/selenium-wire-roadtx";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
})
|
||||
|
|
@ -20,14 +20,14 @@
|
|||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "stanza";
|
||||
version = "1.12.1";
|
||||
version = "1.12.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stanfordnlp";
|
||||
repo = "stanza";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-e4f/Th9zCVBe05v7NI+IXiSbCfcKVZvDFAKq8ZrsQjA=";
|
||||
hash = "sha256-hUI8sZDwBK8ZRS9asyDiTqpoIGnGbHeH/Q9i/gasut0=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "stringzilla";
|
||||
version = "4.6.1";
|
||||
version = "4.6.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ashvardanian";
|
||||
repo = "stringzilla";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-yAxHOcxS4YYX0lvKwUExIBFBM5RDyFgeW9QA0WZBthA=";
|
||||
hash = "sha256-PAs5j+J3BH23Yk2K0tYvCmz7cTU4djePzUpjsCk8YZs=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
|
|
@ -133,6 +133,10 @@ buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
|
|||
"test_batch_pitch_shift"
|
||||
"test_batch_spectrogram"
|
||||
"test_griffinlim_0_99"
|
||||
|
||||
# RuntimeError: illegal immediate parameter (range error)
|
||||
"test_lfilter_shape_4"
|
||||
"test_lfilter_shape_6"
|
||||
]
|
||||
++ lib.optionals hostPlatform.isDarwin [
|
||||
# AssertionError: Tensor-likes are not close!
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rl_json";
|
||||
version = "0.16";
|
||||
version = "0.17.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RubyLane";
|
||||
repo = "rl_json";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-rXr7x9Cr+gD938+NEPguvYVWH5s9bKccMobuZsb0IQY=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-18WMNHzGn0Hio07zuuaINN85b82pNEIgeLjsRy9jQEs=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
buildHomeAssistantComponent rec {
|
||||
owner = "homeassistant-ai";
|
||||
domain = "ha_mcp_tools";
|
||||
version = "7.6.0";
|
||||
version = "7.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "homeassistant-ai";
|
||||
repo = "ha-mcp";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-1jIOSv13p9MUC5SiGcXIIojY4tGERw5lfOQsZsSMW40=";
|
||||
hash = "sha256-Gp4C3SRNkgv9GfLkVx/VCMp4/kCORHsp87IHcCaCPKk=";
|
||||
};
|
||||
|
||||
dependencies = [
|
||||
|
|
|
|||
|
|
@ -17823,6 +17823,8 @@ self: super: with self; {
|
|||
|
||||
selenium-wire = callPackage ../development/python-modules/selenium-wire { };
|
||||
|
||||
selenium-wire-roadtx = callPackage ../development/python-modules/selenium-wire-roadtx { };
|
||||
|
||||
semantic-version = callPackage ../development/python-modules/semantic-version { };
|
||||
|
||||
semaphore-bot = callPackage ../development/python-modules/semaphore-bot { };
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue