mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-09-30 20:00:10 +00:00
Merge branch 'staging-next' into staging
This commit is contained in:
@@ -562,6 +562,29 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
})
|
||||
```
|
||||
|
||||
##### `fetchYarnDeps` arguments {#javascript-fetchyarndeps}
|
||||
|
||||
`fetchYarnDeps` accepts the following arguments:
|
||||
|
||||
- `yarnLock`: Path to the `yarn.lock` file to fetch dependencies for.
|
||||
- `hash` (or `sha256`): The output hash of the offline cache.
|
||||
- `mirrorUrl`: Optional registry mirror URL used in place of the default yarn
|
||||
registry (`https://registry.yarnpkg.com/`). When set, any resolved URL
|
||||
pointing at the default registry is rewritten to use this mirror before
|
||||
downloading. This is useful for pointing at a local or internal registry
|
||||
mirror. Note that changing the mirror does not change the output hash, since
|
||||
the downloaded contents are identical.
|
||||
|
||||
```nix
|
||||
{
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = finalAttrs.src + "/yarn.lock";
|
||||
mirrorUrl = "https://registry.npmmirror.com/";
|
||||
hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
|
||||
};
|
||||
}
|
||||
```
|
||||
|
||||
##### `yarnConfigHook` arguments {#javascript-yarnconfighook}
|
||||
|
||||
By default, `yarnConfigHook` relies upon the attribute `${yarnOfflineCache}` (or `${offlineCache}` if the former is not set) to find the location of the offline cache produced by `fetchYarnDeps`. To disable this phase, you can set `dontYarnInstallDeps = true` or override the `configurePhase`.
|
||||
|
||||
@@ -3906,6 +3906,9 @@
|
||||
"javascript-yarn-v3-v4": [
|
||||
"index.html#javascript-yarn-v3-v4"
|
||||
],
|
||||
"javascript-fetchyarndeps": [
|
||||
"index.html#javascript-fetchyarndeps"
|
||||
],
|
||||
"javascript-yarnconfighook": [
|
||||
"index.html#javascript-yarnconfighook"
|
||||
],
|
||||
|
||||
@@ -12455,6 +12455,11 @@
|
||||
githubId = 17727163;
|
||||
keys = [ { fingerprint = "FBAA B86A 101B 4C5F D4F1 25D2 E93D DAC1 7E5D 6CA1"; } ];
|
||||
};
|
||||
itsyunaya = {
|
||||
name = "Ashley Marino";
|
||||
github = "itsyunaya";
|
||||
githubId = 40719746;
|
||||
};
|
||||
ius = {
|
||||
email = "j.de.gram@gmail.com";
|
||||
name = "Joerie de Gram";
|
||||
|
||||
@@ -119,7 +119,7 @@ lusc_luv,,,,,,
|
||||
lush.nvim,,,https://luarocks.org/dev,,,teto
|
||||
luuid,,,,20120509-2,,
|
||||
lyaml,,,,,,lblasc
|
||||
lz.n,,,,,,mrcjkb
|
||||
lz.n,,,,,5.1,mrcjkb
|
||||
lze,,,,,,birdee
|
||||
lzextras,,,,,,birdee
|
||||
lzn-auto-require,,,,,,mrcjkb
|
||||
|
||||
|
@@ -197,6 +197,8 @@
|
||||
|
||||
- A number of options for `services.llama-cpp` have been removed in favor of the structured [](#opt-services.llama-cpp.settings) option, attributes from which are used as arguments to `llama-server` executable, you can see all available options by running `llama-server --help`. Configuring model presets using Nix attribute set via `services.llama-cpp.modelsPreset` is no longer supported, please use `services.llama-cpp.settings.models-preset` with a path to an INI file containing desired options.
|
||||
|
||||
- `ensure-printers.service` has been replaced with an `ExecStartPost` hook in `cups.service`. If you have made any manual modifications to this unit, you should move the modifications to `cups.service` instead.
|
||||
|
||||
- The `NIX_XDG_DESKTOP_PORTAL_DIR` environment variable is no longer used in the `xdg-desktop-portal` package and is therefore no longer set in `xdg.portal` module.
|
||||
Instead the `XDG_DATA_DIRS` environment variable is used to find xdg-portals.
|
||||
|
||||
|
||||
@@ -21,103 +21,11 @@ let
|
||||
submodule
|
||||
;
|
||||
|
||||
ensurePrinter =
|
||||
p:
|
||||
let
|
||||
args = lib.cli.toCommandLineShellGNU { } (
|
||||
{
|
||||
p = p.name;
|
||||
v = p.deviceUri;
|
||||
m = p.model;
|
||||
}
|
||||
// lib.optionalAttrs (p.location != null) {
|
||||
L = p.location;
|
||||
}
|
||||
// lib.optionalAttrs (p.description != null) {
|
||||
D = p.description;
|
||||
}
|
||||
// lib.optionalAttrs (p.ppdOptions != { }) {
|
||||
o = lib.mapAttrsToList (name: value: "${name}=${value}") p.ppdOptions;
|
||||
}
|
||||
);
|
||||
in
|
||||
''
|
||||
# shellcheck disable=SC2016
|
||||
${pkgs.cups}/bin/lpadmin ${args} -E
|
||||
'';
|
||||
|
||||
ensureDefaultPrinter = name: ''
|
||||
${pkgs.cups}/bin/lpadmin -d '${name}'
|
||||
'';
|
||||
|
||||
# "graph but not # or /" can't be implemented as regex alone due to missing lookahead support
|
||||
noInvalidChars = str: lib.all (c: c != "#" && c != "/") (lib.stringToCharacters str);
|
||||
printerName = (lib.types.addCheck (lib.types.strMatching "[[:graph:]]+") noInvalidChars) // {
|
||||
description = "printable string without spaces, # and /";
|
||||
};
|
||||
|
||||
getPrinters =
|
||||
class:
|
||||
lib.uniqueStrings (
|
||||
lib.concatLists (
|
||||
lib.textClosureList (lib.mapAttrs (
|
||||
_:
|
||||
{
|
||||
classes ? [ ],
|
||||
printers ? [ ],
|
||||
...
|
||||
}:
|
||||
{
|
||||
deps = classes;
|
||||
text = printers;
|
||||
}
|
||||
) cfg.ensureClasses) [ class ]
|
||||
)
|
||||
);
|
||||
|
||||
mkClass = name: ''
|
||||
lpadmin -p _tmp -v file:/dev/null
|
||||
lpadmin -p _tmp -c ${escapeShellArg name}
|
||||
lpadmin -x _tmp
|
||||
'';
|
||||
|
||||
populateClass =
|
||||
name:
|
||||
{
|
||||
description ? null,
|
||||
location ? null,
|
||||
...
|
||||
}:
|
||||
lib.concatStringsSep "\n" [
|
||||
(lib.optionalString (location != null) ''
|
||||
lpadmin -p ${escapeShellArg name} -L ${escapeShellArg location}
|
||||
'')
|
||||
|
||||
(lib.optionalString (description != null) ''
|
||||
lpadmin -p ${escapeShellArg name} -D ${escapeShellArg description}
|
||||
'')
|
||||
];
|
||||
|
||||
addPrintersToClass =
|
||||
className: class:
|
||||
let
|
||||
printers = getPrinters className;
|
||||
addToClass = printer: ''
|
||||
lpadmin -p ${escapeShellArg printer} -c ${escapeShellArg className}
|
||||
'';
|
||||
in
|
||||
map addToClass printers;
|
||||
|
||||
enableClass = className: ''
|
||||
cupsenable ${escapeShellArg className}
|
||||
cupsaccept ${escapeShellArg className}
|
||||
'';
|
||||
|
||||
# if CUPS is configured only to start when it's needed, we can kill the service
|
||||
# once the printer setup is done. However, if stateless is configured then we
|
||||
# can't shut down the servive without losing the printers (and classes) we
|
||||
# *just* configured.
|
||||
ultimatelyStopCups = with config.services.printing; startWhenNeeded && !stateless;
|
||||
in
|
||||
{
|
||||
options = {
|
||||
@@ -272,172 +180,202 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
config.assertions = lib.mkIf config.services.printing.enable [
|
||||
(
|
||||
let
|
||||
referencedClasses = lib.unique (
|
||||
lib.flatten (
|
||||
lib.mapAttrsToList (
|
||||
_:
|
||||
{
|
||||
classes ? [ ],
|
||||
...
|
||||
}:
|
||||
classes
|
||||
) cfg.ensureClasses
|
||||
)
|
||||
);
|
||||
definedClasses = lib.attrNames cfg.ensureClasses;
|
||||
missingClasses = lib.subtractLists definedClasses referencedClasses;
|
||||
getReferencingClasses =
|
||||
missingClass:
|
||||
(lib.mapAttrsToList (name: _: "`${name}`") (
|
||||
lib.filterAttrs (
|
||||
_:
|
||||
{
|
||||
classes ? [ ],
|
||||
...
|
||||
}:
|
||||
builtins.elem missingClass classes
|
||||
) cfg.ensureClasses
|
||||
));
|
||||
in
|
||||
{
|
||||
assertion = missingClasses == [ ];
|
||||
message = ''
|
||||
One or more values of `config.hardware.printers.ensureClasses.<name>.classes`
|
||||
contained values not present in `config.hardware.printers.ensureClasses`
|
||||
config = lib.mkIf config.services.printing.enable {
|
||||
assertions = [
|
||||
(
|
||||
let
|
||||
referencedClasses = lib.unique (
|
||||
lib.flatten (
|
||||
lib.mapAttrsToList (
|
||||
_:
|
||||
{
|
||||
classes ? [ ],
|
||||
...
|
||||
}:
|
||||
classes
|
||||
) cfg.ensureClasses
|
||||
)
|
||||
);
|
||||
definedClasses = lib.attrNames cfg.ensureClasses;
|
||||
missingClasses = lib.subtractLists definedClasses referencedClasses;
|
||||
getReferencingClasses =
|
||||
missingClass:
|
||||
(lib.mapAttrsToList (name: _: "`${name}`") (
|
||||
lib.filterAttrs (
|
||||
_:
|
||||
{
|
||||
classes ? [ ],
|
||||
...
|
||||
}:
|
||||
builtins.elem missingClass classes
|
||||
) cfg.ensureClasses
|
||||
));
|
||||
in
|
||||
{
|
||||
assertion = missingClasses == [ ];
|
||||
message = ''
|
||||
One or more values of `config.hardware.printers.ensureClasses.<name>.classes`
|
||||
contained values not present in `config.hardware.printers.ensureClasses`
|
||||
|
||||
Missing classes:
|
||||
${lib.concatMapStringsSep "\n" (
|
||||
p: " - `${p}` (included in class(es): ${lib.concatStringsSep ", " (getReferencingClasses p)})"
|
||||
) missingClasses}
|
||||
'';
|
||||
}
|
||||
)
|
||||
|
||||
(
|
||||
let
|
||||
referencedPrinters = lib.unique (
|
||||
lib.flatten (
|
||||
lib.mapAttrsToList (
|
||||
_:
|
||||
{
|
||||
printers ? [ ],
|
||||
...
|
||||
}:
|
||||
printers
|
||||
) cfg.ensureClasses
|
||||
)
|
||||
);
|
||||
definedPrinters = lib.catAttrs "name" cfg.ensurePrinters;
|
||||
missingPrinters = lib.subtractLists definedPrinters referencedPrinters;
|
||||
getReferencingClasses =
|
||||
missingPrinter:
|
||||
(lib.mapAttrsToList (name: _: "`${name}`") (
|
||||
lib.filterAttrs (
|
||||
_:
|
||||
{
|
||||
printers ? [ ],
|
||||
...
|
||||
}:
|
||||
builtins.elem missingPrinter printers
|
||||
) cfg.ensureClasses
|
||||
));
|
||||
in
|
||||
{
|
||||
assertion = missingPrinters == [ ];
|
||||
message = ''
|
||||
One or more values of `config.hardware.printers.ensureClasses.<name>.printers`
|
||||
contained values not present in `config.hardware.printers.ensurePrinters`
|
||||
|
||||
Missing printers:
|
||||
${lib.concatMapStringsSep "\n" (
|
||||
p: " - `${p}` (included in class(es): ${lib.concatStringsSep ", " (getReferencingClasses p)})"
|
||||
) missingPrinters}
|
||||
'';
|
||||
}
|
||||
)
|
||||
];
|
||||
|
||||
config.systemd.services.ensure-printer-classes =
|
||||
lib.mkIf (cfg.ensureClasses != { } && config.services.printing.enable)
|
||||
{
|
||||
description = "Ensure NixOS-configured CUPS classes";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
wants = [
|
||||
"cups.service"
|
||||
];
|
||||
after = [
|
||||
"cups.service"
|
||||
"ensure-printers.service"
|
||||
];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
};
|
||||
path = with pkgs; [ cups ];
|
||||
script =
|
||||
let
|
||||
attrMap = fn: l: map fn (builtins.attrNames l);
|
||||
classDefs = lib.pipe cfg.ensureClasses [
|
||||
(attrMap mkClass)
|
||||
concatLines
|
||||
];
|
||||
classAdds = lib.pipe cfg.ensureClasses [
|
||||
(lib.mapAttrsToList addPrintersToClass)
|
||||
lib.flatten
|
||||
concatLines
|
||||
];
|
||||
populatedClasses = lib.pipe cfg.ensureClasses [
|
||||
(lib.mapAttrsToList populateClass)
|
||||
concatLines
|
||||
];
|
||||
enables = lib.pipe cfg.ensureClasses [
|
||||
(attrMap enableClass)
|
||||
concatLines
|
||||
];
|
||||
in
|
||||
''
|
||||
#### CLASS DEFINITIONS ####
|
||||
${classDefs}
|
||||
|
||||
#### ADDING PRINTERS TO CLASSES ####
|
||||
${classAdds}
|
||||
|
||||
#### POPULATING CLASSES ####
|
||||
${populatedClasses}
|
||||
|
||||
#### ENABLING CLASSES ####
|
||||
${enables}
|
||||
|
||||
${lib.optionalString ultimatelyStopCups "systemctl stop cups.service"}
|
||||
Missing classes:
|
||||
${lib.concatMapStringsSep "\n" (
|
||||
p: " - `${p}` (included in class(es): ${lib.concatStringsSep ", " (getReferencingClasses p)})"
|
||||
) missingClasses}
|
||||
'';
|
||||
};
|
||||
}
|
||||
)
|
||||
|
||||
config.systemd.services.ensure-printers =
|
||||
lib.mkIf (cfg.ensurePrinters != [ ] && config.services.printing.enable)
|
||||
{
|
||||
description = "Ensure NixOS-configured CUPS printers";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
wants = [ "cups.service" ];
|
||||
after = [ "cups.service" ];
|
||||
(
|
||||
let
|
||||
referencedPrinters = lib.unique (
|
||||
lib.flatten (
|
||||
lib.mapAttrsToList (
|
||||
_:
|
||||
{
|
||||
printers ? [ ],
|
||||
...
|
||||
}:
|
||||
printers
|
||||
) cfg.ensureClasses
|
||||
)
|
||||
);
|
||||
definedPrinters = lib.catAttrs "name" cfg.ensurePrinters;
|
||||
missingPrinters = lib.subtractLists definedPrinters referencedPrinters;
|
||||
getReferencingClasses =
|
||||
missingPrinter:
|
||||
(lib.mapAttrsToList (name: _: "`${name}`") (
|
||||
lib.filterAttrs (
|
||||
_:
|
||||
{
|
||||
printers ? [ ],
|
||||
...
|
||||
}:
|
||||
builtins.elem missingPrinter printers
|
||||
) cfg.ensureClasses
|
||||
));
|
||||
in
|
||||
{
|
||||
assertion = missingPrinters == [ ];
|
||||
message = ''
|
||||
One or more values of `config.hardware.printers.ensureClasses.<name>.printers`
|
||||
contained values not present in `config.hardware.printers.ensurePrinters`
|
||||
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
};
|
||||
Missing printers:
|
||||
${lib.concatMapStringsSep "\n" (
|
||||
p: " - `${p}` (included in class(es): ${lib.concatStringsSep ", " (getReferencingClasses p)})"
|
||||
) missingPrinters}
|
||||
'';
|
||||
}
|
||||
)
|
||||
];
|
||||
|
||||
script = lib.concatStringsSep "\n" [
|
||||
(lib.concatMapStrings ensurePrinter cfg.ensurePrinters)
|
||||
(lib.optionalString (cfg.ensureDefaultPrinter != null) (
|
||||
ensureDefaultPrinter cfg.ensureDefaultPrinter
|
||||
))
|
||||
# Let ensure-printer-classes.service kill cups because it is called
|
||||
# after this service.
|
||||
(lib.optionalString (
|
||||
ultimatelyStopCups && !(config.systemd.services ? ensure-printer-classes)
|
||||
) "systemctl stop cups.service")
|
||||
];
|
||||
};
|
||||
systemd.services.cups = {
|
||||
postStart =
|
||||
let
|
||||
getPrinters =
|
||||
class:
|
||||
lib.uniqueStrings (
|
||||
lib.concatLists (
|
||||
lib.textClosureList (lib.mapAttrs (
|
||||
_:
|
||||
{
|
||||
classes ? [ ],
|
||||
printers ? [ ],
|
||||
...
|
||||
}:
|
||||
{
|
||||
deps = classes;
|
||||
text = printers;
|
||||
}
|
||||
) cfg.ensureClasses) [ class ]
|
||||
)
|
||||
);
|
||||
|
||||
classNames = builtins.attrNames cfg.ensureClasses;
|
||||
|
||||
lpadmin =
|
||||
args:
|
||||
let
|
||||
# -d, -p and -x are subcommands that must be specified at the start.
|
||||
argsDpx = lib.intersectAttrs {
|
||||
d = true;
|
||||
p = true;
|
||||
x = true;
|
||||
} args;
|
||||
argsWoDpx = lib.removeAttrs args [
|
||||
"d"
|
||||
"p"
|
||||
"x"
|
||||
];
|
||||
in
|
||||
"lpadmin ${lib.cli.toCommandLineShellGNU { } argsDpx} ${
|
||||
lib.cli.toCommandLineShellGNU { } argsWoDpx
|
||||
}";
|
||||
|
||||
in
|
||||
''
|
||||
#### ADDING PRINTERS ####
|
||||
${lib.concatMapStringsSep "\n" (
|
||||
p:
|
||||
lpadmin {
|
||||
p = p.name;
|
||||
v = p.deviceUri;
|
||||
m = p.model;
|
||||
L = p.location;
|
||||
D = p.description;
|
||||
o = lib.mapAttrsToList (name: value: "${name}=${value}") p.ppdOptions;
|
||||
E = true;
|
||||
}
|
||||
) cfg.ensurePrinters}
|
||||
|
||||
#### SETTING DEFAULT PRINTER ####
|
||||
${lib.optionalString (cfg.ensureDefaultPrinter != null) (lpadmin {
|
||||
d = cfg.ensureDefaultPrinter;
|
||||
})}
|
||||
|
||||
#### CLASS DEFINITIONS ####
|
||||
lpadmin -p _tmp -v file:/dev/null
|
||||
${lib.concatMapStringsSep "\n" (
|
||||
className:
|
||||
lpadmin {
|
||||
p = "_tmp";
|
||||
c = className;
|
||||
}
|
||||
) classNames}
|
||||
lpadmin -x _tmp
|
||||
|
||||
#### ADDING PRINTERS TO CLASSES ####
|
||||
${lib.concatMapStringsSep "\n" (
|
||||
className:
|
||||
lib.concatMapStringsSep "\n" (
|
||||
printer:
|
||||
lpadmin {
|
||||
p = printer;
|
||||
c = className;
|
||||
}
|
||||
) (getPrinters className)
|
||||
) classNames}
|
||||
|
||||
#### POPULATING CLASSES ####
|
||||
${lib.concatStringsSep "\n" (
|
||||
lib.mapAttrsToList (
|
||||
className: class:
|
||||
lpadmin {
|
||||
p = className;
|
||||
L = class.location;
|
||||
D = class.description;
|
||||
}
|
||||
) cfg.ensureClasses
|
||||
)}
|
||||
|
||||
#### ENABLING CLASSES ####
|
||||
${lib.concatMapStrings (className: ''
|
||||
cupsenable ${escapeShellArg className}
|
||||
cupsaccept ${escapeShellArg className}
|
||||
'') classNames}
|
||||
|
||||
echo "CUPS provisioning complete."
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -893,7 +893,6 @@ in
|
||||
# Upstream config: https://github.com/systemd/systemd/blob/main/src/run/systemd-run0.in
|
||||
setLoginUid = true;
|
||||
pamMount = false;
|
||||
startSession = true;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -843,10 +843,13 @@ in
|
||||
cfgZfs.package
|
||||
pkgs.coreutils
|
||||
pkgs.curl
|
||||
pkgs.diffutils
|
||||
pkgs.findutils
|
||||
pkgs.gawk
|
||||
pkgs.gnugrep
|
||||
pkgs.gnused
|
||||
pkgs.hostname-debian
|
||||
pkgs.logger
|
||||
pkgs.util-linux
|
||||
];
|
||||
};
|
||||
|
||||
@@ -50,14 +50,34 @@ in
|
||||
services.printing.enable = true;
|
||||
services.printing.startWhenNeeded = socket;
|
||||
services.printing.listenAddresses = lib.mkIf (!listenTcp) [ ];
|
||||
# Add printer to the client as well, via IPP.
|
||||
# Add printers to the client as well, via IPP.
|
||||
hardware.printers.ensurePrinters = [
|
||||
{
|
||||
name = "DeskjetRemote";
|
||||
deviceUri = "ipp://server/printers/DeskjetLocal";
|
||||
model = "drv:///sample.drv/deskjet.ppd";
|
||||
}
|
||||
{
|
||||
name = "DeskjetRemote2";
|
||||
deviceUri = "ipp://server/printers/DeskjetLocal";
|
||||
model = "drv:///sample.drv/deskjet.ppd";
|
||||
}
|
||||
];
|
||||
hardware.printers.ensureClasses = {
|
||||
Basement = {
|
||||
description = "All the printers in my basement";
|
||||
location = "Floor 0";
|
||||
printers = [ "DeskjetRemote" ];
|
||||
};
|
||||
House = {
|
||||
description = "All the printers in my house";
|
||||
location = "Home";
|
||||
printers = [
|
||||
"DeskjetRemote"
|
||||
"DeskjetRemote2"
|
||||
];
|
||||
};
|
||||
};
|
||||
hardware.printers.ensureDefaultPrinter = "DeskjetRemote";
|
||||
};
|
||||
|
||||
@@ -67,12 +87,14 @@ in
|
||||
|
||||
start_all()
|
||||
|
||||
with subtest("Make sure that cups is up on both sides and printers are set up"):
|
||||
server.wait_for_unit("ensure-printers.service")
|
||||
client.wait_for_unit("ensure-printers.service")
|
||||
with subtest("Make sure that cups is up on both sides"):
|
||||
server.wait_for_unit("cups.${if socket then "socket" else "service"}")
|
||||
client.wait_for_unit("cups.${if socket then "socket" else "service"}")
|
||||
|
||||
assert "scheduler is running" in client.succeed("lpstat -r")
|
||||
|
||||
client.wait_until_succeeds("journalctl -u cups.service --grep 'CUPS provisioning complete'")
|
||||
|
||||
with subtest("UNIX socket is used for connections"):
|
||||
assert "/var/run/cups/cups.sock" in client.succeed("lpstat -H")
|
||||
|
||||
@@ -82,7 +104,14 @@ in
|
||||
server.fail(f"curl --fail --connect-timeout 2 http://{client.name}:631/")
|
||||
|
||||
with subtest("LP status checks"):
|
||||
assert "DeskjetRemote accepting requests" in client.succeed("lpstat -a")
|
||||
lpstat = client.succeed("lpstat -a")
|
||||
assert all([
|
||||
"DeskjetRemote accepting requests" in lpstat,
|
||||
"DeskjetRemote2 accepting requests" in lpstat,
|
||||
"Basement accepting requests" in lpstat,
|
||||
"House accepting requests" in lpstat,
|
||||
])
|
||||
|
||||
assert "DeskjetLocal accepting requests" in client.succeed(
|
||||
f"lpstat -h {server.name}:631 -a"
|
||||
)
|
||||
|
||||
@@ -4,12 +4,8 @@
|
||||
package,
|
||||
...
|
||||
}:
|
||||
let
|
||||
mkTestName =
|
||||
pkg: "${pkg.pname}_${builtins.replaceStrings [ "." ] [ "" ] (lib.versions.majorMinor pkg.version)}";
|
||||
in
|
||||
{
|
||||
name = mkTestName package;
|
||||
name = package.pname;
|
||||
meta.maintainers = lib.teams.redis.members;
|
||||
|
||||
nodes = {
|
||||
|
||||
@@ -314,4 +314,47 @@ in
|
||||
exit(1)
|
||||
'';
|
||||
};
|
||||
|
||||
zfs-mount-generator = runTest {
|
||||
name = "zfs-mount-generator";
|
||||
nodes.machine =
|
||||
{ ... }:
|
||||
{
|
||||
boot.supportedFilesystems = [ "zfs" ];
|
||||
networking.hostId = "00000000";
|
||||
virtualisation = {
|
||||
emptyDiskImages = [ 4096 ];
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
from datetime import timedelta
|
||||
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
|
||||
machine.succeed(
|
||||
"zpool create -O mountpoint=none test /dev/vdb",
|
||||
|
||||
# Enable list caching for the test pool.
|
||||
"mkdir /etc/zfs/zfs-list.cache",
|
||||
"touch /etc/zfs/zfs-list.cache/test",
|
||||
|
||||
# Trigger the zedlet.
|
||||
"zfs create -o mountpoint=/tmp/foo test/foo",
|
||||
)
|
||||
|
||||
# Wait for the zedlet to update the cache with the new dataset.
|
||||
machine.wait_until_succeeds(
|
||||
"grep -F test/foo /etc/zfs/zfs-list.cache/test",
|
||||
timeout=timedelta(seconds=120)
|
||||
)
|
||||
|
||||
machine.succeed(
|
||||
# Rerun systemd generators.
|
||||
"systemctl daemon-reload",
|
||||
"systemctl cat tmp-foo.mount | grep zfs-mount-generator",
|
||||
"systemctl is-active tmp-foo.mount",
|
||||
)
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1175,8 +1175,8 @@ let
|
||||
mktplcRef = {
|
||||
publisher = "DanielGavin";
|
||||
name = "ols";
|
||||
version = "0.1.46";
|
||||
hash = "sha256-X2Tp0rsPp0UoKW4Yz7Ht/7b1zO0bL92u6CtyKRy+hDY=";
|
||||
version = "0.1.47";
|
||||
hash = "sha256-qv+rMLcLTTw0zCDd87v2om96N8GhokrePdqXgRYWRe0=";
|
||||
};
|
||||
meta = {
|
||||
description = "Visual Studio Code extension for Odin language";
|
||||
@@ -2768,8 +2768,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "magit";
|
||||
publisher = "kahole";
|
||||
version = "0.6.69";
|
||||
hash = "sha256-gx7OWV+X17XqShFj0mH4Zg6X26vpOnkrYW8/YdeGd7c=";
|
||||
version = "0.6.70";
|
||||
hash = "sha256-j/AyPp9pHocM9KXPKxsdCVTNiEHwZ7kWXymiHpv+ZmY=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/kahole.magit/changelog";
|
||||
@@ -3854,8 +3854,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "pico8-ls";
|
||||
publisher = "PollywogGames";
|
||||
version = "0.6.1";
|
||||
hash = "sha256-TlULqIKb3R+bvjN3f4Bwha0bewqCHpPVFiePHNV2kmE=";
|
||||
version = "0.7.0";
|
||||
hash = "sha256-2e28Z4o76f0G52fzqHNqFnBk88426cRfUyiaW1jmeMc=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/PollywogGames.pico8-ls/changelog";
|
||||
|
||||
@@ -12,22 +12,22 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
sources = {
|
||||
"x86_64-linux" = {
|
||||
arch = "linux-x64";
|
||||
hash = "sha256-bPD6uYNN1YD7hVco+otWibIHnr83Ve5/LM+a40CXTY8=";
|
||||
hash = "sha256-Uym2S4NN78yUDQdg1qFednfYT5K6AkQfBOmDp3fFGoc=";
|
||||
};
|
||||
"aarch64-linux" = {
|
||||
arch = "linux-arm64";
|
||||
hash = "sha256-ySNbdFihPpC14Y4kIRCDu2qz3sgdl8dlmiS5xXIYCX8=";
|
||||
hash = "sha256-tB6Z/rXYYLo/SsPLQiaQZ6KUJZhh+aiYaBMpJz0wbtk=";
|
||||
};
|
||||
"aarch64-darwin" = {
|
||||
arch = "darwin-arm64";
|
||||
hash = "sha256-rUmRhs9qRqNFfpsQCmT+Cxbc9m2PQjd4032OcR2sB78=";
|
||||
hash = "sha256-IicI0BbpGBDw+tGFlbefXA1iSPQZNLj/n0nv6zEGkHA=";
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
publisher = "kilocode";
|
||||
name = "Kilo-Code";
|
||||
version = "7.5.9";
|
||||
version = "7.6.2";
|
||||
}
|
||||
// sources.${stdenv.hostPlatform.system}
|
||||
or (throw "Unsupported system ${stdenv.hostPlatform.system}");
|
||||
|
||||
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-thunder-client";
|
||||
publisher = "rangav";
|
||||
version = "2.41.1";
|
||||
hash = "sha256-BLR5z5KttJt1wQOqDVyPRRNagoBihAeEdbBnHps7yhg=";
|
||||
version = "2.41.3";
|
||||
hash = "sha256-bglCE7gW9maAWv1pBbSXKTttdmB0K0w/VotolcUrkH8=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -83,7 +83,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gimp";
|
||||
version = "3.2.4";
|
||||
version = "3.2.6";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.gimp.org/gimp/v${lib.versions.majorMinor finalAttrs.version}/gimp-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-cxK8U+nG0tAFbKe5PxxrmHB5Rt2TT3FMIbh0bstgFYg=";
|
||||
hash = "sha256-QLFekK0MDGMbdto8Rn6phH+lwk83QTrFtJKASGCijNg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -191,6 +191,8 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl { inherit (archive) url sha256; };
|
||||
|
||||
sourceRoot = lib.optionalString stdenv.hostPlatform.isDarwin "${darwinApp}.app";
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
dontPatchELF = true;
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
"chromium": {
|
||||
"version": "153.0.8010.36",
|
||||
"version": "153.0.8010.47",
|
||||
"chromedriver": {
|
||||
"version": "153.0.8010.37",
|
||||
"hash_darwin": "sha256-IMyEnUmK3slNB/QDZ+vtUyzHyU0AB+L6+BMbpCRluYA=",
|
||||
"hash_darwin_aarch64": "sha256-cd1ZWatLQFIkPtCdVacrxFaFfj3rjG9qJ7kGlL3C6OA="
|
||||
"version": "153.0.8010.48",
|
||||
"hash_darwin": "sha256-/4yv3KWuvKNAro9oeK+PFsTOrg878yS11aDYSX5S890=",
|
||||
"hash_darwin_aarch64": "sha256-5eO1WwJ8iQrXUjHb776Z1YahR/A8aCoX7JrJXQEcIQ8="
|
||||
},
|
||||
"deps": {
|
||||
"depot_tools": {
|
||||
@@ -21,8 +21,8 @@
|
||||
"DEPS": {
|
||||
"src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git",
|
||||
"rev": "507c6ee3e2f3b2ca0e660547e5b9ea4820c67f4c",
|
||||
"hash": "sha256-q29a3PWQ7wMG4/JL9EyCK7EaDCeG+4Q/ruemOvvgeZM=",
|
||||
"rev": "73934a44f61e6b3878d1943064c141a5a820f5f7",
|
||||
"hash": "sha256-D7Oqukze3CzYVWN9AQq9zN6HN2GcZ6b7ZSqhM5bjvUU=",
|
||||
"recompress": true
|
||||
},
|
||||
"src/third_party/clang-format/script": {
|
||||
@@ -92,8 +92,8 @@
|
||||
},
|
||||
"src/third_party/angle": {
|
||||
"url": "https://chromium.googlesource.com/angle/angle.git",
|
||||
"rev": "fca5efdfeff5daf430bc4458375c8d6b7e457400",
|
||||
"hash": "sha256-IoHQfdjZ6TV03VVzHZcxhPqGmNYNhKZrPG4BvQQfC7c="
|
||||
"rev": "ed04c8113c6538f3e1264042da8cb4afd100369b",
|
||||
"hash": "sha256-mZrVJ/P3tPoiSkGBH4fEjNAexLsjAzts8jjkCQZ4kOs="
|
||||
},
|
||||
"src/third_party/angle/third_party/glmark2/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
|
||||
@@ -132,8 +132,8 @@
|
||||
},
|
||||
"src/third_party/dawn": {
|
||||
"url": "https://dawn.googlesource.com/dawn.git",
|
||||
"rev": "225a7ba1bcb997d26de3e894e04fb341638e8c5a",
|
||||
"hash": "sha256-/ic1j1gu2wl5wCLCESfEcsLAPU5Dmsx8oKFb6RhYzg4="
|
||||
"rev": "28ffc61fc935c599677cff4dddfa4a12209ce500",
|
||||
"hash": "sha256-6ySDyyQs/nfFF9AeoUY57GYDx7V8b0GQ17PCwQkzZVk="
|
||||
},
|
||||
"src/third_party/dawn/third_party/glfw3/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
|
||||
@@ -632,8 +632,8 @@
|
||||
},
|
||||
"src/third_party/pthreadpool/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git",
|
||||
"rev": "02460584c6092e527c8b89f7df4de143d70e801f",
|
||||
"hash": "sha256-4EHJzZT+Gbhs8SkOhjSvDIPEqIQU93oJmtF3c/T+qjw="
|
||||
"rev": "15a6644ba1c45f1acc16ac1e883efc3e56c6bed2",
|
||||
"hash": "sha256-YJD9n8cxoqTrTQJHKuZFW2qnlNcNmh5rQlBpnlF46to="
|
||||
},
|
||||
"src/third_party/pyelftools": {
|
||||
"url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git",
|
||||
@@ -672,8 +672,8 @@
|
||||
},
|
||||
"src/third_party/skia": {
|
||||
"url": "https://skia.googlesource.com/skia.git",
|
||||
"rev": "4f574af2444846ceca4d277a8095c5d4229d175f",
|
||||
"hash": "sha256-HrpA4labNWXPWj/yiS9O8KjdQPwJOllmR5r66TwCjB0="
|
||||
"rev": "fca11a08da7c1ed3777b40b31611961c85c63c43",
|
||||
"hash": "sha256-iQNNgvRVUuyAcSVE+pNJWrWz0NJd/MZLxd9vbYztong="
|
||||
},
|
||||
"src/third_party/smhasher/src": {
|
||||
"url": "https://chromium.googlesource.com/external/smhasher.git",
|
||||
@@ -842,8 +842,8 @@
|
||||
},
|
||||
"src/v8": {
|
||||
"url": "https://chromium.googlesource.com/v8/v8.git",
|
||||
"rev": "f343157cebb388bfa416baccb5d35507e6fe8cc7",
|
||||
"hash": "sha256-zSCyFQpDMNygmV6N4TajL8VB5+VRynrMPV/wAiWsJO4="
|
||||
"rev": "6b96683d44174e78ff4e65cb274bad56dc108231",
|
||||
"hash": "sha256-Oa1wzIbWVPX0x7adJVPUxQocK5gofG0vE56QTg0XKCs="
|
||||
},
|
||||
"src/agents/shared": {
|
||||
"url": "https://chromium.googlesource.com/chromium/agents.git",
|
||||
@@ -853,7 +853,7 @@
|
||||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "153.0.8010.36",
|
||||
"version": "153.0.8010.47",
|
||||
"deps": {
|
||||
"depot_tools": {
|
||||
"rev": "6411ed52842756261c66b6b8ece6b53ade2570f1",
|
||||
@@ -865,16 +865,16 @@
|
||||
"hash": "sha256-qvQ13Ws2tb4i2Hdu34kBHivYPAn8w06zjLdQgK4BIJg="
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "153.0.8010.36-1",
|
||||
"hash": "sha256-JyvizS0oJC8J6VhtnpTKUGVbc31KCvTvwa4TmO+CHaY="
|
||||
"rev": "153.0.8010.47-1",
|
||||
"hash": "sha256-J/IiNmqJzL35TfiGbsqrXnI8lUizCWuxzVBHgo7cG80="
|
||||
},
|
||||
"npmHash": "sha256-pF0JtwFpPC4/fodbhSJnQKkczA9WlDg4VqEAy9aDVLg="
|
||||
},
|
||||
"DEPS": {
|
||||
"src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git",
|
||||
"rev": "507c6ee3e2f3b2ca0e660547e5b9ea4820c67f4c",
|
||||
"hash": "sha256-q29a3PWQ7wMG4/JL9EyCK7EaDCeG+4Q/ruemOvvgeZM=",
|
||||
"rev": "73934a44f61e6b3878d1943064c141a5a820f5f7",
|
||||
"hash": "sha256-D7Oqukze3CzYVWN9AQq9zN6HN2GcZ6b7ZSqhM5bjvUU=",
|
||||
"recompress": true
|
||||
},
|
||||
"src/third_party/clang-format/script": {
|
||||
@@ -944,8 +944,8 @@
|
||||
},
|
||||
"src/third_party/angle": {
|
||||
"url": "https://chromium.googlesource.com/angle/angle.git",
|
||||
"rev": "fca5efdfeff5daf430bc4458375c8d6b7e457400",
|
||||
"hash": "sha256-IoHQfdjZ6TV03VVzHZcxhPqGmNYNhKZrPG4BvQQfC7c="
|
||||
"rev": "ed04c8113c6538f3e1264042da8cb4afd100369b",
|
||||
"hash": "sha256-mZrVJ/P3tPoiSkGBH4fEjNAexLsjAzts8jjkCQZ4kOs="
|
||||
},
|
||||
"src/third_party/angle/third_party/glmark2/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
|
||||
@@ -984,8 +984,8 @@
|
||||
},
|
||||
"src/third_party/dawn": {
|
||||
"url": "https://dawn.googlesource.com/dawn.git",
|
||||
"rev": "225a7ba1bcb997d26de3e894e04fb341638e8c5a",
|
||||
"hash": "sha256-/ic1j1gu2wl5wCLCESfEcsLAPU5Dmsx8oKFb6RhYzg4="
|
||||
"rev": "28ffc61fc935c599677cff4dddfa4a12209ce500",
|
||||
"hash": "sha256-6ySDyyQs/nfFF9AeoUY57GYDx7V8b0GQ17PCwQkzZVk="
|
||||
},
|
||||
"src/third_party/dawn/third_party/glfw3/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
|
||||
@@ -1484,8 +1484,8 @@
|
||||
},
|
||||
"src/third_party/pthreadpool/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git",
|
||||
"rev": "02460584c6092e527c8b89f7df4de143d70e801f",
|
||||
"hash": "sha256-4EHJzZT+Gbhs8SkOhjSvDIPEqIQU93oJmtF3c/T+qjw="
|
||||
"rev": "15a6644ba1c45f1acc16ac1e883efc3e56c6bed2",
|
||||
"hash": "sha256-YJD9n8cxoqTrTQJHKuZFW2qnlNcNmh5rQlBpnlF46to="
|
||||
},
|
||||
"src/third_party/pyelftools": {
|
||||
"url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git",
|
||||
@@ -1524,8 +1524,8 @@
|
||||
},
|
||||
"src/third_party/skia": {
|
||||
"url": "https://skia.googlesource.com/skia.git",
|
||||
"rev": "4f574af2444846ceca4d277a8095c5d4229d175f",
|
||||
"hash": "sha256-HrpA4labNWXPWj/yiS9O8KjdQPwJOllmR5r66TwCjB0="
|
||||
"rev": "fca11a08da7c1ed3777b40b31611961c85c63c43",
|
||||
"hash": "sha256-iQNNgvRVUuyAcSVE+pNJWrWz0NJd/MZLxd9vbYztong="
|
||||
},
|
||||
"src/third_party/smhasher/src": {
|
||||
"url": "https://chromium.googlesource.com/external/smhasher.git",
|
||||
@@ -1694,8 +1694,8 @@
|
||||
},
|
||||
"src/v8": {
|
||||
"url": "https://chromium.googlesource.com/v8/v8.git",
|
||||
"rev": "f343157cebb388bfa416baccb5d35507e6fe8cc7",
|
||||
"hash": "sha256-zSCyFQpDMNygmV6N4TajL8VB5+VRynrMPV/wAiWsJO4="
|
||||
"rev": "6b96683d44174e78ff4e65cb274bad56dc108231",
|
||||
"hash": "sha256-Oa1wzIbWVPX0x7adJVPUxQocK5gofG0vE56QTg0XKCs="
|
||||
},
|
||||
"src/agents/shared": {
|
||||
"url": "https://chromium.googlesource.com/chromium/agents.git",
|
||||
|
||||
@@ -200,13 +200,13 @@
|
||||
"vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk="
|
||||
},
|
||||
"clevercloud_clevercloud": {
|
||||
"hash": "sha256-maiL06qwhjIjNxyHRRke4x0YrrPB61xFf2Cafl4s5+0=",
|
||||
"hash": "sha256-JVdhdMFjwlB02KwmRe8JEKF9gefck9L9VqrW0xzvhWs=",
|
||||
"homepage": "https://registry.terraform.io/providers/clevercloud/clevercloud",
|
||||
"owner": "CleverCloud",
|
||||
"repo": "terraform-provider-clevercloud",
|
||||
"rev": "v2.1.0",
|
||||
"rev": "v2.2.0",
|
||||
"spdx": "Apache-2.0",
|
||||
"vendorHash": "sha256-R3w7olc94QJuMk62bfvuM9aU+KlmNTUhojl/j9gmHjk="
|
||||
"vendorHash": "sha256-AB6VVC/I5E+CoHvdww38gXlHJ9yh4t5jV6ZrvDDTQeE="
|
||||
},
|
||||
"cloudamqp_cloudamqp": {
|
||||
"hash": "sha256-GMfBdLUqw/3WEtZfP6ShCEwheHeUa/1EDMzIuYGalvA=",
|
||||
@@ -589,11 +589,11 @@
|
||||
"vendorHash": "sha256-gv54RqpkWri5yL40ajcLnqzF0XvMEzFoFEEV2/g1paE="
|
||||
},
|
||||
"hashicorp_google": {
|
||||
"hash": "sha256-IpwIlUZtB0PQ2EQnfY2bKN9w7KQ0WrWLQhEmo79L1yw=",
|
||||
"hash": "sha256-saCI+FFwPZSkofk3C3GxvR2SB+9Hajo1WRwG4iTTfD0=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-google",
|
||||
"rev": "v8.1.0",
|
||||
"rev": "v8.2.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-EikYOTTTkj5E82xza6nYvd1AWFg8fzo1ka2umc+25/k="
|
||||
},
|
||||
@@ -833,13 +833,13 @@
|
||||
"vendorHash": "sha256-xzYkFRBLKGF8lf9vDG/dx4Qel6uGN1XpQLFrpVX2HWo="
|
||||
},
|
||||
"kislerdm_neon": {
|
||||
"hash": "sha256-FdC0WBN9jZsLud0QRiKJkQQI9aPxYhyyLNaxRXPp08Q=",
|
||||
"hash": "sha256-eK7e4iVdoHQaCYbuT4rtyBmOt/HPRot4iDB1TKds4M4=",
|
||||
"homepage": "https://registry.terraform.io/providers/kislerdm/neon",
|
||||
"owner": "kislerdm",
|
||||
"repo": "terraform-provider-neon",
|
||||
"rev": "v0.15.0",
|
||||
"rev": "v0.18.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-7mJ+BX7laBKsr4DX1keMXnGi79CZp8M1jD0COQ1lcmU="
|
||||
"vendorHash": "sha256-i+IPEj4ejYQR9ozkmTv/F4HAqd8m0aTA7nXzDewwBig="
|
||||
},
|
||||
"kreuzwerker_docker": {
|
||||
"hash": "sha256-oNJAmoSV6a29LG4dY217CVtthxBsG9b1JAaCreAFgDY=",
|
||||
@@ -1139,13 +1139,13 @@
|
||||
"vendorHash": "sha256-L1wufPa7LPPyOPTL+jFQgiWzJoJYS+fCdw3N0KZqKtc="
|
||||
},
|
||||
"rancher_rancher2": {
|
||||
"hash": "sha256-OFLEDwDDD02FKMldpkRxbj2gRQzhmVb2+3dG3Hq2AG4=",
|
||||
"hash": "sha256-nt18dj5M2yh+AFG0KAv3v49OZELF92l8zvtqfJApw/s=",
|
||||
"homepage": "https://registry.terraform.io/providers/rancher/rancher2",
|
||||
"owner": "rancher",
|
||||
"repo": "terraform-provider-rancher2",
|
||||
"rev": "v14.1.1",
|
||||
"rev": "v15.1.2",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-WpI4OZ7BUVgHwQY+7ct+K6CnwXFFuiRbI+iTFSJ8a5A="
|
||||
"vendorHash": "sha256-6M6jTrukO0VhyZRdYbbICm22upbGyOkUSuHqMLTPcEM="
|
||||
},
|
||||
"rootlyhq_rootly": {
|
||||
"hash": "sha256-wfwqPk5D3D3PwzOfA9i6qxaAmN84MjHiNAablIX9iKg=",
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
libjpeg,
|
||||
openssl,
|
||||
libopus,
|
||||
ffmpeg_6,
|
||||
ffmpeg,
|
||||
openh264,
|
||||
crc32c,
|
||||
libvpx,
|
||||
@@ -70,7 +70,7 @@ stdenv.mkDerivation {
|
||||
libjpeg
|
||||
openssl
|
||||
libopus
|
||||
ffmpeg_6
|
||||
ffmpeg
|
||||
openh264
|
||||
crc32c
|
||||
libvpx
|
||||
|
||||
@@ -104,6 +104,7 @@ in
|
||||
src ? null,
|
||||
hash ? "",
|
||||
sha256 ? "",
|
||||
mirrorUrl ? null,
|
||||
...
|
||||
}@args:
|
||||
let
|
||||
@@ -148,7 +149,9 @@ in
|
||||
|
||||
yarnLock=''${yarnLock:=$PWD/yarn.lock}
|
||||
mkdir -p $out
|
||||
(cd $out; prefetch-yarn-deps --verbose --builder $yarnLock)
|
||||
(cd $out; prefetch-yarn-deps --verbose --builder $yarnLock ${
|
||||
lib.optionalString (mirrorUrl != null) "--mirrorUrl ${lib.escapeShellArg mirrorUrl}"
|
||||
})
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
@@ -161,6 +164,7 @@ in
|
||||
"name"
|
||||
"hash"
|
||||
"sha256"
|
||||
"mirrorUrl"
|
||||
]
|
||||
++ (lib.optional (src == null) "src")
|
||||
))
|
||||
|
||||
@@ -21,15 +21,27 @@ const exec = async (...args) => {
|
||||
return res
|
||||
}
|
||||
|
||||
const downloadFileHttps = (fileName, url, expectedHash, verbose, hashType = 'sha1') => {
|
||||
const yarnRegistryUrl = 'https://registry.yarnpkg.com/';
|
||||
|
||||
function ensureTrailingSlash(str) {
|
||||
return str.endsWith('/') ? str : str + '/';
|
||||
}
|
||||
|
||||
const downloadFileHttps = (fileName, url, expectedHash, verbose, hashType = 'sha1', mirrorRegistryUrl = null) => {
|
||||
|
||||
const registryUrl =
|
||||
mirrorRegistryUrl && url.startsWith(yarnRegistryUrl)
|
||||
? url.replace(yarnRegistryUrl, ensureTrailingSlash(mirrorRegistryUrl))
|
||||
: url;
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
const get = (url, redirects = 0) => https.get(url, (res) => {
|
||||
const get = (registryUrl, redirects = 0) => https.get(registryUrl, (res) => {
|
||||
if(redirects > 10) {
|
||||
reject('Too many redirects!');
|
||||
return;
|
||||
}
|
||||
if(res.statusCode === 301 || res.statusCode === 302) {
|
||||
const location = new URL(res.headers.location, url);
|
||||
const location = new URL(res.headers.location, registryUrl);
|
||||
if (verbose) console.log('following redirect to ' + location);
|
||||
return get(location, redirects + 1);
|
||||
}
|
||||
@@ -41,13 +53,13 @@ const downloadFileHttps = (fileName, url, expectedHash, verbose, hashType = 'sha
|
||||
file.close()
|
||||
const h = hash.read()
|
||||
if (expectedHash === undefined){
|
||||
console.log(`Warning: lockfile url ${url} doesn't end in "#<hash>" to validate against. Downloaded file had hash ${h}.`);
|
||||
} else if (h != expectedHash) return reject(new Error(`hash mismatch, expected ${expectedHash}, got ${h} for ${url}`))
|
||||
console.log(`Warning: lockfile url ${registryUrl} doesn't end in "#<hash>" to validate against. Downloaded file had hash ${h}.`);
|
||||
} else if (h != expectedHash) return reject(new Error(`hash mismatch, expected ${expectedHash}, got ${h} for ${registryUrl}`))
|
||||
resolve()
|
||||
})
|
||||
res.on('error', e => reject(e))
|
||||
})
|
||||
get(url)
|
||||
get(registryUrl)
|
||||
})
|
||||
}
|
||||
|
||||
@@ -90,7 +102,7 @@ const isGitUrl = pattern => {
|
||||
return false
|
||||
}
|
||||
|
||||
const downloadPkg = (pkg, verbose) => {
|
||||
const downloadPkg = (pkg, verbose, mirrorUrl = null) => {
|
||||
for (let marker of ['@file:', '@link:']) {
|
||||
const split = pkg.key.split(marker)
|
||||
if (split.length == 2) {
|
||||
@@ -122,9 +134,9 @@ const downloadPkg = (pkg, verbose) => {
|
||||
} else if (url.startsWith('https://')) {
|
||||
if (typeof pkg.integrity === 'string' || pkg.integrity instanceof String) {
|
||||
const [ type, checksum ] = pkg.integrity.split('-')
|
||||
return downloadFileHttps(fileName, url, Buffer.from(checksum, 'base64').toString('hex'), verbose, type)
|
||||
return downloadFileHttps(fileName, url, Buffer.from(checksum, 'base64').toString('hex'), verbose, type, mirrorUrl)
|
||||
}
|
||||
return downloadFileHttps(fileName, url, hash, verbose)
|
||||
return downloadFileHttps(fileName, url, hash, verbose, 'sha1', mirrorUrl)
|
||||
} else if (url.startsWith('file:')) {
|
||||
console.warn(`ignoring unsupported file:path url "${url}"`)
|
||||
} else {
|
||||
@@ -155,11 +167,11 @@ const uniqueBy = (arr, callback) => {
|
||||
return [...map.values()]
|
||||
}
|
||||
|
||||
const prefetchYarnDeps = async (lockContents, verbose) => {
|
||||
const prefetchYarnDeps = async (lockContents, verbose, mirrorUrl) => {
|
||||
const lockData = lockfile.parse(lockContents)
|
||||
await performParallel(
|
||||
uniqueBy(Object.entries(lockData.object), ([_, value]) => value.resolved)
|
||||
.map(([key, value]) => () => downloadPkg({ key, ...value }, verbose))
|
||||
.map(([key, value]) => () => downloadPkg({ key, ...value }, verbose, mirrorUrl))
|
||||
)
|
||||
await fs.promises.writeFile('yarn.lock', lockContents)
|
||||
if (verbose) console.log('Done')
|
||||
@@ -173,18 +185,23 @@ Options:
|
||||
-h --help Show this help
|
||||
-v --verbose Verbose output
|
||||
--builder Only perform the download to current directory, then exit
|
||||
--mirrorUrl <url> Use the given registry mirror URL in place of the default
|
||||
yarn registry (${yarnRegistryUrl})
|
||||
`)
|
||||
process.exit(1)
|
||||
}
|
||||
|
||||
const main = async () => {
|
||||
const args = process.argv.slice(2)
|
||||
let next, lockFile, verbose, isBuilder
|
||||
let next, lockFile, verbose, isBuilder, mirrorUrl
|
||||
while (next = args.shift()) {
|
||||
if (next == '--builder') {
|
||||
isBuilder = true
|
||||
} else if (next == '--verbose' || next == '-v') {
|
||||
verbose = true
|
||||
} else if (next == '--mirrorUrl') {
|
||||
mirrorUrl = args.shift()
|
||||
if (!mirrorUrl) showUsage()
|
||||
} else if (next == '--help' || next == '-h') {
|
||||
showUsage()
|
||||
} else if (!lockFile) {
|
||||
@@ -201,13 +218,13 @@ const main = async () => {
|
||||
}
|
||||
|
||||
if (isBuilder) {
|
||||
await prefetchYarnDeps(lockContents, verbose)
|
||||
await prefetchYarnDeps(lockContents, verbose, mirrorUrl)
|
||||
} else {
|
||||
const { stdout: tmpDir } = await exec('mktemp', [ '-d' ])
|
||||
|
||||
try {
|
||||
process.chdir(tmpDir.trim())
|
||||
await prefetchYarnDeps(lockContents, verbose)
|
||||
await prefetchYarnDeps(lockContents, verbose, mirrorUrl)
|
||||
const { stdout: hash } = await exec('nix-hash', [ '--type', 'sha256', '--base32', tmpDir.trim() ])
|
||||
console.log(hash)
|
||||
} finally {
|
||||
|
||||
@@ -9,6 +9,11 @@
|
||||
yarnLock = ./simple.lock;
|
||||
sha256 = "sha256-FRrt8BixleILmFB2ZV8RgPNLqgS+dlH5nWoPgeaaNQ8=";
|
||||
};
|
||||
mirrorUrl = testers.invalidateFetcherByDrvHash fetchYarnDeps {
|
||||
yarnLock = ./simple.lock;
|
||||
mirrorUrl = "https://registry.npmjs.com/";
|
||||
sha256 = "sha256-FRrt8BixleILmFB2ZV8RgPNLqgS+dlH5nWoPgeaaNQ8=";
|
||||
};
|
||||
gitDep = testers.invalidateFetcherByDrvHash fetchYarnDeps {
|
||||
yarnLock = ./git.lock;
|
||||
sha256 = "sha256-f90IiEzHDiBdswWewRBHcJfqqpPipaMg8N0DVLq2e8Q=";
|
||||
|
||||
@@ -8,17 +8,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "abtop";
|
||||
version = "0.5.3";
|
||||
version = "0.5.5";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "graykode";
|
||||
repo = "abtop";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-LvN+q7JwmvtbroocoRBEug/J5OZTXwHEPAiaRkj16lM=";
|
||||
hash = "sha256-8dBAdaZ6SkSSktmk/KejnTJDikEQj1jBQ2LoiK54Pzk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-o5ZHURx+OAQkd7S0TzkLQG5ZsR5HMaqfl8sp639axbg=";
|
||||
cargoHash = "sha256-EGx/k79B5ceC8/EFfVH9HtZUedkRNsV74vdyAPxh8ro=";
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
148
pkgs/by-name/ar/archisteamfarm/deps.json
generated
148
pkgs/by-name/ar/archisteamfarm/deps.json
generated
@@ -1,8 +1,8 @@
|
||||
[
|
||||
{
|
||||
"pname": "AngleSharp",
|
||||
"version": "1.5.2",
|
||||
"hash": "sha256-81rDtnwvR0SDXNNUnPirWIa782gwkgRlz1Fbzm2ywwc="
|
||||
"version": "1.7.1",
|
||||
"hash": "sha256-GH/AJ8aNoPixvsUIeTRvZH5T9rmQV+dk1QnpLBz/tGc="
|
||||
},
|
||||
{
|
||||
"pname": "CryptSharpStandard",
|
||||
@@ -291,8 +291,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.OpenApi",
|
||||
"version": "10.0.10",
|
||||
"hash": "sha256-Mbr8+mzZKu3iq5R4TbNY8r39bZI34SWWd7DfUHg2ETk="
|
||||
"version": "10.0.11",
|
||||
"hash": "sha256-RwBH8PntKXwmHFtitnqTTmry1C8hLT+vlDCAjSC0PxQ="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Bcl.Cryptography",
|
||||
@@ -406,23 +406,23 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.IdentityModel.Abstractions",
|
||||
"version": "8.19.2",
|
||||
"hash": "sha256-vNGK6u6V+S0MIaYTg+sSkRF4XUjM1K+cKuR1a9aRCLs="
|
||||
"version": "8.22.0",
|
||||
"hash": "sha256-7bBFHdYh/nftSX7dodUj17SB0jb2hmumyYihn53kZAw="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.IdentityModel.JsonWebTokens",
|
||||
"version": "8.19.2",
|
||||
"hash": "sha256-j9ai0NrgytDsfQiIijp1Ib4jRGX9lgREQBoE6XW9SOc="
|
||||
"version": "8.22.0",
|
||||
"hash": "sha256-8TW85/8cHUZaQrVb68YYzvF3m6l20acJ+JCOoAP0FRI="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.IdentityModel.Logging",
|
||||
"version": "8.19.2",
|
||||
"hash": "sha256-ja8PAYUNwlfIrkL6EOuZ7SgZfRJwIORGG/ETDD1BtRE="
|
||||
"version": "8.22.0",
|
||||
"hash": "sha256-yUuLjrNf/kqVf1W2txx2GKc0tqM6IqOlcJkno8pVhP8="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.IdentityModel.Tokens",
|
||||
"version": "8.19.2",
|
||||
"hash": "sha256-POi3SzcK3+iB3104wXYh3ooVD1GbltwTUf+KMj//UYU="
|
||||
"version": "8.22.0",
|
||||
"hash": "sha256-cI3VoDGdlniZL4xsq03h599bDLu+8tlQE9PbbSzhq8k="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NET.Test.Sdk",
|
||||
@@ -431,8 +431,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.OpenApi",
|
||||
"version": "2.0.0",
|
||||
"hash": "sha256-8eiM3Mx4Hx1etx52RlczoHG2z9XIpWgu2LQtWSt086k="
|
||||
"version": "2.7.5",
|
||||
"hash": "sha256-oYeR/8toy23G+YbVWfJUdMHPKdbfaYU2+0sQ9TIX0yA="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Testing.Extensions.CodeCoverage",
|
||||
@@ -441,23 +441,23 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Testing.Extensions.Telemetry",
|
||||
"version": "2.3.2",
|
||||
"hash": "sha256-3TancCfYy7OW9IU6q+zQv/ETlbBbcjxADrWVRQITytc="
|
||||
"version": "2.3.3",
|
||||
"hash": "sha256-Doo1IAwnDlbqyg2Q6p82RuYYAQ7VkJnY4Pn9MDZqCOs="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Testing.Extensions.TrxReport",
|
||||
"version": "2.3.2",
|
||||
"hash": "sha256-YMuc6dHVBpP8vk/qBQcO0MXeelpcrr9Wgnpvwi2xEv0="
|
||||
"version": "2.3.3",
|
||||
"hash": "sha256-dN4W3c1v644WISanxnyg9JJ7upbYDzoSzBWAzipV+/U="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Testing.Extensions.TrxReport.Abstractions",
|
||||
"version": "2.3.2",
|
||||
"hash": "sha256-MohDLqtLk1K93p1TnvYlaBNetpGoTZSep3xVQho3zb0="
|
||||
"version": "2.3.3",
|
||||
"hash": "sha256-YAgHS3B0LwRvIHer285QuSrYCO5FcSpAXazL5pNHB4Y="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Testing.Extensions.VSTestBridge",
|
||||
"version": "2.3.2",
|
||||
"hash": "sha256-9W4FmGvIfuwHQr3AFrCZ/uLhtJws5erQccw7ydT5yBU="
|
||||
"version": "2.3.3",
|
||||
"hash": "sha256-/UlwUEIwQyNZxdD0jNcV34ZJ20aLe2kWQTvH3LOIHes="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Testing.Platform",
|
||||
@@ -466,13 +466,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Testing.Platform",
|
||||
"version": "2.3.2",
|
||||
"hash": "sha256-kGOyHXenLNMpWyVTDWDh6/hP3qFtnHI5qIaet1udKWM="
|
||||
"version": "2.3.3",
|
||||
"hash": "sha256-sH0AyrX0ny0JgVkgRLrvPXIKB55pQWAcd5AERYSzF0o="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Testing.Platform.MSBuild",
|
||||
"version": "2.3.2",
|
||||
"hash": "sha256-u0jsv5BU7gSBZlHoy94WlqM0QCJCFbEW1g19RxKn17Q="
|
||||
"version": "2.3.3",
|
||||
"hash": "sha256-JeU3+8OebODA2k6KSorm2P7piuQZRdS1hhJKAwdfSJA="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.TestPlatform.ObjectModel",
|
||||
@@ -486,23 +486,23 @@
|
||||
},
|
||||
{
|
||||
"pname": "MSTest",
|
||||
"version": "4.3.2",
|
||||
"hash": "sha256-wuyrsPndMA7FwEhwL+7mevm5WYF1nytvObPlAHIo5fU="
|
||||
"version": "4.3.3",
|
||||
"hash": "sha256-89T3FRTF7sQAfuAxYfOZhDrbLlzmT7vzPHhNZ+FORa4="
|
||||
},
|
||||
{
|
||||
"pname": "MSTest.Analyzers",
|
||||
"version": "4.3.2",
|
||||
"hash": "sha256-mzMMs8H6u2pRnOb6UjA1pwSOKsULx2v18Stvp/cvxj0="
|
||||
"version": "4.3.3",
|
||||
"hash": "sha256-eA2MisarWvwuAdV49WduYclUnC+hWfHaTt359U+CdCg="
|
||||
},
|
||||
{
|
||||
"pname": "MSTest.TestAdapter",
|
||||
"version": "4.3.2",
|
||||
"hash": "sha256-qiXoMftAKNEtN2LFwMd2e8EkBn03RfIk15CljjOuU0A="
|
||||
"version": "4.3.3",
|
||||
"hash": "sha256-JwGx4QTT2v/qKcuGg1PCqA04OnrB4eDVSUSaO6G+TgA="
|
||||
},
|
||||
{
|
||||
"pname": "MSTest.TestFramework",
|
||||
"version": "4.3.2",
|
||||
"hash": "sha256-BQUOSbJd2LE5C4C5yx7MTozHaWxpo5R6mPC6EdzVHVk="
|
||||
"version": "4.3.3",
|
||||
"hash": "sha256-d/KPWV68JuLlVKtwdXtfLG/tBJ/d4WY9DVY1fOBhpzQ="
|
||||
},
|
||||
{
|
||||
"pname": "Newtonsoft.Json",
|
||||
@@ -531,58 +531,58 @@
|
||||
},
|
||||
{
|
||||
"pname": "NLog",
|
||||
"version": "6.1.4",
|
||||
"hash": "sha256-76h0KhYh0B6NDrkV5MHhv8SqUSvhTF6CFKsao5nRBbQ="
|
||||
"version": "6.2.0",
|
||||
"hash": "sha256-0xxH2xUXDGaWfeH+Dk1VeZfj65NSKtxTzw8Xau4NeUU="
|
||||
},
|
||||
{
|
||||
"pname": "NLog.Extensions.Logging",
|
||||
"version": "6.1.4",
|
||||
"hash": "sha256-ChUPGAWJls61E3/w+3q9/jlxDaqGVxCbB6b6mHAPsI8="
|
||||
"version": "6.2.0",
|
||||
"hash": "sha256-uwTAGEtm1PKu6Que5FgXPsJPtd9JNn5YKzkEpgf1kqQ="
|
||||
},
|
||||
{
|
||||
"pname": "NLog.Web.AspNetCore",
|
||||
"version": "6.1.4",
|
||||
"hash": "sha256-PWrgqvrszRzOvk4tX0n70pa6wDea6eD+C/+2+QKFgoI="
|
||||
"version": "6.2.0",
|
||||
"hash": "sha256-3BmNMi9NT5j5EnHDKzBhFxh4JxcuXsLfPgEBcKCvEug="
|
||||
},
|
||||
{
|
||||
"pname": "OpenTelemetry",
|
||||
"version": "1.17.0",
|
||||
"hash": "sha256-z68MFp4PEANJeJ3O0nTfJcWosZ4eZl7Y5T93wVYKdKA="
|
||||
"version": "1.18.0",
|
||||
"hash": "sha256-r1jytFUP2GnoeiYru8qZDDpvWIA7eVU5j2GM+/wOASs="
|
||||
},
|
||||
{
|
||||
"pname": "OpenTelemetry.Api",
|
||||
"version": "1.17.0",
|
||||
"hash": "sha256-r/Op/9OQhmL3H+XnkumD8BSdb6WwazolraVXCWDvfdA="
|
||||
"version": "1.18.0",
|
||||
"hash": "sha256-k0duyYLYxWzHWzxzjXQ95Kr3eW+kpu5AQOmHNBTgusY="
|
||||
},
|
||||
{
|
||||
"pname": "OpenTelemetry.Api.ProviderBuilderExtensions",
|
||||
"version": "1.17.0",
|
||||
"hash": "sha256-dAzEFnvUGs0BjQ0Dpxl6ird18yk9ur3djAFVZXJktGM="
|
||||
"version": "1.18.0",
|
||||
"hash": "sha256-0nrZ5F/t/EBuFoIF4G31CMoLjjjtJ0XwiVp2a++Ptu0="
|
||||
},
|
||||
{
|
||||
"pname": "OpenTelemetry.Exporter.Prometheus.AspNetCore",
|
||||
"version": "1.17.0-beta.1",
|
||||
"hash": "sha256-5HpmgbBzLf1YX5FkdQHXKsq5rXgctNoSrUqc2iaNolc="
|
||||
"version": "1.18.0-beta.1",
|
||||
"hash": "sha256-mmzUVBMG2KF4WYKKmfjZfjxrZv+KEd1jd7WAYX504Ok="
|
||||
},
|
||||
{
|
||||
"pname": "OpenTelemetry.Extensions.Hosting",
|
||||
"version": "1.17.0",
|
||||
"hash": "sha256-wesl30ehEO8aIf4kDRRE2iHkMKnv6Ox/4LyQdmtLBnc="
|
||||
"version": "1.18.0",
|
||||
"hash": "sha256-uIhH1HtU3Ycgt6ruH4ObgRkyPzDFaU4PO1CH2GiNUrk="
|
||||
},
|
||||
{
|
||||
"pname": "OpenTelemetry.Instrumentation.AspNetCore",
|
||||
"version": "1.17.0",
|
||||
"hash": "sha256-ydRp8bo5vnHkNzUUHl631WAwbl2d78jQRWXLVvL/QEs="
|
||||
"version": "1.18.0",
|
||||
"hash": "sha256-OjvhLGwJHWCCnjLdONuL6QIcpvAzDlb7/34G56QS3hk="
|
||||
},
|
||||
{
|
||||
"pname": "OpenTelemetry.Instrumentation.Http",
|
||||
"version": "1.17.0",
|
||||
"hash": "sha256-QFGOiVZ91oDhu3e/C7vUWxq0v5fcaoaWkwbyWbzIhbo="
|
||||
"version": "1.18.0",
|
||||
"hash": "sha256-MCvYq4Fq5qMiObHq9s13mKXegi2MDxM4j0SNyWMbcgE="
|
||||
},
|
||||
{
|
||||
"pname": "OpenTelemetry.Instrumentation.Runtime",
|
||||
"version": "1.17.0",
|
||||
"hash": "sha256-YCVl3X4hEqWeJ4buBA6wdQDwDXeR2Ae/fHyuySKqCX0="
|
||||
"version": "1.18.0",
|
||||
"hash": "sha256-SoQDQTgWBad8wpRESNXllkd7z6ZtPZblO260WWp7rqA="
|
||||
},
|
||||
{
|
||||
"pname": "protobuf-net",
|
||||
@@ -596,8 +596,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Scalar.AspNetCore",
|
||||
"version": "2.16.15",
|
||||
"hash": "sha256-XRzl2wnxnR84jshpKbQbosfU+D3wMAZx7Qs8PwmxXe4="
|
||||
"version": "2.17.1",
|
||||
"hash": "sha256-llpxBLdTyatjr1Ku+aJ58iwEgxHPEbaa9NHge4iptDU="
|
||||
},
|
||||
{
|
||||
"pname": "SteamKit2",
|
||||
@@ -606,33 +606,33 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.Composition",
|
||||
"version": "10.0.10",
|
||||
"hash": "sha256-u3CKzFRnQ10eMC67s610GQj5/CaEGxxpDtQB028NbzA="
|
||||
"version": "10.0.11",
|
||||
"hash": "sha256-Xy2eu9QYetykNyJaDAAIaarP/R/EZh38eG3FdYg49ZQ="
|
||||
},
|
||||
{
|
||||
"pname": "System.Composition.AttributedModel",
|
||||
"version": "10.0.10",
|
||||
"hash": "sha256-aGKpD94yaSuK0vmdV8tSPZ4BtHaFZ90H2XxbePvmaMs="
|
||||
"version": "10.0.11",
|
||||
"hash": "sha256-1p4YiiZL7pwhuBIu3kL4H5C078B/0xFtGPTVuH364WA="
|
||||
},
|
||||
{
|
||||
"pname": "System.Composition.Convention",
|
||||
"version": "10.0.10",
|
||||
"hash": "sha256-o+ptLKlKBZAYri+QVDCeP4ljfXDCQ176fUaI0FeHL2o="
|
||||
"version": "10.0.11",
|
||||
"hash": "sha256-P5yoYET5j85BOuGublA1CdTYlXTvWWlA5sk52+4goww="
|
||||
},
|
||||
{
|
||||
"pname": "System.Composition.Hosting",
|
||||
"version": "10.0.10",
|
||||
"hash": "sha256-VMZs+YqwwIJsCpUiC+kdbDjG7l+qnjk7Nq4Tnbtg058="
|
||||
"version": "10.0.11",
|
||||
"hash": "sha256-PfiX7CD+T+9hRU3NRCEfUp9BGcFGQdlKDG1sYi/Bq74="
|
||||
},
|
||||
{
|
||||
"pname": "System.Composition.Runtime",
|
||||
"version": "10.0.10",
|
||||
"hash": "sha256-HTIvnvhcTdMdEv7Y20vK+VuQy9reqOfMQRKWjzeEr+I="
|
||||
"version": "10.0.11",
|
||||
"hash": "sha256-jEC2yTNydHEs/iSrygIJW9VSPVv9w0/q6XFUx/h/Gmk="
|
||||
},
|
||||
{
|
||||
"pname": "System.Composition.TypedParts",
|
||||
"version": "10.0.10",
|
||||
"hash": "sha256-Qx3V/LSM5jHwnHVl77w3G7jK3EhnFWgmWxCAJ1Fyres="
|
||||
"version": "10.0.11",
|
||||
"hash": "sha256-k/WfK3X+BkKWTltHzPXY7GMYxIk2WuqYHAOlskOLxJc="
|
||||
},
|
||||
{
|
||||
"pname": "System.IO.Hashing",
|
||||
@@ -641,13 +641,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.Security.Cryptography.ProtectedData",
|
||||
"version": "10.0.10",
|
||||
"hash": "sha256-sKm55fvpXHZIH5Jw+zTz06BwMb8Nog5+1LgxPyU5lbk="
|
||||
"version": "10.0.11",
|
||||
"hash": "sha256-YZi5wcj1Rfnt4SygMIWtdPNitbMwJeNEbtfpa0gPTtE="
|
||||
},
|
||||
{
|
||||
"pname": "Tmds.DBus.Protocol",
|
||||
"version": "0.94.2",
|
||||
"hash": "sha256-ZUxaReVMikjf3VqjUSSTovcjDTWJO8jHNKrvj1dgHJI="
|
||||
"version": "0.95.0",
|
||||
"hash": "sha256-QMJWrpYvjrbaPMH+5+1IQN+YSWG6wQ6jcESUx87ZX3I="
|
||||
},
|
||||
{
|
||||
"pname": "ZstdSharp.Port",
|
||||
|
||||
@@ -21,13 +21,13 @@ in
|
||||
buildDotnetModule rec {
|
||||
pname = "archisteamfarm";
|
||||
# nixpkgs-update: no auto update
|
||||
version = "6.3.8.4";
|
||||
version = "6.3.9.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JustArchiNET";
|
||||
repo = "ArchiSteamFarm";
|
||||
tag = version;
|
||||
hash = "sha256-LCynvt8TzvfttqHMq0yAjrP5V8IK/dnpJogeh+6NWoY=";
|
||||
hash = "sha256-sbLctGmF7JTDkqQQK0FARksptFkH05oMuZN3L+P65Z0=";
|
||||
};
|
||||
|
||||
dotnet-runtime = dotnetCorePackages.aspnetcore_10_0;
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "asf-ui";
|
||||
version = "5e028bc91dd3c0238b602714d96713a205600248";
|
||||
version = "ac9d5e40ff8865fb9542eababa9a03a774782a1d";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JustArchiNET";
|
||||
@@ -15,10 +15,10 @@ buildNpmPackage rec {
|
||||
# updated by the update script
|
||||
# this is always the commit that should be used with asf-ui from the latest asf version
|
||||
rev = version;
|
||||
hash = "sha256-HdUdSrwTXALoT7qmcAYwaeaw1POus8++TBeoqIuEMDM=";
|
||||
hash = "sha256-NsETAXfH2dqKjU/vmkpRU3NrRdxwOg/JbAshXS3R9Uw=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-Vhs5apBz951fcvIx8J+/oShit7rD4/RB919d40cjavs=";
|
||||
npmDepsHash = "sha256-7z2/2BM8p6TsMNNaMKcS7gzKUvHMZk8P3OIPBg7raJI=";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@@ -19,16 +19,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "asusctl";
|
||||
version = "6.4.0";
|
||||
version = "6.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenGamingCollective";
|
||||
repo = "asusctl";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-qLdOdZaQm3t7LhvoCCo/FwZo4O7Z9aP1KPPlERgZX00=";
|
||||
hash = "sha256-UTs9LF2EKUj5vxG0hc9V4DvCFMbyYgvA645ClxnE3WM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-sAJ4el6URZXHD2NWiWpJSBf8Qeq2v/y+F9KpMCc8BbE=";
|
||||
cargoHash = "sha256-Kujj8gQ5qsEv2iLO3T1JoK0E2q0ByOhxpuN942EvB7Q=";
|
||||
|
||||
postPatch = ''
|
||||
files="
|
||||
|
||||
@@ -10,17 +10,17 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "aws-vault";
|
||||
version = "7.13.6";
|
||||
version = "7.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ByteNess";
|
||||
repo = "aws-vault";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-mdju4dNQ9fTlB1y1U1I36vb3mHJ4J3FCOGityyD67RE=";
|
||||
hash = "sha256-Adb0k6Cb0Jq4LTexNYmCHThE+/4ariIutwy7pH2onoU=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-Dy7bWlpYDBRm384dn6cdDTtRfmdtn6VDrFOURBrCGmg=";
|
||||
vendorHash = "sha256-vdgQS4ziTzLHWVaIiHORlSEOYPEbMF3fsSabEJh26t0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -27,13 +27,13 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pds";
|
||||
version = "0.4.5027";
|
||||
version = "0.4.5034";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bluesky-social";
|
||||
repo = "pds";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-XHHVeowq0SYLyhascy0380swKBvfX5vJDvwR2BJGnnY=";
|
||||
hash = "sha256-fsbnD9y0wxXq3NmVe5vMhI613G4HlZyqsv7+DNKzZzY=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/service";
|
||||
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
;
|
||||
inherit pnpm;
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-T0yqfY6b+Kfti5cIWH++QFh3cII9znBcf6kkZCwLSZg=";
|
||||
hash = "sha256-nnhtJNw/D6Tir3n6rrURjL/cw1EWocs4/r4K7Yq4Fdk=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "bootdev-cli";
|
||||
version = "1.32.2";
|
||||
version = "1.32.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bootdotdev";
|
||||
repo = "bootdev";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-GD/VD4NCCC4ptf37T/JfKB7m8GabhtC8NCLeeX+DfkY=";
|
||||
hash = "sha256-6IwqKV/PWy+QMfHcDmhHvKUo9so5EECXgCrA4hg4oSs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZDioEU5uPCkd+kC83cLlpgzyOsnpj2S7N+lQgsQb8uY=";
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bpftrace";
|
||||
version = "0.26.1";
|
||||
version = "0.27.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bpftrace";
|
||||
repo = "bpftrace";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-h3gFnQq48oM5uK07xrykOCSJxhr6dqcyVUDoIKIRREY=";
|
||||
hash = "sha256-wYDSx2WngWS4Ucj82hLO0G46tiXhqskhMjmv7NuUVfw=";
|
||||
};
|
||||
|
||||
buildInputs = with llvmPackages; [
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "buildah";
|
||||
version = "1.45.0";
|
||||
version = "1.45.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "podman-container-tools";
|
||||
repo = "buildah";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-s+94gep69JEJCeS+HuPt2VuK64QzH/Gc1v8sFeyaIjw=";
|
||||
hash = "sha256-WQiTHyRparVxYavnh7j/BHQGgg7ApClABMzmp6KzGO4=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
buildGraalvmNativeImage,
|
||||
fetchurl,
|
||||
writeScript,
|
||||
writableTmpDirAsHomeHook,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGraalvmNativeImage (finalAttrs: {
|
||||
@@ -34,30 +33,7 @@ buildGraalvmNativeImage (finalAttrs: {
|
||||
versionCheckHook
|
||||
];
|
||||
|
||||
passthru.updateScript = writeScript "update-clojure-lsp" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl common-updater-scripts gnused jq nix
|
||||
|
||||
set -eu -o pipefail
|
||||
source "${stdenvNoCC}/setup"
|
||||
|
||||
old_version="$(nix-instantiate --strict --json --eval -A clojure-lsp.version | jq -r .)"
|
||||
latest_version="$(curl -s https://api.github.com/repos/clojure-lsp/clojure-lsp/releases/latest | jq -r .tag_name)"
|
||||
|
||||
if [[ $latest_version == $old_version ]]; then
|
||||
echo "Already at latest version $old_version"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
old_jar_hash="$(nix-instantiate --strict --json --eval -A clojure-lsp.jar.drvAttrs.outputHash | jq -r .)"
|
||||
|
||||
curl -o clojure-lsp-standalone.jar -sL "https://github.com/clojure-lsp/clojure-lsp/releases/download/$latest_version/clojure-lsp-standalone.jar"
|
||||
new_jar_hash="$(nix-hash --flat --type sha256 clojure-lsp-standalone.jar | xargs -n1 nix --extra-experimental-features nix-command hash convert --hash-algo sha256)"
|
||||
|
||||
rm -f clojure-lsp-standalone.jar
|
||||
|
||||
update-source-version clojure-lsp "$latest_version" "$new_jar_hash"
|
||||
'';
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Language Server Protocol (LSP) for Clojure";
|
||||
@@ -65,7 +41,10 @@ buildGraalvmNativeImage (finalAttrs: {
|
||||
changelog = "https://github.com/clojure-lsp/clojure-lsp/releases/tag/${finalAttrs.version}";
|
||||
sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.ericdallo ];
|
||||
maintainers = with lib.maintainers; [
|
||||
ericdallo
|
||||
jlesquembre
|
||||
];
|
||||
mainProgram = "clojure-lsp";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "cloudlog";
|
||||
version = "2.8.18";
|
||||
version = "2.8.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "magicbug";
|
||||
repo = "Cloudlog";
|
||||
rev = version;
|
||||
hash = "sha256-gQgEWjR/ezKmk19NLERr8f4+VdK7h9FqXjy0/fgJ90g=";
|
||||
hash = "sha256-QE3AGwsiZUFbtmGN+Dnxrp6EniYFmO6GvJoPDFtvDG0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "codex-acp";
|
||||
version = "1.10.0";
|
||||
version = "1.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "agentclientprotocol";
|
||||
repo = "codex-acp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-D8uYd30NRXQYUSBFCi66Oq0iRZXpl8P7nWv2m3+KBig=";
|
||||
hash = "sha256-GIMJm+kifPEMb7XLPSssUu87eEE+aaBr2jZUk8aPD2s=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-df1/kPiZFBEq9Um26Qbo9XaYj2J8BOXQmunCQWquDTo=";
|
||||
npmDepsHash = "sha256-BeRj6LpIpGV4ONEHE//nYXTfkB1nfVQpPeJF3LRlyRM=";
|
||||
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "coroot";
|
||||
version = "1.26.0";
|
||||
version = "1.26.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coroot";
|
||||
repo = "coroot";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Rwj5dyAlAHDk7aimRDrUncwNTi4pCESxYmjSMPqweeI=";
|
||||
hash = "sha256-BN76EkYw8YIz+BRio1GPzO071EAkum3QIqrsmgmG5kk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-qKqfPRmp9hdlug9O90R5zRgslHOANcxGBoEzFipf7+w=";
|
||||
|
||||
@@ -5,24 +5,26 @@
|
||||
fetchFromGitHub,
|
||||
just,
|
||||
libcosmicAppHook,
|
||||
autoAddDriverRunpath,
|
||||
nix-update-script,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-ext-applet-minimon";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cosmic-utils";
|
||||
repo = "minimon-applet";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-7DAP4Cmg0xIPTiAKwCIxHBEhTdPPX1KywZqTaoRIRhk=";
|
||||
hash = "sha256-0ZLyjcn+h/IUXEMbTvbyKI7Qt5YRNBxUXV/7OHRsHLU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-vj5PzOXpTRXGXgxIz0Q2BmGbsWInuxA4aYlhM77ZTMM=";
|
||||
cargoHash = "sha256-MF5XK9U1Dj5IdC8Pd6W+8GPWvEhusO+MacMutEnaymk=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
just
|
||||
libcosmicAppHook
|
||||
autoAddDriverRunpath # for GPU monitoring
|
||||
];
|
||||
|
||||
dontUseJustBuild = true;
|
||||
@@ -34,7 +36,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
(placeholder "out")
|
||||
"--set"
|
||||
"bin-src"
|
||||
"target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-applet-minimon"
|
||||
"target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-ext-applet-minimon"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
@@ -44,7 +46,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
description = "COSMIC applet for displaying CPU/Memory/Network/Disk/GPU usage in the Panel or Dock";
|
||||
homepage = "https://github.com/cosmic-utils/minimon-applet";
|
||||
license = lib.licenses.gpl3Only;
|
||||
mainProgram = "cosmic-applet-minimon";
|
||||
mainProgram = "cosmic-ext-applet-minimon";
|
||||
maintainers = with lib.maintainers; [ HeitorAugustoLN ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ddccontrol-db";
|
||||
version = "20260902";
|
||||
version = "20260915";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ddccontrol";
|
||||
repo = "ddccontrol-db";
|
||||
tag = finalAttrs.version;
|
||||
sha256 = "sha256-Nu0SC9Qh4+wUzVCdo7m2z4pZH50FvCXehF3IiCoHXKM=";
|
||||
sha256 = "sha256-n538zzL8lRln6eLCJDivwh90RO2RZ7lykEDLVKV3Sa0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "delve";
|
||||
version = "1.27.1";
|
||||
version = "1.27.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "go-delve";
|
||||
repo = "delve";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-H91QnLyqywgoc3zdTaclzzUxVPagNnxLzKub2gnL25w=";
|
||||
hash = "sha256-vq8RSqSoPmDT/l6izYdM0a6SVJyaIbZ8gsXbgkFPaOw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "diamond";
|
||||
version = "2.2.6";
|
||||
version = "2.2.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bbuchfink";
|
||||
repo = "diamond";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8IlF/PQpceFx8THy1T9zD+yMxPLIyqvntwij3TJZB4M=";
|
||||
hash = "sha256-bWJIcQJR2BQED8YGnDSWIO+UehWThgJwHv7hGuT99D8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -128,6 +128,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
patches = [
|
||||
./androguard-4.1.4.patch
|
||||
./ignore_links.patch
|
||||
./radare2.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@@ -154,9 +155,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
# otool
|
||||
# Other tools:
|
||||
# docx2txt (needs Debian's package called this, not the python package)
|
||||
# radare2
|
||||
# > FAILED tests/comparators/test_elf_decompiler.py::test_radare2_diff - KeyError: 'offset'
|
||||
# > FAILED tests/comparators/test_macho_decompiler.py::test_radare2_diff - KeyError: 'offset'
|
||||
# radare2 (the exact output of the r2 version debian ships is expected, and our more recent version has a slightly different one)
|
||||
#
|
||||
# We filter automatically all packages for the host platform (some dependencies are not supported on Darwin, aarch64, etc.).
|
||||
# Packages which are marked broken for a platform are not automatically filtered to avoid accidentally removing them without noticing it.
|
||||
|
||||
26
pkgs/by-name/di/diffoscope/radare2.patch
Normal file
26
pkgs/by-name/di/diffoscope/radare2.patch
Normal file
@@ -0,0 +1,26 @@
|
||||
Fix comparing ELF objects when r2 is in PATH
|
||||
|
||||
https://github.com/radareorg/radare2/issues/21201 renamed the "offset" key of
|
||||
the json output diffoscope uses to "addr". As a result running diffoscope on an
|
||||
ELF object results in this error:
|
||||
KeyError: 'offset'
|
||||
|
||||
This patch does not include the modifications to the test suite required to
|
||||
submit it upstream.
|
||||
|
||||
Upstream issue: https://salsa.debian.org/reproducible-builds/diffoscope/-/work_items/432
|
||||
|
||||
diff --git a/diffoscope/comparators/decompile.py b/diffoscope/comparators/decompile.py
|
||||
index bf85deb9..f6a5564f 100644
|
||||
--- a/diffoscope/comparators/decompile.py
|
||||
+++ b/diffoscope/comparators/decompile.py
|
||||
@@ -242,6 +242,9 @@ class AsmFunction(File):
|
||||
|
||||
@property
|
||||
def offset(self):
|
||||
+ if "addr" in self.data_dict:
|
||||
+ return self.data_dict["addr"]
|
||||
+ # backward compat with r2 version < 5.9.0
|
||||
return self.data_dict["offset"]
|
||||
|
||||
@property
|
||||
@@ -7,18 +7,18 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dolt";
|
||||
version = "2.3.3";
|
||||
version = "2.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dolthub";
|
||||
repo = "dolt";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-9t4bpv35gQ+vAHf5M7XwDlY7vzeVb5k36DOERWT4l6g=";
|
||||
hash = "sha256-NMDe/B3COn5EjbO2xt5VMuBiRYSDbguIqJeYd1MPSbc=";
|
||||
};
|
||||
|
||||
modRoot = "./go";
|
||||
subPackages = [ "cmd/dolt" ];
|
||||
vendorHash = "sha256-dS3OM2ghudvCldFkTQyVsdyaYFU8lkUcZ99y5xD3oc0=";
|
||||
vendorHash = "sha256-La6uJEyGKNSnSFMlisEMNoKb8RX9HsP+rZY8b+Cq/Ko=";
|
||||
proxyVendor = true;
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
gitUpdater,
|
||||
writers,
|
||||
alsa-lib,
|
||||
autoreconfHook,
|
||||
ffmpeg,
|
||||
@@ -28,27 +28,25 @@
|
||||
zlib,
|
||||
}:
|
||||
|
||||
let
|
||||
check-dosbox-conf = writers.writeText "check-dosbox.conf" ''
|
||||
[autoexec]
|
||||
MOUNT C .
|
||||
|
||||
VER > C:\BLUB
|
||||
'';
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dosbox-x";
|
||||
version = "2026.08.02";
|
||||
version = "2026.08.31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "joncampbell123";
|
||||
repo = "dosbox-x";
|
||||
rev = "dosbox-x-v${finalAttrs.version}";
|
||||
hash = "sha256-zipg/eTz/k6IQeUovgpZ/ezOJNEjSQwHpkpGYOtdpS0=";
|
||||
hash = "sha256-RYnepkAHwLOQFBXNZSPkH4L9bi3BkVC2RKd+YReGMqU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/joncampbell123/dosbox-x/issues/6446
|
||||
# Remove when version > 2026.08.02
|
||||
(fetchpatch {
|
||||
name = "0001-dosbox-x-Fix-FFmpeg-9-compat.patch";
|
||||
url = "https://github.com/joncampbell123/dosbox-x/commit/18062c0ffb33db35fa52ce937ce25223140c0293.patch";
|
||||
hash = "sha256-S6DMmofFBloZFut0M3ZVAV/awG8Af9xjO2AcfVusOdg=";
|
||||
})
|
||||
];
|
||||
|
||||
# sips is unavailable in sandbox, replacing with imagemagick breaks build due to wrong Foundation propagation(?) so don't generate resolution variants
|
||||
# iconutil is unavailable, replace with png2icns from libicns
|
||||
# Patch bad hardcoded compiler
|
||||
@@ -122,6 +120,26 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
makeWrapper $out/Applications/dosbox-x.app/Contents/MacOS/dosbox-x $out/bin/dosbox-x
|
||||
'';
|
||||
|
||||
# Can't personally check Darwin anymore
|
||||
doInstallCheck = !stdenv.hostPlatform.isDarwin;
|
||||
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
|
||||
env \
|
||||
SDL_AUDIODRIVER=dummy \
|
||||
SDL_VIDEODRIVER=dummy \
|
||||
$out/bin/dosbox-x \
|
||||
-nopromptfolder -nogui \
|
||||
-exit \
|
||||
-machine pc98 \
|
||||
-conf ${check-dosbox-conf}
|
||||
|
||||
grep -q 'Reported DOS version' BLUB
|
||||
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
# Build tools
|
||||
autoconf,
|
||||
autoconf-archive,
|
||||
automake116x,
|
||||
automake,
|
||||
bison,
|
||||
cmake,
|
||||
gcc-unwrapped,
|
||||
@@ -223,7 +223,7 @@ stdenv.mkDerivation {
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
autoconf-archive
|
||||
automake116x
|
||||
automake
|
||||
bison
|
||||
cmake
|
||||
ninja
|
||||
|
||||
@@ -1,27 +1,23 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
buildGoModule,
|
||||
go,
|
||||
makeWrapper,
|
||||
writableTmpDirAsHomeHook,
|
||||
viceroy,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "fastly";
|
||||
version = "16.0.0";
|
||||
version = "16.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastly";
|
||||
repo = "cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-gVKlAbiznaRKwDpiyap4Q3mIhn/ZbnUIFwG3l01ZXQ8=";
|
||||
# The git commit is part of the `fastly version` original output;
|
||||
# leave that output the same in nixpkgs. Use the `.git` directory
|
||||
# to retrieve the commit SHA, and remove the directory afterwards,
|
||||
# since it is not needed after that.
|
||||
hash = "sha256-xGp5Fa4ruHpc2YAAbrva0zurt4wxC6XRdSpMMQGEB7c=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
cd "$out"
|
||||
@@ -30,39 +26,34 @@ buildGoModule (finalAttrs: {
|
||||
'';
|
||||
};
|
||||
|
||||
subPackages = [
|
||||
"cmd/fastly"
|
||||
];
|
||||
subPackages = [ "cmd/fastly" ];
|
||||
|
||||
vendorHash = "sha256-U2Ix8ZKGCDrWUJFFXJaL+1EBTbqblWp8slhruHhouIc=";
|
||||
vendorHash = "sha256-JUYBaiAz91jv8QFrfjpHnY442+qK7T0VZJcC/rCGhD4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
makeWrapper
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
# Flags as provided by the build automation of the project:
|
||||
# https://github.com/fastly/cli/blob/7844f9f54d56f8326962112b5534e5c40e91bf09/.goreleaser.yml#L14-L18
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/fastly/cli/pkg/revision.AppVersion=v${finalAttrs.version}"
|
||||
"-X github.com/fastly/cli/pkg/revision.Environment=release"
|
||||
"-X github.com/fastly/cli/pkg/revision.GoHostOS=${go.GOHOSTOS}"
|
||||
"-X github.com/fastly/cli/pkg/revision.GoHostArch=${go.GOHOSTARCH}"
|
||||
];
|
||||
preBuild = ''
|
||||
cp ./.fastly/config.toml ./pkg/config/config.toml
|
||||
ldflags+=" -X github.com/fastly/cli/pkg/revision.GitCommit=$(cat COMMIT)"
|
||||
'';
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-X github.com/fastly/cli/pkg/revision.AppVersion=v${finalAttrs.version}"
|
||||
"-X github.com/fastly/cli/pkg/revision.Environment=release"
|
||||
];
|
||||
|
||||
# must embed viceroy to prevent fetching binary release on `fastly compute serve` invocation
|
||||
preFixup = ''
|
||||
wrapProgram $out/bin/fastly --prefix PATH : ${lib.makeBinPath [ viceroy ]} \
|
||||
wrapProgram $out/bin/fastly \
|
||||
--prefix PATH : ${lib.makeBinPath [ viceroy ]} \
|
||||
--set FASTLY_VICEROY_USE_PATH 1
|
||||
'';
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
export HOME="$(mktemp -d)"
|
||||
installShellCompletion --cmd fastly \
|
||||
--bash <($out/bin/fastly --completion-script-bash) \
|
||||
--zsh <($out/bin/fastly --completion-script-zsh)
|
||||
@@ -75,6 +66,7 @@ buildGoModule (finalAttrs: {
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
ereslibre
|
||||
stepbrobd
|
||||
];
|
||||
mainProgram = "fastly";
|
||||
};
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
fetchPnpmDeps,
|
||||
pnpmConfigHook,
|
||||
pnpm_11,
|
||||
nodejs-slim_latest,
|
||||
darwin,
|
||||
actool,
|
||||
copyDesktopItems,
|
||||
@@ -20,18 +19,17 @@
|
||||
let
|
||||
electron = electron_43;
|
||||
|
||||
# Fix pnpm issue on darwin https://github.com/NixOS/nixpkgs/issues/525627
|
||||
pnpm = pnpm_11.override { nodejs-slim = nodejs-slim_latest; };
|
||||
pnpm = pnpm_11;
|
||||
in
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "feishin";
|
||||
version = "1.15.1";
|
||||
version = "1.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jeffvli";
|
||||
repo = "feishin";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-2UKJBUZNUpUUZIG1JFXok7YJdzqt+Ge0ykHUm8BeNcw=";
|
||||
hash = "sha256-1ZIw5XiN+2EhpHmdvN0HxgMSvn4QvN9B+ZJ3RlPXhLw=";
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
@@ -48,7 +46,7 @@ buildNpmPackage (finalAttrs: {
|
||||
src
|
||||
;
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-9uG0AxIBAmuIPywg3p9fFCXmRvM9zDLhWfluSLRnUXY=";
|
||||
hash = "sha256-ltpz4e5Vv2vxt/93M4+vHUFJZjwTRwb2zrwvl1Lqjo8=";
|
||||
};
|
||||
|
||||
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
@@ -65,7 +63,7 @@ buildNpmPackage (finalAttrs: {
|
||||
postPatch = ''
|
||||
# release/app dependencies are installed on preConfigure
|
||||
substituteInPlace package.json \
|
||||
--replace-fail '"postinstall": "electron-builder install-app-deps",' ""
|
||||
--replace-fail '"postinstall": "install-electron && electron-builder install-app-deps",' ""
|
||||
'';
|
||||
|
||||
postBuild = lib.optionalString (!webVersion) ''
|
||||
|
||||
@@ -11,17 +11,17 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "firebase-tools";
|
||||
version = "15.28.2";
|
||||
version = "15.30.0";
|
||||
nodejs = nodejs_22;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firebase";
|
||||
repo = "firebase-tools";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-19cIgkZ0luZYYx+9Cs077b5Q+sLxf+4ahwWO6hspxDw=";
|
||||
hash = "sha256-pnEdnZWI9osazHlEBCnbqisvxHq3RbfKtJl7u6RxNdQ=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-ZcI4Do4NcTIhJx1o/Hb9fZysv7WyGMLOUKMb4SUbeTY=";
|
||||
npmDepsHash = "sha256-bHXyMeyzatoW+BHRWNNXYi/aeCdVWbGozHhDfPhNTd4=";
|
||||
|
||||
# No more package-lock.json in upstream src
|
||||
postPatch = ''
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "fn";
|
||||
version = "0.6.65";
|
||||
version = "0.6.66";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fnproject";
|
||||
repo = "cli";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-ERJgATTZKeUtM3PZwjZvbbmFEgr9AiM+K7loE6L1RJ8=";
|
||||
hash = "sha256-eAXBlpfGFo4hRpg+WaWtrvfPWdsVJXhDd7YK3Cb2uRE=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "fromager";
|
||||
version = "0.94.0";
|
||||
version = "0.95.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "python-wheel-build";
|
||||
repo = "fromager";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-h+WQlz1JIwlAF2wXVaUWScEE87P/r5bBFcDVMLalsEM=";
|
||||
hash = "sha256-9+JYWEVfqG8e0OYE0AxTTtGESLTR/xcZhQMsDEuAM34=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "goawk";
|
||||
version = "1.31.0";
|
||||
version = "1.32.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "benhoyt";
|
||||
repo = "goawk";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Luz6boPGIJqF/PJHZmnu3zChT5g8Wt37eOMtFS7j2pI=";
|
||||
hash = "sha256-eYybVWqaN9iSoMe2HG0dOyzaYZOmYJsV8RN1Q2w2L6w=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -10,12 +10,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "godsvg";
|
||||
version = "1.0-alpha16";
|
||||
version = "1.0-alpha17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "MewPurPur";
|
||||
repo = "GodSVG";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-MuPEPnoBmqAg0vLQ7rQidWHA2DFpfNx7evPYeG311co=";
|
||||
hash = "sha256-6KdGkpgzBJ1OAtWxpbntxrTuw0E6hyq7oZSI5HPSZ6U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,18 +7,18 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "google-alloydb-auth-proxy";
|
||||
version = "1.16.0";
|
||||
version = "1.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleCloudPlatform";
|
||||
repo = "alloydb-auth-proxy";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-uxBuAZZcMBNqFZ8c4plE/j2yWcWkNgIv9tnMrG/nOJc=";
|
||||
hash = "sha256-v7++tWUdsjh+XQfNOkzYHrzSnWYYUC1WIWP14J6BTT8=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorHash = "sha256-s6Rz3GWwX+S4ZGvQkCkl15gUJ2nXeYxSG7eluApRH2g=";
|
||||
vendorHash = "sha256-Kq3DplIKa0HHbsDJ4QzuzIVycHZQzpbftSC6TXsBp+M=";
|
||||
|
||||
checkFlags = [
|
||||
"-short"
|
||||
|
||||
@@ -180,7 +180,7 @@ let
|
||||
|
||||
linux = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta;
|
||||
version = "153.0.8010.36";
|
||||
version = "153.0.8010.47";
|
||||
|
||||
src =
|
||||
let
|
||||
@@ -195,8 +195,8 @@ let
|
||||
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_${debArch}.deb";
|
||||
hash =
|
||||
{
|
||||
amd64 = "sha256-m7ROMwMcLyhXzza0NDBRoS+TBY5LeB48djE9+H9sjTI=";
|
||||
arm64 = "sha256-H89uxRqdUuJv8a2AciX3Jb5VBprStoxdaTYaJ0ZmUYg=";
|
||||
amd64 = "sha256-oybe/eVN4vHA1G2L9La18/dvDIl70wsgsCUJcTmgW94=";
|
||||
arm64 = "sha256-DEyVf0gz2ab4HkwzXEEpwowPmHfh5SA2/XYuygrfTbI=";
|
||||
}
|
||||
.${debArch};
|
||||
};
|
||||
@@ -306,11 +306,11 @@ let
|
||||
|
||||
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta;
|
||||
version = "153.0.8010.37";
|
||||
version = "153.0.8010.48";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.google.com/release2/chrome/mtrht6j77xyruy2gnvuwtsjrcm_153.0.8010.37/GoogleChrome-153.0.8010.37.dmg";
|
||||
hash = "sha256-mNJM1d0Soi8kb3YROZ4SRG24fgA23CIyxaDFXeFY5tw=";
|
||||
url = "https://dl.google.com/release2/chrome/ad6l2piroiqtckdm7rwkc6givuyq_153.0.8010.48/GoogleChrome-153.0.8010.48.dmg";
|
||||
hash = "sha256-FgoOxuBiUAFk3X9iBHxlWFsNcO/PU95ObKTTuWLPnpo=";
|
||||
};
|
||||
|
||||
dontPatch = true;
|
||||
|
||||
@@ -88,7 +88,7 @@ update_darwin() {
|
||||
</request>"
|
||||
|
||||
response="$(curl -s -X POST -H "Content-Type: text/xml" --data "$post_data" "https://tools.google.com/service/update2")"
|
||||
url="$(echo "$response" | xmllint --xpath "string(//url[contains(@codebase, 'http://dl.google.com/release2')]/@codebase)" -)"
|
||||
url="$(echo "$response" | xmllint --xpath "string(//url[contains(@codebase, 'https://dl.google.com/release2')]/@codebase)" -)"
|
||||
pkg="$(echo "$response" | xmllint --xpath "string(//package/@name)" -)"
|
||||
manifest_version="$(echo "$response" | xmllint --xpath "string(//manifest/@version)" -)"
|
||||
|
||||
|
||||
@@ -15,16 +15,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "goss";
|
||||
version = "0.4.9";
|
||||
version = "0.4.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goss-org";
|
||||
repo = "goss";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-GdkLasokpWegjK4kZzAskp1NGwcuMjrjjau75cEo8kg=";
|
||||
hash = "sha256-4DCPPeTL2x6mMpcP/cdyQWpqehGWkk7MWM7P93WzwCA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Rf6Xt54y1BN2o90rDW0WvEm4H5pPfsZ786MXFjsAFaM=";
|
||||
vendorHash = "sha256-NlOS5APp9R45QpYKwP673pmN7CR+Ufz8LxWyMkrVeq0=";
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "gprojector";
|
||||
version = "3.1.0";
|
||||
version = "3.4.8";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://www.giss.nasa.gov/tools/gprojector/download/G.ProjectorJ-${version}.tgz";
|
||||
sha256 = "sha256-cMmjyitetXxQzfSBh5ry5tIsLWOnBaaYOD1eQg1IX+w=";
|
||||
hash = "sha256-56CWuPp9Nu63yGn13AAZrvwE1xvKDZ7Idjbn2hbk0sI=";
|
||||
};
|
||||
|
||||
desktopItems = [
|
||||
@@ -43,7 +43,10 @@ stdenvNoCC.mkDerivation rec {
|
||||
runHook preInstall
|
||||
mkdir -p $out/share
|
||||
cp -r $src/jars $out/share/java
|
||||
makeWrapper ${jre}/bin/java $out/bin/gprojector --add-flags "-jar $out/share/java/G.Projector.jar" --add-flags "${extraJavaArgs}"
|
||||
makeWrapper ${jre}/bin/java $out/bin/gprojector \
|
||||
--add-flags "-jar $out/share/java/G.Projector.jar" \
|
||||
--add-flags "${extraJavaArgs}" \
|
||||
--set GTK_THEME 'Adwaita'
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
@@ -1,53 +0,0 @@
|
||||
commit 425b33877c819dd88f3692aae37452c767371f6b
|
||||
Author: Simon Gardling <titaniumtown@proton.me>
|
||||
Date: Thu Sep 19 10:00:39 2024 -0400
|
||||
|
||||
use locally downloaded embeddings
|
||||
|
||||
diff --git a/gpt4all-chat/CMakeLists.txt b/gpt4all-chat/CMakeLists.txt
|
||||
index 900307ae..802fc31a 100644
|
||||
--- a//CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -120,6 +120,7 @@ elseif (APPLE)
|
||||
endif()
|
||||
|
||||
# Embedding model
|
||||
+#[[
|
||||
set(LOCAL_EMBEDDING_MODEL "nomic-embed-text-v1.5.f16.gguf")
|
||||
set(LOCAL_EMBEDDING_MODEL_MD5 "a5401e7f7e46ed9fcaed5b60a281d547")
|
||||
set(LOCAL_EMBEDDING_MODEL_PATH "${CMAKE_BINARY_DIR}/resources/${LOCAL_EMBEDDING_MODEL}")
|
||||
@@ -134,6 +135,7 @@ message(STATUS "Embedding model downloaded to ${LOCAL_EMBEDDING_MODEL_PATH}")
|
||||
if (APPLE)
|
||||
list(APPEND CHAT_EXE_RESOURCES "${LOCAL_EMBEDDING_MODEL_PATH}")
|
||||
endif()
|
||||
+]]
|
||||
|
||||
set(QAPPLICATION_CLASS QGuiApplication)
|
||||
add_subdirectory(deps/SingleApplication)
|
||||
@@ -348,11 +350,13 @@ if (LLMODEL_CUDA)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
+#[[
|
||||
if (NOT APPLE)
|
||||
install(FILES "${LOCAL_EMBEDDING_MODEL_PATH}"
|
||||
DESTINATION resources
|
||||
COMPONENT ${COMPONENT_NAME_MAIN})
|
||||
endif()
|
||||
+]]
|
||||
|
||||
set(CPACK_GENERATOR "IFW")
|
||||
set(CPACK_VERBATIM_VARIABLES YES)
|
||||
diff --git a/gpt4all-chat/src/embllm.cpp b/gpt4all-chat/src/embllm.cpp
|
||||
index 81b1e9e1..e3266cc7 100644
|
||||
--- a/src/embllm.cpp
|
||||
+++ b/src/embllm.cpp
|
||||
@@ -84,7 +84,7 @@ bool EmbeddingLLMWorker::loadModel()
|
||||
|
||||
QString filePath = embPathFmt.arg(QCoreApplication::applicationDirPath(), LOCAL_EMBEDDING_MODEL);
|
||||
if (!QFileInfo::exists(filePath)) {
|
||||
- qWarning() << "embllm WARNING: Local embedding model not found";
|
||||
+ qWarning() << "embllm WARNING: Local embedding model not found: " << filePath;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -1,114 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchurl,
|
||||
cmake,
|
||||
qt6,
|
||||
duckx,
|
||||
fmt,
|
||||
shaderc,
|
||||
vulkan-headers,
|
||||
wayland,
|
||||
cudaSupport ? config.cudaSupport,
|
||||
cudaPackages ? { },
|
||||
autoAddDriverRunpath,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gpt4all";
|
||||
version = "3.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-OAD/uSCL/3OXmYVG+iGJK4zD2s0dDaPf59DF23AbSFU=";
|
||||
owner = "nomic-ai";
|
||||
repo = "gpt4all";
|
||||
tag = "v${finalAttrs.version}";
|
||||
};
|
||||
|
||||
embed_model = fetchurl {
|
||||
url = "https://gpt4all.io/models/gguf/nomic-embed-text-v1.5.f16.gguf";
|
||||
hash = "sha256-969vZoAvTfhu2hD+m7z8dcOVYr7Ujvas5xmiUc8cL9s=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./embedding-local.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "duckx::duckx QXlsx" "duckx QXlsx"
|
||||
'';
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/gpt4all-chat";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
qt6.wrapQtAppsHook
|
||||
]
|
||||
++ lib.optionals cudaSupport [
|
||||
cudaPackages.cuda_nvcc
|
||||
autoAddDriverRunpath
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
duckx
|
||||
fmt
|
||||
qt6.qt5compat
|
||||
qt6.qtbase
|
||||
qt6.qtdeclarative
|
||||
qt6.qthttpserver
|
||||
qt6.qtsvg
|
||||
qt6.qttools
|
||||
qt6.qtwayland
|
||||
qt6.qtwebengine
|
||||
shaderc
|
||||
vulkan-headers
|
||||
wayland
|
||||
]
|
||||
++ lib.optionals cudaSupport (
|
||||
with cudaPackages;
|
||||
[
|
||||
cccl
|
||||
cuda_cudart
|
||||
libcublas
|
||||
]
|
||||
);
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "KOMPUTE_OPT_USE_BUILT_IN_VULKAN_HEADER" false)
|
||||
(lib.cmakeBool "KOMPUTE_OPT_DISABLE_VULKAN_VERSION_CHECK" true)
|
||||
(lib.cmakeBool "KOMPUTE_OPT_USE_BUILT_IN_FMT" false)
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/298997
|
||||
# https://github.com/nomic-ai/gpt4all/issues/3468
|
||||
(lib.cmakeBool "LLMODEL_KOMPUTE" false)
|
||||
]
|
||||
++ lib.optionals (!cudaSupport) [
|
||||
(lib.cmakeBool "LLMODEL_CUDA" false)
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
rm -rf $out/include
|
||||
rm -rf $out/lib/*.a
|
||||
mv $out/bin/chat $out/bin/${finalAttrs.meta.mainProgram}
|
||||
install -D ${finalAttrs.embed_model} $out/resources/nomic-embed-text-v1.5.f16.gguf
|
||||
install -m 444 -D $src/gpt4all-chat/flatpak-manifest/io.gpt4all.gpt4all.desktop $out/share/applications/io.gpt4all.gpt4all.desktop
|
||||
install -m 444 -D $src/gpt4all-chat/icons/nomic_logo.svg $out/share/icons/hicolor/scalable/apps/io.gpt4all.gpt4all.svg
|
||||
substituteInPlace $out/share/applications/io.gpt4all.gpt4all.desktop \
|
||||
--replace-fail 'Exec=chat' 'Exec=${finalAttrs.meta.mainProgram}'
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/nomic-ai/gpt4all/releases/tag/v${finalAttrs.version}";
|
||||
description = "Free-to-use, locally running, privacy-aware chatbot. No GPU or internet required";
|
||||
homepage = "https://github.com/nomic-ai/gpt4all";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "gpt4all";
|
||||
maintainers = with lib.maintainers; [
|
||||
titaniumtown
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -34,12 +34,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gpu-screen-recorder-ui";
|
||||
version = "1.13.7";
|
||||
version = "1.13.9";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://repo.dec05eba.com/gpu-screen-recorder-ui";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-liBdZDHI32ElTTsHAZekYKFgZY1eP7rz4u7tM4pkpZ4=";
|
||||
hash = "sha256-f4jTv3IS73NWStg1af20pGKlqwIN9K9ZyLjKUX9Tp3s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -29,13 +29,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0-unstable-2026-08-25";
|
||||
rev = "404d9f3047711d900e04573548745b869946f240";
|
||||
version = "0-unstable-2026-09-15";
|
||||
rev = "fdf6cfe296e308c45aa5696a88a947feec2fe67a";
|
||||
|
||||
srcHash = "sha256-FdLdro7T8hyoNUT8dCd/ilZEUARPnFxqztbtxaNk9ws=";
|
||||
shaderHash = "sha256-9yr//4t8k8Ncdli9AyBnkB2Pz9GgNhoumpdOv2uqL3k=";
|
||||
cargoHash = "sha256-BHuYW90vTtDbfre6br7nTFa3VWgX01AlalXKwjiSSnA=";
|
||||
npmHash = "sha256-Rb0bLPk54QigNp7TkDkJJy/TEJXAhlXOCruckwvdXks=";
|
||||
srcHash = "sha256-k0C6ocP0lHwG402pmDHO0BLQ6DsK0Y4NqXLMJHHnBao=";
|
||||
shaderHash = "sha256-LReut68Cwoz/YmXaLiVnccg+RerMrKqEWhiWGyx5k+Q=";
|
||||
cargoHash = "sha256-/XEsrJed6rdsOpWFq6+trK9ylcH7v8g2XCExEI335jY=";
|
||||
npmHash = "sha256-Cay+aZcZGAU2vKAs7nub/YVcQ/sxsruWhjZ9KkqXHuc=";
|
||||
|
||||
brandingRev = "6687dc6d3d8552948458d00d35e2bee3a40ab66b";
|
||||
brandingHash = "sha256-yD4O50gz2mtby1h4o+9PqjMfYmTbBOX6XDc5Ez5fgnY=";
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "hclfmt";
|
||||
version = "2.24.0";
|
||||
version = "2.25.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = "hcl";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-YWGd2rQXJ4AX8nhByYRdp+91PJeHrdCpxvKQntxzRhY=";
|
||||
hash = "sha256-WV97PYO91jpJiSmHqc9/IB4fM0tKBNZlWBntDm6CTeo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5yGTuv19XyXsZcaHKXr/mYqKRufkJBaYMICFwMP/p3g=";
|
||||
vendorHash = "sha256-cGadewSXa5fP2cOl1FUT94Gh+f+Wxnbz8j0QQs0FLBI=";
|
||||
|
||||
# The code repository includes other tools which are not useful. Only build
|
||||
# hclfmt.
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "hcloud";
|
||||
version = "1.67.0";
|
||||
version = "1.68.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hetznercloud";
|
||||
repo = "cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-yARnGcKxUPJ4v9ISb7keNrcTKe0R7DoS9nRZ/wVewN8=";
|
||||
hash = "sha256-bfKsCwAcKIHhTFLC+Abzt8BfaQbKzSvEE/nuZ1WS5wM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JrMMhYx61gbpIHnimNzIpPYnrnfPfObV3X9l9PNhLbE=";
|
||||
vendorHash = "sha256-PZ3VrFf2grtO94iUxCnbA/oZuvP39ma6Ptd76L6cIio=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -22,13 +22,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
__structuredAttrs = true;
|
||||
|
||||
pname = "iloader";
|
||||
version = "2.3.1";
|
||||
version = "2.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nab138";
|
||||
repo = "iloader";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-OgSDkFaOwhsEhFLceV0FxcZ8jEG9vy5fKQf9gSyUpNA=";
|
||||
sha256 = "sha256-FpWX9m5WtTYTXueKX41RP1Zhyf5UuuhrSIYITq+g+Ew=";
|
||||
};
|
||||
|
||||
nodeModules = stdenv.mkDerivation {
|
||||
@@ -64,14 +64,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
outputHash = "sha256-Le0Fn/Vdvq9RitDfDVyHl8VBCA+j068ywhiyM+JLg94=";
|
||||
outputHash = "sha256-UTNnOm1BRVuz7x8Vrxv/WL7N6Cyi8VxYusAXFpCIako=";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
};
|
||||
|
||||
cargoRoot = "src-tauri";
|
||||
buildAndTestSubdir = "src-tauri";
|
||||
cargoHash = "sha256-CJSm6NAdXEUwhmbx48o7tnZALQtuvhUxUpa7KtC9ZHg=";
|
||||
cargoHash = "sha256-te7XB/pkM9s94fUJadCtoOvcB/kEN/U1BwQMWcKPglM=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -109,13 +109,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "immich";
|
||||
version = "3.2.1";
|
||||
version = "3.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "immich-app";
|
||||
repo = "immich";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ufdMwERs1h+m2usMHztZicRXpI20BM+2PeOLBArXw1Y=";
|
||||
hash = "sha256-napG+EMZbbbeq7R8FtnuDsDwdpxItkwTVWztnw07DfA=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "itg3encore";
|
||||
version = "0-unstable-2026-08-10";
|
||||
version = "0-unstable-2026-09-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DarkBahamut162";
|
||||
repo = "itg3encore";
|
||||
rev = "5427331ee20e496092680400481165c503d2123e";
|
||||
hash = "sha256-Hvqxhpdqxo32uXkuFGUqlNk8517ughE0mGBs1L9PsHY=";
|
||||
rev = "e5177b5829c4ef521c3552f55f9080a3561d6216";
|
||||
hash = "sha256-cnGfEBTJYEqDNCmR8Wcbetm2qhhgMCh1LpzXBKKXdvA=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -10,6 +10,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "jetbrains-mono";
|
||||
version = "2.304";
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jetbrains";
|
||||
repo = "jetbrainsmono";
|
||||
|
||||
@@ -52,7 +52,7 @@ let
|
||||
in
|
||||
{
|
||||
jetty_12 = generic {
|
||||
version = "12.1.12";
|
||||
hash = "sha256-7sBxMaaCvL+7BBEjKTKnIZa1jxh0EoYpYq8Hreu3d7w=";
|
||||
version = "12.1.13";
|
||||
hash = "sha256-FBeQSRGNSStrkfUtDw19JvJq90esje/npB/dChu6t3U=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,55 +1,55 @@
|
||||
{
|
||||
"@esbuild/aix-ppc64@npm:0.27.2": "9c18cc2e4a03339a55013aac05b4a3fc4b77e75715dc252d034aa3d43b754abc053a7601b95e31249f4b6e69b68db2f5e6cb04b0ed619f825f2f70daff1a78d7",
|
||||
"@esbuild/aix-ppc64@npm:0.27.5": "48203e49df4995ab8ead9e8def96381931901db904cd174e5cdc9d034f70431276e8ed93305a13c22390041e6933ec19624435f6f7c34f8a767d5979c3c6e145",
|
||||
"@esbuild/aix-ppc64@npm:0.27.7": "848d1a798fb9ea6aa902c9138aaf6b45d889df39a1ff737300ea9968af3afee1000f611bc00187f5bda096d300fb25f4f883c57a2dc7296e40295f2470aa57b3",
|
||||
"@esbuild/android-arm64@npm:0.27.2": "a318fc9ffcdad7fda8bb521af8b17f73d93d9a94b4cca9301fbf72cf3f5a6e945edd589a47388de70f3e9582655dcf5b5bb928a11e306368fae4a9106d5143d2",
|
||||
"@esbuild/android-arm64@npm:0.27.5": "6cfcae790d0cec7a9bd29f539d05ad5a5715815177bb62231a95c3a8b2fb651b099e3eef76c6c0f174be83864b0a1b244474c071df36c028e407c2325015fa01",
|
||||
"@esbuild/android-arm64@npm:0.27.7": "21a57ee237e1503d92c2f818c1dbf7d6f772b100fd0dfa95ea0d24be718c0c6952e915ad1f47bcc3496bb807a0a254d35d6baadc48531b684d2236f57023f1e6",
|
||||
"@esbuild/android-arm@npm:0.27.2": "01114275e096b9177ad2496730087ee081d6e65a75bc087457b527c5baac5a8ccb362435f45232532bf6f97de95e1790dbce127d55abd5e4152c7214682bf4d3",
|
||||
"@esbuild/android-arm@npm:0.27.5": "4f856f7e508393c7e722e444b26a60f093ed4dfd11def0cbae13034e60dca6b356c302430a9230644f4ae2fd4e5a9ae620a4b69fa98a12062190195af2e57ec1",
|
||||
"@esbuild/android-arm@npm:0.27.7": "46a246245a024680c8b5051425fc724c846b7d36ac952cd312e71194bae07fd712aa6fa8ddd7fa648a18d665eb0bcfaf111726af7b676465cb181dff7e6a0848",
|
||||
"@esbuild/android-x64@npm:0.27.2": "e92c5b6919081a14c8882f1167cf90b4e4bba745ad6e9a23428f85a1cd5e79dfa3f1d2fc943686b237e4cd09fac52ad3b3791deab6a0419ee10859284d3834aa",
|
||||
"@esbuild/android-x64@npm:0.27.5": "116456a795deccd12917aa61599c5f0278b2399c7c936dd92b667a53f45f695ac316c61b1b3929c1dde177cee447b2cd5c6b16283aaec1fc80d317ef414a0442",
|
||||
"@esbuild/android-x64@npm:0.27.7": "95c858fe95b716aabcb71a0dab9162d46859c0deb713189730ce6c2a2bc27efed2341b2d27aacc092dee7544df7b25035a12d65f30481b5b03a8358707e1a6f3",
|
||||
"@esbuild/darwin-arm64@npm:0.27.2": "5e99db5037167bad4a095fc445b94a2ce02357870ed58b79e13ae6bc09b5cb33d7e03f925492df940f9e0ad685a889f02beec1431d8fbf4c7ced55b2f48f5659",
|
||||
"@esbuild/darwin-arm64@npm:0.27.5": "09b3f3f85eb4cdc3f00582b360be6f904b27d62f390f25815e6a27843bdfd9f087372ddb0718c1010078b34e96df68d115ce562891121684dc28fedcc22cdac5",
|
||||
"@esbuild/darwin-arm64@npm:0.27.7": "281897d55b71e222394f08ee519999f673778c26ac78e4dacc67262e449b9284e852dccac8d6293fd611e0a37d0c798f2ea18c65573ed251d5e04dcb01121f0d",
|
||||
"@esbuild/darwin-x64@npm:0.27.2": "87f2fbc4cf11724ef805b17cbdc7b0a9498332bc4b61d55e110ecc3b09bc488b88c0bd140ea48924e9c97a2063cf7e440fef13dd56e415c46799619d61086910",
|
||||
"@esbuild/darwin-x64@npm:0.27.5": "0a81d707bbc05a2b2f6ffc3e21f1596a7346c737b13cf789b59d7e86cb4d355ee6389f7ba2965da142ff40913dce986d5f2a8dfa6c940e704a017f418d9d7384",
|
||||
"@esbuild/darwin-x64@npm:0.27.7": "a6c320cda3c7c176d678c00367823259b7efc0f8638393bd0e45b4f950af15be887558c82e2d74ed9fb492a4b04f36afc1c3a3b9774aeaaa08fbf96aac6e3524",
|
||||
"@esbuild/freebsd-arm64@npm:0.27.2": "1ffa23243b913e377a5b09fd97ad9f089be3695aafdd893b60bb7f9be479256d8b7546f0bc96c4e61133fe7aeeaf95a8e941e82a65d99008ff82c99bdec85eee",
|
||||
"@esbuild/freebsd-arm64@npm:0.27.5": "fc705c9f299bef59a584f78a1ac8e686b3598639d8ad565170db7704d116665bfd7b0760c2d5901e363f972133a77e92bcf3ace16726b61540582a09c82ff284",
|
||||
"@esbuild/freebsd-arm64@npm:0.27.7": "8b546929340ebb3daf5b47ca24db6d6fdcf3c14a733c41ddd8ae960834a5aa60b22b341049aef39badfdfaad0081a8706d085ba892e2b23163d1d1ff52ca1dc3",
|
||||
"@esbuild/freebsd-x64@npm:0.27.2": "44f744b289cf9e115b0adfac1905818d756dfced14213bf144d9016d96f67575ef2a55526f76e29ee775fcfec7274ba3a5e6833f35ed79a4592d3f5eac278267",
|
||||
"@esbuild/freebsd-x64@npm:0.27.5": "bacab4f9d3e13eb9a2b0ad1403fb0a6d66d7bdd50e9209dff5c8d0d9151ad3dd64f6a709530858f1143ab30f89d508e3f29782219a23d258e455ed2dee360136",
|
||||
"@esbuild/freebsd-x64@npm:0.27.7": "5a4c0ccbde7fe7a6de14c8789d1f20f4cadc7980e531b090b137774b56f360ba3c50f5612f01980ab9071ae50e1bb007f44c1b04b68fd84ba07113472081e021",
|
||||
"@esbuild/linux-arm64@npm:0.27.2": "2b037d74eaff4e9b5a6076760ede873320707636a3495939687cdd0c2c7150883111273bc0a8663fa305c42f439f4748b5ad7f15a1a1ea9fa7db575d9faf2d1b",
|
||||
"@esbuild/linux-arm64@npm:0.27.5": "4acfebf0f43e9dadb2a29cf336562e711961c23fbb6f3fec754f8a2848a0c63022b58cdc95c667fe6f5dc7cf55824cf6bcc49f96b53f29e72da0bc97102b472a",
|
||||
"@esbuild/linux-arm64@npm:0.27.7": "741871bea9ce0a136367707cc509254fef167c5bf968706de6bff7db96ee7c672f02231cb69965e17ca0aedbd99d533275f5a695a3069cb3df0a9d2cd877847f",
|
||||
"@esbuild/linux-arm@npm:0.27.2": "28cfc3a9ca11fc899649e7a706fb4b2ee57999bd92e86c23726b3ed0f832732411dd0aa3e2bcdb4105759f83bc4e5adc98dc195aaafce736c910db4e43694702",
|
||||
"@esbuild/linux-arm@npm:0.27.5": "107786c947b02b6e7aca4f9ff3af8c14fe461f614f9c298d63b9474703ca7798d3650d52b6041412308eef46dc7215f56b4155391f9feb5b15b64718204f0009",
|
||||
"@esbuild/linux-arm@npm:0.27.7": "c2ee4ae5f6e13f8e882da4a369cc5d672ae8bf7613e35e22b54df3999e0d5aaef6d704c7dcbc473708eaeee202dd8e892c37e791bbc50a509b23ae845d18b689",
|
||||
"@esbuild/linux-ia32@npm:0.27.2": "ac6cc92b9be2ec6d9d483c53fc973e6381765b784a2e1b71fa93ea0cf976344c2e3e0bfda0140b0829b3ec4304d9b886692b2891e68c17d2121066d06e67f0ac",
|
||||
"@esbuild/linux-ia32@npm:0.27.5": "51c5322b4a834c3c8bc66d9503a8e2dfda4090aed848a533718773cece1b3a92fc10ab532bba81af1ce7eb7b3c244ef6aed2b59d480f32cf987d222e7c05950a",
|
||||
"@esbuild/linux-ia32@npm:0.27.7": "0933a68b0bdee3dd0fcd99da92c0472deb6d6225c454b88a3609e1b1ea7648b36f6b83be8a8cf41edc1f0d666b76006e270a66c7520050d278d7d73df171e86b",
|
||||
"@esbuild/linux-loong64@npm:0.27.2": "625f5b6c2218a3acb2cff8f7f02a53ca89d13925f8932260ddad01595c6907beda4a79e4b767b1101f5971049f88d3ec6ab29cf565b4d61d9b0d7277e2cb578d",
|
||||
"@esbuild/linux-loong64@npm:0.27.5": "92a0c8bfdf3214a485161184669adaa7dbd1d08fafb3bba50fd6dbd88b9a2e9c12705056e243e96a4eca3e8f0cdd65e5271261cb7f51429fd77d5dbc9fe49cbc",
|
||||
"@esbuild/linux-loong64@npm:0.27.7": "9609e94b603a8a68bcd60325626d0bd35cce37e75994729d4ea264fa865db201da64c3216004656d94b1edeb8587150b1c47a1eef8ee1af9dc0d3cd6baa5ab2a",
|
||||
"@esbuild/linux-mips64el@npm:0.27.2": "0c62692cb3a297b37212dfde52a861861843a716f6b3bdb73da49ba249a4c001b989ea61dc4540c430fac59ce2f8fc45035cdfac80172c5ddaf1b9df8471aecf",
|
||||
"@esbuild/linux-mips64el@npm:0.27.5": "57326d2100e7a1be73c63a2827b981c926489fb86ce0482030b8a9049fc8086a8a229b98d83d34b4a9e459756e38ac9d453c2facd0e706b83dd8a08105a77445",
|
||||
"@esbuild/linux-mips64el@npm:0.27.7": "74ac0fe0b857b926af9057d5fa9634fc4b0b61a6fcd9c13cc2917e0e66638e2f724b8fd82024f97d524ff54ae17d0a52a0569078639aa9907f5287514aa046b1",
|
||||
"@esbuild/linux-ppc64@npm:0.27.2": "b804d2dd0a6a85fe1c731828c725731a55ab120d2cc16941d560b2e9af5c2ec51586914ce26a84a326a9d46fa61eb8bb1f843953fe29ddd43b3f3099c491b5ff",
|
||||
"@esbuild/linux-ppc64@npm:0.27.5": "d2e2b8b14ef6443ed23354ed45eaa0c176cddea25a4d84ac2a6dc76d7ce48de7928daecc3535f5cf4670b1ffbc562c43255e919ecc3f7c8c26f43b9b9d60e534",
|
||||
"@esbuild/linux-ppc64@npm:0.27.7": "7d75e59ad798631b7b7f77471fc9f545e0e6d2959a52d57b77e92d4aba81c5c57dea558d22539edc6aca92ac72112f93381e163b996df193cb5c9a1da4b4230d",
|
||||
"@esbuild/linux-riscv64@npm:0.27.2": "03e67e7207a83801363e3637f9a35fb6224ed4dc23bbf6eca41904fc42f5a6806e1e591666bf48dbf62eba97d41ff4355413b14dcb2339007b22c693374c49f6",
|
||||
"@esbuild/linux-riscv64@npm:0.27.5": "a943c97a6d031041cad40196be6f8112dbd7a642411bf7b24942de95f4c2caae31ca11b3e4724f1898f2b9f2e5a5c106636eea50eddc7db7cfbec8f443560798",
|
||||
"@esbuild/linux-riscv64@npm:0.27.7": "6dca2a182f59d43057ef40b93788dfb265c3b9fff4738aa613d87c7c709d9c308f18c282b7cfc2a1c770fa4db78d3529dc50b8a9f30e415661d993b021b2cdcb",
|
||||
"@esbuild/linux-s390x@npm:0.27.2": "eb24b9c0a4a1492e4ff34a87933f6a3b348739c12f864b408144efdf949871c1fbb02a1cca741bfa11fd08aebe585d046fd3311b462ce4c795e3064ba3912469",
|
||||
"@esbuild/linux-s390x@npm:0.27.5": "068865bc73484b97f1bcce6eca0195b30e8ce03dafdc6da7283b289023728f1cc7d0cbf5387fa6b89b072ddf8f9776b8cceb2981d2ebe3f2ea5e84ae8a77c448",
|
||||
"@esbuild/linux-s390x@npm:0.27.7": "870de4b9ff155cf5cf2ccd7b3587a6b4170550a31b621ea11dc134cd48af95f4a30f4ce868d249967eade6b3dd66e7a0af0d542c6fbba0dbc473fd0f5d3299b0",
|
||||
"@esbuild/linux-x64@npm:0.27.2": "ed1542f203329521fb1f308696c76ba59ed4a4616a24e21bf4820685362bba209d5c44c2f4e66c88dc7b7399df9ace625454d4829ee529d076ccaf61566e11cf",
|
||||
"@esbuild/linux-x64@npm:0.27.5": "6eb9d11d25e632607370d30d8fbc40c4357f6be293aeb33e6cd3fe73c18203b37f24b6e52d0939a499839fddcf9920b16862a3b923e425b99bacf9b80e787c5e",
|
||||
"@esbuild/linux-x64@npm:0.27.7": "47fce66247eda2d4721c1e615f7169eb7bf6e4b6105eab7271391ce933e7d350d3d4a581b3b8a61573f70b6663268eb514e624875dc514dc56dec3a37cf7cbe3",
|
||||
"@esbuild/netbsd-arm64@npm:0.27.2": "576dd082047077b9cc41fbeffd728821a4f3b80969c1d2d6c274301122c6de2050f484fd4e946777527b8a15bd2a5ac54f85ca7ab95ea72b5345177e6a888687",
|
||||
"@esbuild/netbsd-arm64@npm:0.27.5": "d43426863ae1f6bd37478a30c84bdabbbafda3b2ab537a6f5051006ba13231e6842ba49a3f61a2dd30736048369660e134f028c6b2bef156c81a78dadeaf280e",
|
||||
"@esbuild/netbsd-arm64@npm:0.27.7": "bbe0d0529fb73fd38c2cf9ebc1d1dcd5a2586b263cc4f6300d37008955f45310e842d63153e361a4447d4ca0f0a0691d62013fe60b09e4e0cd53f428ef2266f3",
|
||||
"@esbuild/netbsd-x64@npm:0.27.2": "f8994af3e2ff3c9a91e874e58698b66e6f8d4e72dbc0aaf749b74a79420954146ed053359b0a4c213918582cee187d8a371737a33cfb93e624b4d091e5a6c240",
|
||||
"@esbuild/netbsd-x64@npm:0.27.5": "b54f975bfc05f44a21884022a87367ceec3775cfc81d155bb2183ac5b9f51397589e10654eecc87ff9adee749a574e4ff724cb064907b2328e39ddb390760707",
|
||||
"@esbuild/netbsd-x64@npm:0.27.7": "246ed4df55788aacd2d9146f51ea7fcf4715e73d32ca1b0fcb42c316fdbf21d8de03bb304205dc707942442899529e834466894faa0aa3fa40454f5622648fc6",
|
||||
"@esbuild/openbsd-arm64@npm:0.27.2": "f710da24beeb747ef3a11b9d99085a14f5c929f942fd9d9a05b7806d5ff1b85631bfa506eb7a6aed9fd01ec99bf91f24736f9f0e0eb6b7c0019fe0dddd2e615c",
|
||||
"@esbuild/openbsd-arm64@npm:0.27.5": "dce25568a9642e9cacc9d4ae5a8c07dcb5bd2c7aee5f31259334074d30a380cdec2b3654b15978f3b64965d7622bda51dd203ab774f9a499e3b55425eaf926e3",
|
||||
"@esbuild/openbsd-arm64@npm:0.27.7": "d99927053a0f8be5158da8ecde7e8a08dd0ea580ca93f006971730979681e3738f83ada4d6564a57cdd6f412e40e5a750a92f424807aa12f97c2ead52617ad41",
|
||||
"@esbuild/openbsd-x64@npm:0.27.2": "62670fbe1f609c5362df7b45968ded512a0860e2ad8a4715a89993abfa2f9f08a28f1294c7857d80e6d3f713639a71d291c06a961b331de67ad350032d1b8e96",
|
||||
"@esbuild/openbsd-x64@npm:0.27.5": "fa51a43619b0da031f3b2eb6ece65d9cd6a69b9e3f03693463ed9878b04764478990dd3047591b6e2880375ada9eca8db20aca0df238afee1ad3b664f7adec65",
|
||||
"@esbuild/openbsd-x64@npm:0.27.7": "1480ff755c727d056e5f37e1d2be83d36b137c9f3595911aaf1659160c2cbfea846bded0557017aaefd79a0322be5e381b168ebff3eec4af684198835504b051",
|
||||
"@esbuild/openharmony-arm64@npm:0.27.2": "e279efdc18301add96ea791ba9ef117cae05346688cd521fd225a60ad166add4bc995af985058e3b6ab9e65a7c49a79108a294d6aa26a1d1685ad0db194e2c56",
|
||||
"@esbuild/openharmony-arm64@npm:0.27.5": "4c6ccc2c466158bb635918ecf530c14cbe536c2afeaa3e8e0c8b61f80875134573705b96a1854b07238df5b0e0eb1ad26b424d7a4b56b73b8813fdaec553e1a0",
|
||||
"@esbuild/openharmony-arm64@npm:0.27.7": "6aa1fd102bdfa99b3c27f558f6b5d493b47f34260cc10967c47d44b86018a307377e0c70ef51b8886c592f2a0057710a8ad7781716b0eb059d0b0657b4f7ddec",
|
||||
"@esbuild/sunos-x64@npm:0.27.2": "7234302321d36576b5a9f027915417cddc195a67b19cdfb50e69c337ee0dd63a88be6b72d7ef299cd569d1af62e54774303d52d3d6b5e5858db975241ae467d6",
|
||||
"@esbuild/sunos-x64@npm:0.27.5": "e53d864a1e9f0b598461df53163dd837f1bbaba2f3590934b34bae132efb2c658d6f9b036d4e9a6f2b8327cb9b3ab99d7a8244009a856dd1063868d6989d204d",
|
||||
"@esbuild/sunos-x64@npm:0.27.7": "66bff01f90a97b989c6e6fbe6f8df77a0e5b40b57b8c4d8e6c407635546eb05553de570cd4e0d4624a5a6be8a61d7e9c6e7d8bc238f8f5773a4231361c0e8745",
|
||||
"@esbuild/win32-arm64@npm:0.27.2": "36620fddf79da3e8e527ef8331436929fa7a0b23c9b591af8f8573d80ed9c4ef45b24c6fa0abbb01d187dec497efa6c9d9d397d575afc1f28477e9ca16a48d73",
|
||||
"@esbuild/win32-arm64@npm:0.27.5": "cff774ddb4107461f5e48da9664a1813ad6234921cb51739a3915d2822e6429276f40f0edadb52f816a63143ded7e77b84b38416f1c98e7b80a8c8a6ae031363",
|
||||
"@esbuild/win32-arm64@npm:0.27.7": "eb7008345c82bbd4be30bb27ae4e17346cb5014801e9d50058984e7c5e4cb509d6eae82db3c04aab16b72d3829908b32151117222c107962fe3fb0e317e55951",
|
||||
"@esbuild/win32-ia32@npm:0.27.2": "96e8c1fa0ec2b5529ead2ba703e5da7644c138b2f9b6e285c05513f0455e99b2b0dcf399f01779fb384e22810e82f892491e44402772c62d3fe094b025bbdc0f",
|
||||
"@esbuild/win32-ia32@npm:0.27.5": "ae399419b6457492c53f2829f135285e87ca3bfde1bd11f780baa890b881b96659b0c7344d7e86c9e417531190e19f38a91f47ee1b238be5b5ce794957eac4b8",
|
||||
"@esbuild/win32-ia32@npm:0.27.7": "b6a44b5b6bf670cbe86de063335f03faa308d5b3eabbca1f5078bba9674ea42d3d6ad9fb9601fb0c7abba65d4b4a467f20473aedb856c9544c20166c75538029",
|
||||
"@esbuild/win32-x64@npm:0.27.2": "1ed08bebd916c16003f3784276ae683ab41d34951a0c272f6e072b8067a2b4bacd6f6f75a8dcea375b8545e15891d305425cf7c8dd31f7deab56ef22cde4a1e2",
|
||||
"@esbuild/win32-x64@npm:0.27.5": "37a9f52ea621a0366ca72c4fca89e9a5e2734dbadeb46eaff89d1d81f09147db4ac4afd7905b5d8fde8e99bb4b28db52ec27b043d355711d97080b34393d75f8",
|
||||
"@esbuild/win32-x64@npm:0.27.7": "4b91237b01e7e1a5083d2df524bb2ddb13da334197681fd33ad05975c073ccc901ea6b9395453276557608e5858cc032ed12807cc156c29f4ce7d2c63e04d5a0",
|
||||
"@img/sharp-darwin-arm64@npm:0.34.3": "952e9e9c34291502e7c21258d2874539a3953a5da8df52c8e2c459f673a76179eddd48c3b7563773db7bb36b2b241d781b98a667fac4b30c1f49c1cc9fdf9b7f",
|
||||
"@img/sharp-darwin-arm64@npm:0.34.5": "0f872f02a49c87c1c844c9715a1c1e4449fab30c85711d948767d41ea1eba1cc7be8268b582d95513e66cff090ab520e4104dcf30cc6f598ee429b40e890eeec",
|
||||
@@ -122,8 +122,6 @@
|
||||
"@rollup/rollup-win32-arm64-msvc@npm:4.2.0": "ff71a301051b237a32e14cb2b18117c72c5ab4524120184500e098fea028385806567fa55e4879c19f80d747774e3b8d913e0b4560abc8fe4881b392fda6ed79",
|
||||
"@rollup/rollup-win32-ia32-msvc@npm:4.2.0": "dd65d454384b6020b87f5f943121dd9d02e5bfbae2ec124a23f0a2034df02549c0ae4fb27558efda6668bab94b121c5463c4845431f2c1c9416a719176e1dd82",
|
||||
"@rollup/rollup-win32-x64-msvc@npm:4.2.0": "13cba2a14f7864986f3331c327a137ad95cf366411c0b6d3f66593bb6ea04d0058e12bd0a09fde72bbfb8660a554f0b66d90754e21add3c99d899e2bd7dfe1d1",
|
||||
"dmg-license@npm:1.0.11": "36c0a7b030801b91216affa9b2bb00caa345b2327f298accb2263a80a0320ca305f90b99da68007d187c830c543410d58a0a2bbc229e8d169b0e1d1652ff42aa",
|
||||
"iconv-corefoundation@npm:1.1.7": "0189733ef51a9f481379202cb1919f2677efc44aa014ba662a6fd99e47993e350eab0ff724ed18cda8011c9b78c4702b2d374f732955f1def3fd2a14a29d25c0",
|
||||
"lightningcss-android-arm64@npm:1.30.2": "823d5aa547e473e18832b47b575313dcfd9146697d53481c79b10dbbe45c62a7352f4da77f836b0c0e6a233545bb3456bece543f39e7d8ee6ef75b4d345af2fd",
|
||||
"lightningcss-darwin-arm64@npm:1.30.2": "23fd135ab0a081aec174a835b15218c5ad9ed4486823a1b8ddd8ca1795876e032201385cf6e3acd548a235d5f527e19ad213ca1c5fa0ef31d333d43d4f67fee8",
|
||||
"lightningcss-darwin-x64@npm:1.30.2": "4151c2744332798bcc83dea10c8da81a18c7dbc2d12c53a95149d7a5d24409b32f80eb42dd5933f109fe4c5715e25cfe6df3d21158191fdd682a99cc62f28b93",
|
||||
@@ -134,5 +132,10 @@
|
||||
"lightningcss-linux-x64-gnu@npm:1.30.2": "bc4959398f65fc60df2a2a011c2381029d9f92ed7a2a1930393bbef5515d3f18bd2885a4063f48031435595c22ddd10923c5e2ecbf53d086b18a3b65e10cfd47",
|
||||
"lightningcss-linux-x64-musl@npm:1.30.2": "2db0a94df42f23a051bac68ad0d4322f45bc0f47290810cbb012fc2292c42201ff1eae5ec0f83178da6f232ab4cc24a2fcaaf46b0867861966d9823610e352ac",
|
||||
"lightningcss-win32-arm64-msvc@npm:1.30.2": "307a014ddc51c6773be0b63db3ce3a09ff32c9093bd2e365689de0a07a45288a310154397f5dd6dfd6a5de726ebd4dec597482dd1bd4bfeeb65f5bff09d52ea0",
|
||||
"lightningcss-win32-x64-msvc@npm:1.30.2": "4c1b0406dad571a9754bf45becfd38af9d43eee94c93d8df881f862bc2597f72dc91dec0788aa67261cca79732c75afcd777e8786984a9e98d0d1fb66ced1a05"
|
||||
"lightningcss-win32-x64-msvc@npm:1.30.2": "4c1b0406dad571a9754bf45becfd38af9d43eee94c93d8df881f862bc2597f72dc91dec0788aa67261cca79732c75afcd777e8786984a9e98d0d1fb66ced1a05",
|
||||
"sqlite-vec-darwin-arm64@npm:0.1.9": "e1ad40eda22dd3a601565a1fcbc4d36e83560d4670dbef59639010a89fd3612697d2d5e2221d28a5044a6c461352ad83cc0595bb7e2b42594b9e76860f8a8291",
|
||||
"sqlite-vec-darwin-x64@npm:0.1.9": "71760fc97b4d1d15f503a378abfa4ad390192f5fd1009161261339f6a377a9f47f857ae2ee993e5b7e8ab1e49f168fd86976f23b4cf4da9a7ea9850709dd51ec",
|
||||
"sqlite-vec-linux-arm64@npm:0.1.9": "45b7e0ae0dc42acafc8e24b1f9f85b107b418cb7bc20a4f28ccb4abdacc45763fb417dd18c615c8aa76328da3b6bdd1d9e130baa97b446d62cf736da2ffa6010",
|
||||
"sqlite-vec-linux-x64@npm:0.1.9": "6608e83f4d0a838fa20589d055c00e67f4aa0f086212922efd0e1f64571d1e3f3014a765327f722ee11b2dbdcd618a7932e06fcdd5ebf15c57b8e157d95585c8",
|
||||
"sqlite-vec-windows-x64@npm:0.1.9": "8e2751b45cb93d8f896bf6e02b5676f75d7a68fdc199564401bd46ec2ddb81cce13f3ef96cfac15e14e5033eb96c322cb1fe21952b83aeb2abb54b769e43a426"
|
||||
}
|
||||
|
||||
@@ -105,9 +105,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# before we can patchShebangs additional paths (see buildPhase).
|
||||
# https://github.com/NixOS/nixpkgs/blob/3cd051861c41df675cee20153bfd7befee120a98/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-config-hook.sh#L83
|
||||
YARN_ENABLE_SCRIPTS = 0;
|
||||
|
||||
# Use nixpkgs' patched offline Yarn instead of Joplin's vendored Yarn.
|
||||
YARN_IGNORE_PATH = 1;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Nixpkgs provides Electron; don't run Joplin's networked Electron installer.
|
||||
sed -i "/^[[:space:]]*'installElectron',$/d" packages/app-desktop/gulpfile.ts
|
||||
|
||||
# Don't automatically build everything
|
||||
sed -i '/postinstall/d' package.json
|
||||
# Don't install onenote-converter subpackage deps
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubo";
|
||||
version = "0.43.0"; # When updating, also check if the repo version changed and adjust repoVersion below
|
||||
version = "0.43.1"; # When updating, also check if the repo version changed and adjust repoVersion below
|
||||
rev = "v${version}";
|
||||
|
||||
passthru.repoVersion = "18";
|
||||
@@ -18,7 +18,7 @@ buildGoModule rec {
|
||||
# Kubo makes changes to its source tarball that don't match the git source.
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz";
|
||||
hash = "sha256-vP/F7ZIdOVkDN16PoE8OiPFP/xbCxARq6EyyurA9hFY=";
|
||||
hash = "sha256-Rw+Q1VHzT/ZbUzKZ6PVe09Ly0GL9FcmY6lPQlbrD7SY=";
|
||||
};
|
||||
|
||||
# tarball contains multiple files/directories
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libcs50";
|
||||
version = "11.0.3";
|
||||
version = "11.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cs50";
|
||||
repo = "libcs50";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-G6QayPGR4lkeFuUYsFszekLAzzpA3hhIRmqt/OB0cdY=";
|
||||
hash = "sha256-guITfJoNEiQAjfKiDKltWoP8VcLsyeEuzU4odhpwyUI=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "libigl";
|
||||
version = "2.6.3";
|
||||
version = "2.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libigl";
|
||||
repo = "libigl";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-uef7aTF2U3iPVAWDGRIsH0YV0l/w8VxtYFPYVkuC1dI=";
|
||||
hash = "sha256-/+wE3ZgqHWdLMaZZE/j7unrx10nd6sh9+JF5P0HB8i4=";
|
||||
};
|
||||
|
||||
# We could also properly use CMake, but we would have to heavily patch it
|
||||
|
||||
@@ -27,11 +27,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libmirage";
|
||||
version = "3.3.2";
|
||||
version = "3.3.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/cdemu/libmirage-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-wMAzJpEue1QnDllWheFk3ZX+8pSkYw13s+GU0G/AOfs=";
|
||||
hash = "sha256-tICwgjCyJVr0DDrIY0TAx3/JloZgFOBaadVVTpA11ls=";
|
||||
};
|
||||
|
||||
env = {
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "mednafen-psx" + lib.optionalString withHw "-hw";
|
||||
version = "0-unstable-2026-09-02";
|
||||
version = "0-unstable-2026-09-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "beetle-psx-libretro";
|
||||
rev = "b4bca9f868176b157f021add3a96991aca12cb4d";
|
||||
hash = "sha256-gGyOAJw7yjMYZdR5I2ui84TZKgChVS3513mMF+xIZlA=";
|
||||
rev = "82d8e051d1c7741a18d930be90e458b48abaa9a1";
|
||||
hash = "sha256-CtYOhTHnG5l5Pl67p2T5JDO7oV9qHYgBrnUBMYsh5Eo=";
|
||||
};
|
||||
|
||||
extraBuildInputs = lib.optionals withHw [
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "fuse";
|
||||
version = "0-unstable-2026-09-01";
|
||||
version = "0-unstable-2026-09-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "fuse-libretro";
|
||||
rev = "7d9826bdc1e4faf658293fa94a16cea81fd26bba";
|
||||
hash = "sha256-/NAkYUPQQGqEBwd3U+sge2EFpGsDvGMKMYQym1xLmRA=";
|
||||
rev = "958105a90ad2b5825ad002ba563cc3f9f879d763";
|
||||
hash = "sha256-pJbknBsJRlpNujefW6Oll7Dd1khnOyS0cZeNeiIUb4g=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libsupermesh";
|
||||
version = "2026.0";
|
||||
version = "2026.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firedrakeproject";
|
||||
repo = "libsupermesh";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-f/5y3XherRbN/Eq3tfivrOHByF8LAXtYN3v9Vx82m8Q=";
|
||||
hash = "sha256-YhidGtrx7XaaypGgdXfVX7/PpGvS6ZUEIeY+88DWLNA=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -47,14 +47,14 @@ in
|
||||
# as bootloader for various platforms and corresponding binary and helper files.
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "limine";
|
||||
version = "12.7.0";
|
||||
version = "12.9.0";
|
||||
|
||||
# We don't use the Git source but the release tarball, as the source has a
|
||||
# `./bootstrap` script performing network access to download resources.
|
||||
# Packaging that in Nix is very cumbersome.
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Limine-Bootloader/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-nun1IDdh9RE0Dx7RG6qaqGUma7ZXJQCdxtLYgo/3AxI=";
|
||||
hash = "sha256-reqSKvO5yBeaRna87Mjk3y8+9yrTaz9K+rRMv18mXjY=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "livekit-cli";
|
||||
version = "2.18.5";
|
||||
version = "2.18.6";
|
||||
|
||||
__structuredAttrs = true;
|
||||
__darwinAllowLocalNetworking = true;
|
||||
@@ -19,10 +19,10 @@ buildGoModule (finalAttrs: {
|
||||
owner = "livekit";
|
||||
repo = "livekit-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-zZlkBz9jXO2eSNf/c6dqSNgiAbtFiU+B4Th9rxOISGw=";
|
||||
hash = "sha256-kdvlrRS9sKi84QL1DRsB0gTQoP+J4qYaIAtQUh61goY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-iurI0XZcsQ6TFmjM2mmPrx2ZYBW4NdQgmW8g72oqzww=";
|
||||
vendorHash = "sha256-AF1764F5g7dfo26G0Veoo0D0xiMPDArARR3Osm8htEI=";
|
||||
|
||||
# Use nixpkgs portaudio package + pkg-config rather than relying on a vendored
|
||||
# git submodule, similar to the homebrew solution
|
||||
|
||||
@@ -48,8 +48,8 @@
|
||||
let
|
||||
# Upstream reads these from git, which the release tarball does not ship.
|
||||
# They are purely informational: `llama-server --version`, `/props`, and the web UI.
|
||||
buildNumber = "10809";
|
||||
buildCommit = "5266f24";
|
||||
buildNumber = "10964";
|
||||
buildCommit = "b29c606";
|
||||
|
||||
# It's necessary to consistently use backendStdenv when building with CUDA support,
|
||||
# otherwise we get libstdc++ errors downstream.
|
||||
@@ -87,7 +87,7 @@ let
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "llama-cpp";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
@@ -101,7 +101,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
owner = "ggml-org";
|
||||
repo = "llama.cpp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-WImZjO3U9EXZUNP/FMpxo8PaTjQW8X2SBTfGwwFlZIM=";
|
||||
hash = "sha256-qu/K1RdJMzOxWr+qnHorpMB4650uctBHW/Og+4oDVLM=";
|
||||
};
|
||||
|
||||
patches = [ ];
|
||||
|
||||
@@ -15,8 +15,8 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mautrix-meta";
|
||||
version = "26.07";
|
||||
tag = "v0.2607.0";
|
||||
version = "26.08.1";
|
||||
tag = "v0.2608.1";
|
||||
|
||||
subPackages = [
|
||||
"cmd/mautrix-meta"
|
||||
@@ -27,13 +27,13 @@ buildGoModule rec {
|
||||
owner = "mautrix";
|
||||
repo = "meta";
|
||||
inherit tag;
|
||||
hash = "sha256-/NwO6B3IevmkP6nOgZ+Zjg12PvY/cGmH++7pKsJjaAk=";
|
||||
hash = "sha256-xTfbLtQ1lo6ukWlGjNwjxYaLMod6hljhQEcwdSgoBcQ=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional (!withGoolm) olm;
|
||||
tags = lib.optional withGoolm "goolm";
|
||||
|
||||
vendorHash = "sha256-ykTk6JQ6cMBH0HYK7n1FWxhAJkD7HVKrg9HChtvuCMk=";
|
||||
vendorHash = "sha256-CCGF13D0QO2GAE+kN/7xl924rSloqikDoGPr00clofI=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "mcp-searxng";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
@@ -15,10 +15,10 @@ buildNpmPackage (finalAttrs: {
|
||||
owner = "ihor-sokoliuk";
|
||||
repo = "mcp-searxng";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-VLEsHFhWHfjfKXDi0UHNpYcFF+G59x3vpu7dQN00xKk=";
|
||||
hash = "sha256-LMlbuPF8KuUZlD9HUjhunuHl2tmCMSeydBZiWuGWRHA=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-WK28hNI3/YC60LtggH0clcaq61aR3gvsuZeDLUZpGj0=";
|
||||
npmDepsHash = "sha256-MqVn66vCbB8+3o6KB6GCU9GxsPtqeCYjTbI5A3nfTVs=";
|
||||
|
||||
meta = {
|
||||
description = "Private web search for AI assistants via SearXNG — supports Claude, Cursor, and any MCP client";
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "meilisearch";
|
||||
version = "1.53.1";
|
||||
version = "1.53.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "meilisearch";
|
||||
repo = "meilisearch";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-MQ3W8Y4ewJZA+ciBGKjGuV90ae4RaMJS+PIjCGGOV7A=";
|
||||
hash = "sha256-bbVuB8brplUAqKrmTBah4HKbmshv0n5Hn2v9hUnY62c=";
|
||||
};
|
||||
|
||||
cargoBuildFlags = [ "--package=meilisearch" ];
|
||||
|
||||
cargoHash = "sha256-Rovn1xw3Bg7J+FeIMHQP2BW5IpDyCORud8VXIU8UpqI=";
|
||||
cargoHash = "sha256-ojRJPL3EHyGmWHcX5SLv11fkP1pUNKrYkd82GEC4zKE=";
|
||||
|
||||
# Default features include mini dashboard which downloads something from the internet.
|
||||
buildNoDefaultFeatures = true;
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "minio-warp";
|
||||
version = "1.6.1";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minio";
|
||||
repo = "warp";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-DHVk6SfDp02Y15k/c7oRfU94mnMg4oCdCyF5Q6dUC5o=";
|
||||
hash = "sha256-o0baBW16dGamPByeU8cTK0HsprvjvHScf2MyriN+lok=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-RkvYlZCUZ9PzM29sq6ABdeis7EuZluDz68++cnX9oIw=";
|
||||
vendorHash = "sha256-d1u3OQGgh64E3/0NKEXTmcakJNkZZgNiTE7Rshm0xQQ=";
|
||||
|
||||
# See .goreleaser.yml
|
||||
ldflags = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "minutor";
|
||||
version = "26.1";
|
||||
version = "26.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mrkite";
|
||||
repo = "minutor";
|
||||
tag = finalAttrs.version;
|
||||
sha256 = "sha256-jz+3G1/4+QlUTRBOFKaTWPSBbJRcWDzFWsG+dqVFMBg=";
|
||||
sha256 = "sha256-w6BsNPtXyyyKi+VdjBm6fD2Dz10lq9QrMbtENkbE3f0=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@@ -2,31 +2,23 @@
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "mpd-mpris";
|
||||
version = "0.4.3";
|
||||
version = "0.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "natsukagami";
|
||||
repo = "mpd-mpris";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-w8OH34JW++OYLpNIHfQvc45dFyU/wVWVa+vEwWb8VqU=";
|
||||
hash = "sha256-EOZiOFBe5j1WsrJLj8++QsgNUZR44M6ae40KKl2Qac8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ugJEw02jSsfObljDaup31zoQlf2HvwDRUljD7lp7Ys4=";
|
||||
|
||||
subPackages = [ "cmd/mpd-mpris" ];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/natsukagami/mpd-mpris/commit/1591f15548aed0f9741d723f24fb505cb24fafe8.patch";
|
||||
hash = "sha256-6ZqR4woKiIjwLxyafmidTM8eBXtvBzKNXZvtS1+KKKI=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace services/mpd-mpris.service --replace-fail "ExecStart=" "ExecStart=$out/bin/"
|
||||
'';
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mprisence";
|
||||
version = "1.8.4";
|
||||
version = "1.8.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lazykern";
|
||||
repo = "mprisence";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-kPFTnwuyjad6qmJRg4ryFDL1slOt0JdOtzz3WTP0cKQ=";
|
||||
hash = "sha256-GiRhhJv6CHRWaTNdMLkEbldZJcL9ol849JwCky64H/s=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-tY6SBZ+vAGSTFRpOB4Y+ilZOx8EHOeLFsp3ZuQF0eQU=";
|
||||
cargoHash = "sha256-maEBwe14jMy608fs9yJ4T9Z0xvYgGWDrMnPaSic4PCs=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "mtail";
|
||||
version = "3.4.10";
|
||||
version = "3.4.12";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jaqx0r";
|
||||
repo = "mtail";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-c72FgXHjQqTV8eI0fLqZaT5A4YY04258q6MefqKN7/0=";
|
||||
hash = "sha256-RkevdYk8SVhyBgpCFhAXqA8TYQBG8azh2h0w2HhF/9Y=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-pxO9Hk2NsvGklbvMZJWwyUlHzrTWylC7SBGdaNCv7x8=";
|
||||
vendorHash = "sha256-jaioqP9J+HwxY1fdltZ769cqviSogztaKA1KMyV4cZ0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
gotools # goyacc
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
libgcrypt,
|
||||
openssl,
|
||||
zlib,
|
||||
bzip2,
|
||||
nixosTests,
|
||||
@@ -28,11 +28,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
libgcrypt # provides libgcrypt.m4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libgcrypt
|
||||
openssl
|
||||
zlib
|
||||
bzip2
|
||||
];
|
||||
@@ -50,8 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"--with-pkgconfigdir=${placeholder "out"}/lib/pkgconfig"
|
||||
"--with-systemdunitdir=${placeholder "out"}/lib/systemd/system"
|
||||
|
||||
# Cross-compilation hacks
|
||||
"--with-libgcrypt-prefix=${lib.getDev libgcrypt}"
|
||||
"--with-crypto-lib=openssl"
|
||||
# workaround for cross compilation: https://github.com/dun/munge/issues/103
|
||||
"ac_cv_file__dev_spx=no"
|
||||
"x_ac_cv_check_fifo_recvfd=no"
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
stdenvNoCC,
|
||||
fetchurl,
|
||||
autoPatchelfHook,
|
||||
makeWrapper,
|
||||
@@ -14,64 +15,105 @@
|
||||
e2fsprogs,
|
||||
xkeyboard_config,
|
||||
qt6,
|
||||
undmg,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
let
|
||||
pname = "musicpresence";
|
||||
version = "2.3.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ungive/discord-music-presence/releases/download/v${finalAttrs.version}/musicpresence-${finalAttrs.version}-linux-x86_64.tar.gz";
|
||||
hash = "sha256-w3y1I6nnztEMaihbXIfQqB0ng6s07iA8bqC8PDq+E+I=";
|
||||
sources = {
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://github.com/ungive/discord-music-presence/releases/download/v${version}/musicpresence-${version}-linux-x86_64.tar.gz";
|
||||
hash = "sha256-w3y1I6nnztEMaihbXIfQqB0ng6s07iA8bqC8PDq+E+I=";
|
||||
};
|
||||
"aarch64-darwin" = fetchurl {
|
||||
url = "https://github.com/ungive/discord-music-presence/releases/download/v${version}/musicpresence-${version}-mac-arm64.dmg";
|
||||
hash = "sha256-IvUyzR9amMhyWHRuhTuqUFALCE3QTRjHmsASKydnj8Q=";
|
||||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libGL
|
||||
libxcb
|
||||
libx11
|
||||
wayland
|
||||
fontconfig
|
||||
freetype
|
||||
libgpg-error
|
||||
e2fsprogs
|
||||
stdenv.cc.cc.lib
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
dontConfigure = true;
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp -r usr/share $out/
|
||||
|
||||
makeWrapper $out/share/musicpresence/bin/musicpresence $out/bin/musicpresence \
|
||||
--set XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \
|
||||
--prefix QT_PLUGIN_PATH : "${qt6.qtwayland}/${qt6.qtbase.qtPluginPrefix}" \
|
||||
--unset QT_STYLE_OVERRIDE
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Discord music status that works with any media player";
|
||||
homepage = "https://github.com/ungive/discord-music-presence";
|
||||
license = lib.licenses.unfree;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"aarch64-darwin"
|
||||
];
|
||||
mainProgram = "musicpresence";
|
||||
maintainers = with lib.maintainers; [
|
||||
wiyba
|
||||
nonplay
|
||||
itsyunaya
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
linuxDrv = stdenv.mkDerivation {
|
||||
inherit pname version meta;
|
||||
|
||||
src = sources.x86_64-linux;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libGL
|
||||
libxcb
|
||||
libx11
|
||||
wayland
|
||||
fontconfig
|
||||
freetype
|
||||
libgpg-error
|
||||
e2fsprogs
|
||||
stdenv.cc.cc.lib
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
dontConfigure = true;
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp -r usr/share $out/
|
||||
|
||||
makeWrapper $out/share/musicpresence/bin/musicpresence $out/bin/musicpresence \
|
||||
--set XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \
|
||||
--prefix QT_PLUGIN_PATH : "${qt6.qtwayland}/${qt6.qtbase.qtPluginPrefix}" \
|
||||
--unset QT_STYLE_OVERRIDE
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
in
|
||||
if stdenv.hostPlatform.isLinux then
|
||||
linuxDrv
|
||||
else
|
||||
stdenvNoCC.mkDerivation {
|
||||
inherit pname version meta;
|
||||
|
||||
src = sources.aarch64-darwin;
|
||||
sourceRoot = ".";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
undmg
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
dontConfigure = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p "$out/Applications"
|
||||
cp -a Music\ Presence.app "$out/Applications"
|
||||
makeWrapper "$out/Applications/Music Presence.app/Contents/MacOS/Music Presence" "$out/bin/musicpresence"
|
||||
runHook postInstall
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "nats-server";
|
||||
version = "2.14.6";
|
||||
version = "2.14.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nats-io";
|
||||
repo = "nats-server";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-k6iKQenlbb2TwWFt87MqnlskfX8F+Ett4QCQ8ZmMCLk=";
|
||||
hash = "sha256-vtH3KlTpfXwDgWdCN14d5CFx+Lffs5T29s6MZ9OVeZE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-VB4x100hSSsY6fqODuIefanzchOHlfyfJrNSJUea42U=";
|
||||
vendorHash = "sha256-C2CLryuDRyCTtaZ/oIInsGDWcUqWuSsohPKccykC32k=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "nelm";
|
||||
version = "1.27.0";
|
||||
version = "1.30.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "nelm";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-+8xumcvtnlS+uWkeFTx7omSTaJW7h7bDtzibCwT/Uuk=";
|
||||
hash = "sha256-fvTt2pkjXPO1fsG6bfn6PKP6whNLpWrh2HIGE6aaHX0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rIiphGjE/a5IwF6Fkk3Ffq36AfEkfAZb12ZljlYP6X4=";
|
||||
vendorHash = "sha256-ddI1TFqz4tVJnExZkxpPSVIU4XUFo7S/sWGdcT0OGAE=";
|
||||
|
||||
subPackages = [ "cmd/nelm" ];
|
||||
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "neowall";
|
||||
version = "0.6.1";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "1ay1";
|
||||
repo = "neowall";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-JzLp6/mJrYRq28XAIccsOxrG/RTDfWIojmmp1oQmiwI=";
|
||||
hash = "sha256-yxEC5PlTRg4U7M8I7/2jL48Qw/CX3F2phz6zxL6xfYU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -48,7 +48,6 @@
|
||||
ethtool,
|
||||
iptables,
|
||||
kmod,
|
||||
libgcrypt,
|
||||
libndp,
|
||||
modemmanager,
|
||||
mobile-broadband-provider-info,
|
||||
@@ -231,7 +230,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
gnutls
|
||||
libgcrypt
|
||||
];
|
||||
|
||||
nativeInstallCheckInputs = [ udevCheckHook ];
|
||||
|
||||
@@ -25,6 +25,9 @@
|
||||
"@esbuild/win32-arm64@npm:0.25.12": "f61e582d7a3fa474cf764573dd9b54a48bd4f0bb0684f4a588a79a1ba0fe37447bc8bc5d2d8809d1f27022ad0c95a5728ce7d2b5941dac78607c1e50ca14c6d7",
|
||||
"@esbuild/win32-ia32@npm:0.25.12": "4c135f8face7b6e5682efc5972367b579f06656487d1859c3e3165d5e10a95c455bb0aa69339fc3db215084f3229ffb954d87b2780645993f70dee883cb9ba73",
|
||||
"@esbuild/win32-x64@npm:0.25.12": "7db86204f566c4d1155458c6e383d5f560a3f7e00475c65e97549e30a222bac66bd64cfd422691a7dcead2e0518e50aab5caeb7f525dfea6875c3209d6352e8e",
|
||||
"@firecrawl/pdf-inspector-darwin-arm64@npm:1.11.2": "dfca329b296864db252ba5b87ac80375874e08b853f8bdfc0af2cd6e9c93fcee5a2634d46e8a1cd771bc1a3cf522695196b68e26fb258979c200ce93514945cb",
|
||||
"@firecrawl/pdf-inspector-linux-x64-gnu@npm:1.11.2": "3fd28e1ee5465991e0cf4a33e56b7a2c2dd0173697cc8ab5ae3d580b31add477189b41cc22479b6e71fb216bb6103bd7cf264b5c288a2f057346208fb10f442e",
|
||||
"@firecrawl/pdf-inspector-win32-x64-msvc@npm:1.11.2": "e50db05a826137101f22d114170251edc33163a9547a91f4f6ee34c523460c59bdf5b7d30c63b7318af259739889daad0ed4b643f3f105b5e20e196f3dbb7372",
|
||||
"@msgpackr-extract/msgpackr-extract-darwin-arm64@npm:3.0.3": "f8d48613de17e5356d273745042bbc7c0d345e1e4e5e88ed1132a3ed9ca65db9f8b908a708383d7a58ede276c105e7c9a2887fad00d5e47892010466e5312b47",
|
||||
"@msgpackr-extract/msgpackr-extract-darwin-x64@npm:3.0.3": "270f8831d7f6d61ff36e7118e09ec13baa633bb22dd57fa3a9e6af67f7036a3fd1beec4c8aad1c72639522300364cef98bc5ba2cddf67a3832f8a35b7fc45502",
|
||||
"@msgpackr-extract/msgpackr-extract-linux-arm64@npm:3.0.3": "326c19865ead39017326dd8066cde30adaf87a62b968a22d5e5369691817086f681fc291be80b7c61c5496fe915f6df546f41e14ee18b896c54de5099cf147ac",
|
||||
@@ -68,65 +71,65 @@
|
||||
"@oxc-parser/binding-win32-arm64-msvc@npm:0.132.0": "1c8db4cddad78adf0d5113047e7d85ca99ee6cf24db0b5cf143cc30461620e141cc42038928903c3d605e7dd449bb9a48030d15bfdcbccdd648c86e80f6316ce",
|
||||
"@oxc-parser/binding-win32-ia32-msvc@npm:0.132.0": "38d5fe8cd2c5c0d2b3761fcc33062945e030951507b2d434ae060f9363686f267560ddad79e693d56cc9a784d74f5721eae019b18b283ae4f3651215a0a64aca",
|
||||
"@oxc-parser/binding-win32-x64-msvc@npm:0.132.0": "3730b86c60ecc874a4c084cf7b020d7290996360bab49d669e2a931f999d53d9fecf9fda9b64fcfcaae34a08dbb41f6088ba10b03f1557f97dc8d91f67aa4074",
|
||||
"@oxfmt/binding-android-arm-eabi@npm:0.55.0": "db8a91daa54aefc35d0df1514e1e62aa3e2c91e9de8aa8ed7405ca5c156265b99b07013b36739605283d4156a2aef76ef09d0958c4d81a3be54a0cbbfef4335d",
|
||||
"@oxfmt/binding-android-arm64@npm:0.55.0": "8da5bc33f3e9a1ab77ff6e605b4f0a552caf0e1a25d01d0283751be241895aee803813a01b4f0afad0eefcec6617cbc22231907911d305f613f2af7ae0bc4b30",
|
||||
"@oxfmt/binding-darwin-arm64@npm:0.55.0": "ecb275e4cecdab5a662b447f47e4543cfefa2a80fcca5866495059588e1b501ac9ca43d3dfedbc4c1c575c89bc28ceba861e6fbbd46b0a348e57a7a6e02267ab",
|
||||
"@oxfmt/binding-darwin-x64@npm:0.55.0": "8f26b824c2e45346b3fdb2b3b9077a0a23248c30a0c658a4b7fdba96d241ff6dec9b5ae1cc194ccd237da6f0ff728cfd0c7a93536735d94f50ed6fbbeeeeb3a1",
|
||||
"@oxfmt/binding-freebsd-x64@npm:0.55.0": "06893834ac0a8b260395124da57202a7064bd663b7cc573273e92695169f01c68250c4d6a6654e19ff59ae9cd47e56294da053a792a7433637174ade3db10430",
|
||||
"@oxfmt/binding-linux-arm-gnueabihf@npm:0.55.0": "95b008c5eb6853a955ef3d12ed8def4be2527dd1b16bc27df739e6673f6eec4ffe5ce534bd5330b9211e85a6c12efa40c19d6676001dddf83aebc0c8edd28451",
|
||||
"@oxfmt/binding-linux-arm-musleabihf@npm:0.55.0": "37ce178c61351907abafc8a7ca3502f884f9a01a07c89f0ab8b4fd7e585f7993beb391f7c334a59195b61c976fd3827896a8a6beb41302cde57f0d09991d1ee6",
|
||||
"@oxfmt/binding-linux-arm64-gnu@npm:0.55.0": "bf70fd44e3b78e27dec4a9b8af1b5490131edee6e6a634a9eae5459dc57c23b05eb1b749777b640ea3f6a71841ad99e4528a5868ebe21afceea79e8dbf1c58a3",
|
||||
"@oxfmt/binding-linux-arm64-musl@npm:0.55.0": "f86c290c3af1009cbf1961fd6069859a2611b3da7ce8ba445a30b981d561883f744b485be49b9aa9edb9b3da3e27cbf641ea55ecd8cb38e4693326e8b79a4aa8",
|
||||
"@oxfmt/binding-linux-ppc64-gnu@npm:0.55.0": "dee16ab629f31db5f0158d2f444776373a8e27f8640b72e03286beb3b5ba250d1fcd0f10f2c3d14e81d2817fc48bf5a5ae67899ee372d76f9df62db997dff69a",
|
||||
"@oxfmt/binding-linux-riscv64-gnu@npm:0.55.0": "2903deed7cd31924a98e40bf1ceec4607c95cfc5780264646b0e598fc26a1141febf2fdb154dfff9b49a7be7856bd4bd67a7c59a3f0e3e07903067e1d51373da",
|
||||
"@oxfmt/binding-linux-riscv64-musl@npm:0.55.0": "5c64f07da7847c745872fe837e393222a1e8827f292dfffef4217e42cb8a0b41b81a0bede62173508528b3d8a0fb4dc4eedb319d9406c87d412589d4496a47da",
|
||||
"@oxfmt/binding-linux-s390x-gnu@npm:0.55.0": "8e484ececcc25fbd5379c31f8599af97929e9a2baa46731e351b757df3b0df50cd7e04dd9a28317b2b148cb18c720409712f7b8c0f42b2fd5b18123e3c509369",
|
||||
"@oxfmt/binding-linux-x64-gnu@npm:0.55.0": "4040e25bfa22475c2fefb47dafacaad9cb0c97845c0b541aa3730e4fcd83ef03da815d5116d04364cea111941670000423689b08b8dacb9fc3699d2cb55a2466",
|
||||
"@oxfmt/binding-linux-x64-musl@npm:0.55.0": "85ea999af23c3b1e5ddf8f06aeb619895328475d1824eec599f6de408ef7ad9f917513329ed47e0867aa606b4718d451699a393a7f23f3c45950199a0bd20da5",
|
||||
"@oxfmt/binding-openharmony-arm64@npm:0.55.0": "e23c4e65a7dfe5cae461972ac944e25a567b03a4e8ae04f19ffc79b6e97d222b4c52616cd66ae476f67e3837dfb53d8ff5e01ce96446875874a1a2f3a39004a2",
|
||||
"@oxfmt/binding-win32-arm64-msvc@npm:0.55.0": "6b60e8f6d17b613fb4c0972562cc30fb52848f432d93053933e2b308a1ca6b278ef76512cb7f9fd6b1f91bd4d09f682fa30a84a04b6efeab18868b9d13c57f3d",
|
||||
"@oxfmt/binding-win32-ia32-msvc@npm:0.55.0": "e62d050b0bd25ff69a0e05871748a0f1ecbab6422d316011dde1ee7282b3aa486b935b696c227f1974213cf694a2ddf990612d60397082be980e8baec4e91ef0",
|
||||
"@oxfmt/binding-win32-x64-msvc@npm:0.55.0": "0253d8ba81515c47cb3f1e50a41f47b57c6bf8ec547f9c8a95195e109f9478beb37a69a304663499a610514c4f2f778f91be9b62a6bdb953e1b85a8430ceee9d",
|
||||
"@oxlint-tsgolint/darwin-arm64@npm:0.23.0": "e17e81055c2182b06ec51766941d1ae6a0381b4a1e052b026d2f592e6da3880258ab19e064bd118dcc48f86b60a18c33b4c8abaced11370da3ee0c4ca00e3e5b",
|
||||
"@oxlint-tsgolint/darwin-x64@npm:0.23.0": "37cc945adfc7b647880f76bc67d51eac57a99cac22a096338eaebd1e2f37b1553124f244bee52e7f8434820dfd909a2ea95c383091f6d3b5e79636c6cf09b660",
|
||||
"@oxlint-tsgolint/linux-arm64@npm:0.23.0": "8e86218c4d947affa90b2fd148d75899f88fad013cafadfd7f3e7d780230f23af982502c4e3c28c418ac39b3ecb1e19bb9e00011176950c93ecc7a95b95df307",
|
||||
"@oxlint-tsgolint/linux-x64@npm:0.23.0": "6bf6a5ff95c7bc92a6a6590db83f9b6dc595b60cc5237aa4262f7c9c5ee025b351a6b541bd01f7c9ef5d5e48e636d758e3e23242197a7d7181c42e99bb101879",
|
||||
"@oxlint-tsgolint/win32-arm64@npm:0.23.0": "19d0e140073c7bb4b0df1845df03b33fde14889331c99978d4052aeae8ae288fbd1e968ab7ac163f39d0fef35ac026f27f049eabfa713f69a8bdad5416ff509e",
|
||||
"@oxlint-tsgolint/win32-x64@npm:0.23.0": "c4cc0d3155382b81e6949297b993db383b37130dae254aaa450e72d5991b7d8ef9d34dde95e86f42297ad896c276eb2a5b1cd54da101dcec09153e99a8fa8e0f",
|
||||
"@oxlint/binding-android-arm-eabi@npm:1.70.0": "576c756510ae4141c731669f45d89d4e66b80c40e094c492d5a96f6f6fe8e91af7010ff3760199a305cf788310692f832dc059ef38ccfbc74ebcfdb7afe6ab55",
|
||||
"@oxlint/binding-android-arm64@npm:1.70.0": "85bbf851de0860fb18bb8c839ef50edfe95a2eae9e59a393055f1ece175e5b5324193c9be6c784e5d97ec300e7dcab4f83a29c7e50346b36efd7c16d8a901a19",
|
||||
"@oxlint/binding-darwin-arm64@npm:1.70.0": "1b80940373898596c5fcfba65815581ea34ad916d41c97894f626abce094acac8555bf416e308b46ae81afdf42623618cb7463863a159c000ab130dd25bfdfd5",
|
||||
"@oxlint/binding-darwin-x64@npm:1.70.0": "c84cdc76878cd085c2a2a963e5fac7d2e07fc7601e747404710e074a3766ac438438a047c48745ace76eb59f92cc8ab72036868af10068a549ed694301d55978",
|
||||
"@oxlint/binding-freebsd-x64@npm:1.70.0": "9f76aa70ca71851978a9461f2d2bb3b009bde4a06f930b3f59e35a803c4718961cd7cc64b6d20996832529fe99f5d47a0c8a9fe5137ce18b7e9c879a0f721b0d",
|
||||
"@oxlint/binding-linux-arm-gnueabihf@npm:1.70.0": "0755e542d531ff5a282714bfe6b207cd787f959952bd7cc3dca1567dbbe414cea6e50a99a1e83950b2e2ac4909c8191206cb7f592636dd332f0e69c90e2af641",
|
||||
"@oxlint/binding-linux-arm-musleabihf@npm:1.70.0": "116fae450766a6d935c1ea72cab0ae34b07a0131bc81aa40741c506c682392d6f988fb4674aec9d27e43f3621df6d3a7c6621226d2884b26540db9cba289fa90",
|
||||
"@oxlint/binding-linux-arm64-gnu@npm:1.70.0": "078d14a8c161453c885f85a96d8ca65875d2010decbd53dee97ed5b2e36df6a2bb4e49e5a8877ffafcdcae87442af560579be2bc504689d422b6bb6e1223ab04",
|
||||
"@oxlint/binding-linux-arm64-musl@npm:1.70.0": "bf470dcc1fe242e2dba012a78cbd9aadda938e3864125df407457ae8a3d6372768b3107018ed935e994d567660d65b114f8125a29cb6aeaa28cd0c3c9be1ce8b",
|
||||
"@oxlint/binding-linux-ppc64-gnu@npm:1.70.0": "c2c6e315722208d0a5b69b6914123879fb575d1a47114b86b6bc642978305302e4a442065eba68613870d262f37bce4d76f94f2e33ffbfa009cdacc7d911b3c3",
|
||||
"@oxlint/binding-linux-riscv64-gnu@npm:1.70.0": "281cb6a85618c8d18416976627f5aad57efe9c6f9bc4a3f9846832616d38aff1811018575aa4e86446d54eb56bfa9a50f3fab50b79ed3fe342cff3e02894ec97",
|
||||
"@oxlint/binding-linux-riscv64-musl@npm:1.70.0": "c583ba96d48900d3d62aaf9399fed3b1d4c0f6310883192c5dc1624baa6ab80428453eeb56452cbfd636359b853b5582895e7075d844235d79d3f8227a606910",
|
||||
"@oxlint/binding-linux-s390x-gnu@npm:1.70.0": "a831b82844d8de4d9914c8a7083f65460309a00f2cd06e01b5b4b5709bca10261143c8742c5f332e76a477a9f49706d91ba03700f68ca973a689226509d1345a",
|
||||
"@oxlint/binding-linux-x64-gnu@npm:1.70.0": "8aec65aa456257f37462083fa532b7fac14956320dc5e59d94b7fa2bf38783ffb30e0b1d01ed86f097bffc922f4e0ee7b5381aa17e3e31342c30191dc91944cb",
|
||||
"@oxlint/binding-linux-x64-musl@npm:1.70.0": "cbfe64382cd29e256146e03aa7d424ba52d6cd097f413abf4e905b4eebe8b1a71aade73a09fe4afe7b1a43be3709161c0d0fede9042678eabf406dcffac9fd33",
|
||||
"@oxlint/binding-openharmony-arm64@npm:1.70.0": "f0138fe9858816026bc50a84332a53d9c9c7121b621539a1d3de87eddadb2c5c8fb387ebbb4cc6676e99a9b16921db9d6138570d43c217d41c215751f1ac357b",
|
||||
"@oxlint/binding-win32-arm64-msvc@npm:1.70.0": "338873a04a5c00ff76be3bcdc1991cfe65c35257f1703b984da009c6e0abf31d06a6b3b3943d76db4c1423116299d6f29a1c0485c4f528cc24b49b3ef1302103",
|
||||
"@oxlint/binding-win32-ia32-msvc@npm:1.70.0": "3149d183b7f4d8c90348a24521d0a442d3673b55e4e0a6d2bc26e618e57a33f24cc76492156254d79acaf986803ebdec8d7f310db1547802a49c5e0a4a0fa593",
|
||||
"@oxlint/binding-win32-x64-msvc@npm:1.70.0": "bc410bfd875fe7e677bed2c8c90a5380155543136130dbc363a72c796c84926e1e79cf072da040ba82c87f5d1ed616e71a17caebf876a76d880217d22760a698",
|
||||
"@rolldown/binding-android-arm64@npm:1.0.3": "35e2b7f9e54c526cee5433351b0ef376dd1657d8a6eecf00512dec4720bb02594268bf8d3b661199917bdd286d4370bf3c3461b08eb74f0eae77bd13585e260a",
|
||||
"@rolldown/binding-darwin-arm64@npm:1.0.3": "7e7d168d091053100a785c0240d6d6134039bf0fb7a658624fa33426b148e9b8131d1690729b32a7b1e65329879c15601b7afd576e149ca6feb6302c530ed860",
|
||||
"@rolldown/binding-darwin-x64@npm:1.0.3": "0721c045d1446138e49dca250c8716c1b2eb4f1595bf1226a2c273befa063f91c4623e4cd5d338e969626e4281541b958c4a3d4649c0c553da0ec42292450a8d",
|
||||
"@rolldown/binding-freebsd-x64@npm:1.0.3": "faa48a73ac1b1a4af8ed7b67932a59b62f139d76f21d1ccbe5efb5ab8a5a61e1f5de0b5d9367a9ecd8759bdab3aa1734aefd2214bbe2cfc4b0cb119f6e5391da",
|
||||
"@rolldown/binding-linux-arm-gnueabihf@npm:1.0.3": "fab607d7639bf6d3393f6e0da0c9680e2d357b550abc50d7dc60cd45e25c788cddee38deac074d9c987e22532d83dcd8a76564710654663bd65622a190548c72",
|
||||
"@rolldown/binding-linux-arm64-gnu@npm:1.0.3": "a067fc8d80a6af88893010abb55d697221afa8f9d3f468082bc759305f2decbf16f8655a5313e6e608d1b2f103d28922607290ab85d575b78930bc9daa777204",
|
||||
"@rolldown/binding-linux-arm64-musl@npm:1.0.3": "b1264d8302780c991260991733cf156c1ed43fed66fce60e5a265577aced196b92907cfcbe8d3262621b8e08106f1f555743c601fe60676c08ffae0edd821128",
|
||||
"@rolldown/binding-linux-ppc64-gnu@npm:1.0.3": "82f33061f5003b99bac68a0637bf7665f6fb2b22cfc025e4d7762afefe703af2acc1cd2df8ff07bb000b0eecd3e59959992481a5b03794604af090eaa843c70f",
|
||||
"@rolldown/binding-linux-s390x-gnu@npm:1.0.3": "a6a3811352aa5db6a793879bf405bb98eaeca06cfd1aae959a9ed70db39b28e0a022ca50524cdd26d0447fa7b9c5ef913281cf543f816ac6e3ea6b6d620af88a",
|
||||
"@rolldown/binding-linux-x64-gnu@npm:1.0.3": "13ece4e580f022a1a70031da2036448097bc38d040d1e87ee81cffd9e1ab8b64673e92843718470e3d07ea664171dc2c20d766cbafbb0ca8774e3c4f0b122c7d",
|
||||
"@rolldown/binding-linux-x64-musl@npm:1.0.3": "6beeffe835e820679868021e01fb629fe124813911dd625bd3d24b1592450c06131b360e284396aca04798e6a85f988917ea00e95b3ea087a32a45441bad3235",
|
||||
"@rolldown/binding-openharmony-arm64@npm:1.0.3": "f8e8352edde4d2345e3e360bb050915daf0d9ee4c491024a08e56088801994f2cbdf0152f81115a089c1870863e6384135765126114cf8481933bc15678e1dde",
|
||||
"@rolldown/binding-wasm32-wasi@npm:1.0.3": "3f73081fc41cbd8c117183fecb0f491a71278472c0640b54e57a3a6705005f54d7997c610244d2ff651d5d688a20596ab1119e3dccf607f59fdea4ec0621da49",
|
||||
"@rolldown/binding-win32-arm64-msvc@npm:1.0.3": "a29f05721b276acdeb7f00b43b9c6241f9c4cc60b820d6b9217d205cfd0ee66a82a29da501e60163c66ce7cc8cb6362f88933b466dea66e3219b38d15954873e",
|
||||
"@rolldown/binding-win32-x64-msvc@npm:1.0.3": "d6afa484d89c9479561a0621709dfc9737584515f87e96fa74f7d153bbde74f81b6ba7aac92187189ffb4dd1795fa152c596a04ae9a41ffab7437babc5a15838",
|
||||
"@oxfmt/binding-android-arm-eabi@npm:0.66.0": "2c3cf886d9804c40ec08597e691449c5443fae6941715630bfa46fbb97009803e000cbb6df5d7ac6c27060d49cf075f9021731389b76f708969b27c70dcd518e",
|
||||
"@oxfmt/binding-android-arm64@npm:0.66.0": "b64a82cc43b52a2b4cc78b9bd73155ba5399321a507ae13c58e7eae3093c240b6acf22887bd1436517682faedb90f0756916b7ebf28658d6d6022f0dab00f265",
|
||||
"@oxfmt/binding-darwin-arm64@npm:0.66.0": "5678efcf1284315fd30062cf5ac34061214be4c065a22d1780b8d4e2a2b17366b29afbdca0af6a0d6f6cb53da85b93d12ffb19f93cc01d0f59dd26ed40a23008",
|
||||
"@oxfmt/binding-darwin-x64@npm:0.66.0": "b0a2f5f859f501f902e7a8f1c3c5a598ade6f06719391cd7c3d4ebd9eabf6f49d75b586b3718c8a462dd8c5631697ccf8efc7508685f78802cb25c4aaf0a7fcb",
|
||||
"@oxfmt/binding-freebsd-x64@npm:0.66.0": "d8527cd6c88dfd6b6b6bb1bd0768ff7d6010656fbd4dfc6fc7f66d5545314b0e43a975e57680698e7aaa548a4df06e20df795318203e4b3c88af976462d78d4b",
|
||||
"@oxfmt/binding-linux-arm-gnueabihf@npm:0.66.0": "9b8713e3ddfb4c53410cc80d5b5bc8834602349d952df6ab822d2c354360a9895774a9d2a7d49e2060cb48ea73e54b02725cba8564b40dfb179f1b9087793a79",
|
||||
"@oxfmt/binding-linux-arm-musleabihf@npm:0.66.0": "6b08920c5133c3c04bd1302d12eec0344cef0443d4f3b4c7c135aa381ab215d7c0c07069111d22c1715545863ddbefe5237bfffe5437464eb81ba4989435b0ab",
|
||||
"@oxfmt/binding-linux-arm64-gnu@npm:0.66.0": "8a6021a44d386c6aac398c58f06ed61313fb1fbc7e59161209af4510dd86db19a4150c29fbef62f4ef134d56699a695bab5c2fac795a74c5db404d078aefe904",
|
||||
"@oxfmt/binding-linux-arm64-musl@npm:0.66.0": "7a1ca274e728b17869cc33c8bfeee911b4a53144b3caa96ff3c2e8a5a34e6f428e92e2bff08ab1a9e4637e4489c8e9be230ac1f6887572b3ffec3bf25ee53257",
|
||||
"@oxfmt/binding-linux-ppc64-gnu@npm:0.66.0": "1e2def5684b431c6cd8ccd091c4ddcfc0b098322956d689e7ac88297329c440f1eb02e44648fa88c836938775040e7a34d250c1c42b3e502e1f91706343f3411",
|
||||
"@oxfmt/binding-linux-riscv64-gnu@npm:0.66.0": "6dfdce8bc10d7f445ba7dcf5243e1d1e2c446871df6aa1e34b0d1eca074d49a0a22e8dcb4d43be1598bc6d3d3153c41ef85869230ab07ebd6b12711db67a1925",
|
||||
"@oxfmt/binding-linux-riscv64-musl@npm:0.66.0": "4b6fde2066509475a86b8027d646900c8946397f221e7c76760be21565cca51678c3b00d1f95ef119264728eda9d55551540bc2ab3a1f82769db84e2c902fbb2",
|
||||
"@oxfmt/binding-linux-s390x-gnu@npm:0.66.0": "85fa723578c5a3ba856e5e40fdc5c37a8f9bcd4ea6d2261e22b561b371c9d0debc2decf814085541a1624c8def02a16d026b2782c253a9b994f63fcef0532abd",
|
||||
"@oxfmt/binding-linux-x64-gnu@npm:0.66.0": "26802b2f2092b22aa32e0b18c9fccc19a8c9b0828c379f31f5251ccfef749e7ac3c4c9b8bfb4ce139bae2d83681a0db9cd13bc545a330bf6a90b455e9ff64191",
|
||||
"@oxfmt/binding-linux-x64-musl@npm:0.66.0": "7dda71b3e6fcdc8778b23b4792a7c53574c05a788713b3b15d1c3a080a6fc097139d3313ca685fa36ec7130175c8f26da45507dc94eb4bdf222143a6d8cfa648",
|
||||
"@oxfmt/binding-openharmony-arm64@npm:0.66.0": "67e5fff2138f821b84bee91efaa9f5d3f261d2cf950edcdb379aec684186187b290a3d68e6f0deb84ff3c037ed1fe7974a3f4f40a35001aaf8d9877973cce94a",
|
||||
"@oxfmt/binding-win32-arm64-msvc@npm:0.66.0": "12b905504cc07e7b0a46689dd08ae23d99f4cec1fc5294b10f3fed647a47b70fb09b82b1b2725a5fefafc8be7c18712edc8f5b0a7355b0d24fb546ee2185fe17",
|
||||
"@oxfmt/binding-win32-ia32-msvc@npm:0.66.0": "ff250dee4965210be9d31476b18a661faec2335bdfa0537f7223e71d51546035fced8e201aa6caab56e1d916fc269b81197868a97f4c800cba1fcf2834f9caab",
|
||||
"@oxfmt/binding-win32-x64-msvc@npm:0.66.0": "208b66fe6730d7648518f0d4b499363bfad2108eddaee7db1eff7193baeaf8bd3fcc225b2d94b4bd8e3dd8b817a13b3c0b69cff386367587350be8ea48475e73",
|
||||
"@oxlint-tsgolint/darwin-arm64@npm:7.0.2001": "46fa5b830e9381d1d8d9fa25eebfe7c68503b989aed866ea8b459dbd83ee1338da37d9926f271ba635af840fadb4e06f8ca02b04fec920ef910a927098409aba",
|
||||
"@oxlint-tsgolint/darwin-x64@npm:7.0.2001": "c15f79484f8ac925f273a641490bb5dd1c59216b37ce4184763e65129c65258f5ef4a8e05f6d1071cf9826f39b96815c65e1836732b837f9b89306ffcd070f2a",
|
||||
"@oxlint-tsgolint/linux-arm64@npm:7.0.2001": "5dd3fe7183d7179ecb28d9c07666b0a4e838ec82211d4a5a4e8bf4c0c02595fb5f10cde241c61a62e77b9d11079a1bf4710413814f6f194a18abc04ffa0d1dbf",
|
||||
"@oxlint-tsgolint/linux-x64@npm:7.0.2001": "2c104f32d3d027179921bd55761ffd558e2d9291622e8ef2e8b546a55df8f0c3df2fd0824eef55731dd8b6f2efa5860931256b309fd9cc641336df735df5fd98",
|
||||
"@oxlint-tsgolint/win32-arm64@npm:7.0.2001": "38288a3c3e2d982888f676bc0791bd7a6e74bc8647f5d32f1be20355e85996fd76541150f78e8a488aebd2bc01a125f1074c8472eedf0f59f611d759c643865b",
|
||||
"@oxlint-tsgolint/win32-x64@npm:7.0.2001": "1470427e30927f1d0e465d340fce71f0f655b309bb1fda13e096dc14c38e19a7ae85ce24613ddc0dfe42c3ddfffc1bdd5f66c9dc44ba0673480ae7a3f74d418d",
|
||||
"@oxlint/binding-android-arm-eabi@npm:1.81.0": "1813cb9077c3962357d58ec23688c370f89cae26ed66cb46fc9a93ff84e08c0523599f2da16c95737e1e8bd0efb43e5cdf6191ddafd092ff018e80666386a8a3",
|
||||
"@oxlint/binding-android-arm64@npm:1.81.0": "d079167c8f150b324657bcc16ed0a067ff85bd859bab0eae403e2b8aacfaeef0bd4bb2ab0addfe4869211d81ed98a85a9feb11021a95a6e9fb7bec7c67159e84",
|
||||
"@oxlint/binding-darwin-arm64@npm:1.81.0": "092e052fdaab03423896dbad041d8f05862acb15f2b8363ccd059be572ff7fa2788034a4ded08561370ff77acbdcac23279e7ee4ac5b4bcd9aecaace5bbb3daa",
|
||||
"@oxlint/binding-darwin-x64@npm:1.81.0": "13625f2c297bbe0d2014bb37e485c75089bb9ac8efa8831b05990020a7eab27dcaf939862a9cba6add444fa20a83747fe7d3ac2409f398a0976205bcfdd0c427",
|
||||
"@oxlint/binding-freebsd-x64@npm:1.81.0": "43a853bd361151ced9d168d5ebb2b5a4af0d7bb9dec8f6158af53114f7bb73abe2abc99709d2b686dea89c1d4c3f597d714991847d2e483d0661bd3516ba0fd1",
|
||||
"@oxlint/binding-linux-arm-gnueabihf@npm:1.81.0": "37f5e1bf5166c047b5fd53cb80de3a642dd5e82b35d656680fe834c2481bbec73bcc85020125d42c0a2c1ce5f31b6111a30f3994fd0f0e5aa6419352465bae70",
|
||||
"@oxlint/binding-linux-arm-musleabihf@npm:1.81.0": "14748e74cf1e71f611713ffd42a441ca74671a4baadcffdd310484a44343932305b094faf6cd2d9bfab9860da6cc4414dbaf423d93f2d442d271fcef3070f73a",
|
||||
"@oxlint/binding-linux-arm64-gnu@npm:1.81.0": "c53813b0c0b3d2a615c32c9cf94b3cde23adcb554ef4d57bab063ec01aa192abc9f8073e5c8cc8f2a9904cf3a0812de7d2da14bc700be08610f16cbb08b116a1",
|
||||
"@oxlint/binding-linux-arm64-musl@npm:1.81.0": "411405fa712bba5efff0c535ecaa4c254db5de154b37bb8c84f3686c0dbed88d3146bd640b4f3647bada368b23a2051d57e06ec00a2d1b00b1624a534da7ff5a",
|
||||
"@oxlint/binding-linux-ppc64-gnu@npm:1.81.0": "40246456a478cb03608886e68ae49c80f605a4ea5630b1efd56e4ece31af1f6e0ceb5cce2f480f41796381068b347594e96564151d032385d7fb5b75acebedef",
|
||||
"@oxlint/binding-linux-riscv64-gnu@npm:1.81.0": "f69234d704b3a98943ba532a3680dd51a6f64be8b3cbdb4a057574b64080d47eea523ced69e9406b3748a54b5c8cbf7805b4327ef19920d622f6d75aa4a28488",
|
||||
"@oxlint/binding-linux-riscv64-musl@npm:1.81.0": "a9599229f10bd25d2249be65db50950799cf18ed772a8d545defa30676ebbb9ba79bffc422bb9678c0bdb688251dac6f6a1d7d2f5426b3dc17708ce607121b4b",
|
||||
"@oxlint/binding-linux-s390x-gnu@npm:1.81.0": "b844e23fd8b0a31233814060217a1a7657006c87a431f3f60957f15b5c85494e4926bbdad41bcc75b6136bed0c589173657cb63cd0b94deda214c5a5df280be1",
|
||||
"@oxlint/binding-linux-x64-gnu@npm:1.81.0": "f9a9eff717b5f2638c6b28d71a21e6f2bc50d1b2708a23a67b6ad20a98ee3189b40b68235eb03f97a18d44c931730504074b03530f84e713abd97cf44fff5412",
|
||||
"@oxlint/binding-linux-x64-musl@npm:1.81.0": "823d8e4212fef7b84d807c9df09d25fccaffc65778ab5c4c93f0af131a0f6b6551a1a8c684e896742048ed1e9f37fc30d78bbb6c94d97063e69baefd7a3af21f",
|
||||
"@oxlint/binding-openharmony-arm64@npm:1.81.0": "d233a6525012163ef7e7bb293ec210816015a8e04cecf723e955db0ab7394be3a16178aec2801a2992982e8ed2174dd6167b215f753f2dab8064c0f3ed50afc8",
|
||||
"@oxlint/binding-win32-arm64-msvc@npm:1.81.0": "8070d998bbb9470ad8a65c729a353a7a00d470d4d04e761f6a15a1b84aecb02be5a3aad231aa08b96e720edbf0f5d241554b061ebd9f6e7b1bbe69fb4c367c06",
|
||||
"@oxlint/binding-win32-ia32-msvc@npm:1.81.0": "ad6905b544f89de550cacb45857a4d6d0ccb769f0a24b83091ba53189c72531e0d3c9dc6a266a5c89e7368a95193cad9d703315c6f8fc4ccb89e8dfd8f0c711b",
|
||||
"@oxlint/binding-win32-x64-msvc@npm:1.81.0": "dd41cbaee3def7a379d950cc48362e7c2b31d68607d1f62af5f7b61450c95bd5d39b0f9e548c5af0d20d7ac81dc2581f2f70a3fc1eaad501af1ba845274e0e61",
|
||||
"@rolldown/binding-android-arm64@npm:1.1.5": "c94d067b3c923a79e59334cbdf0ee6ab67257beb4357619fd6366233fe5e8ef2764b298824209cacc0a42084ded1a76e19c9cf64bd8c7896e38066c2dc586b22",
|
||||
"@rolldown/binding-darwin-arm64@npm:1.1.5": "f397d75fe0a37c4c2f6251002e5d569119b2f5d3e103a65263c58d8c1565952a4f024cafa1847dc57e59a4b0adfca00124660e6bc1782c3f239d0c7f9bb993af",
|
||||
"@rolldown/binding-darwin-x64@npm:1.1.5": "86b35e4c3f66677bf27f7c122cae56620b2f738c4e25790094b6887e0d516f26633583198741269374f516ca9b1a677b1ab2ff5d1ba1af7b422a5c37c4e5c548",
|
||||
"@rolldown/binding-freebsd-x64@npm:1.1.5": "19e082714aa73d5680307895de7252167e65871800a894a727e7e850cc1c88d7b1599305ac971bdf153dcb41b95b50416a84e6acb9c835fc8010e661fccd6db2",
|
||||
"@rolldown/binding-linux-arm-gnueabihf@npm:1.1.5": "35b3fe1b43bfaff92b83c3c5aee76db332753455594af09b4b03a627517906b63202f8210567f74ab5f48869d48a409910df7f7a3b6177b03a3fa422ace4bc8a",
|
||||
"@rolldown/binding-linux-arm64-gnu@npm:1.1.5": "5a411819a8c20bbdc676eeb21a66a30dff91b9ce8d4331c156a2486e57fe32e9c5fcf72d03b1959f7369dc8d4b149e2702c2f2fe6523b22ec8b9fc705c01854a",
|
||||
"@rolldown/binding-linux-arm64-musl@npm:1.1.5": "28de26f3b6ba526c54384ef22bb693331e76d43ebbc2e73f88c7d0136624864edf94583706f312c48ef5e76036b83f3f571d2289f97f0bd770b850f861048b1a",
|
||||
"@rolldown/binding-linux-ppc64-gnu@npm:1.1.5": "e7d6c198de775b576378108ec14360c65891923dbc1e31420914734a726a858821921dd417dc1440d4f0aa348276b3ca497d1899909cc000ee1a5881b7458856",
|
||||
"@rolldown/binding-linux-s390x-gnu@npm:1.1.5": "9cb65cb7523934ef5b97e9db1d10ec65ba3ef854f60e7608977d3c2b724980b102c866e297db1fd3b05b1240aff3c75d4069e85744a45c55e56bc32efed306fe",
|
||||
"@rolldown/binding-linux-x64-gnu@npm:1.1.5": "574709c6466876443986529d4865762ed6624482be96a94dd154a3cfed4ce68c54fecea3498f164046a604593d857a6e0d81f9ac229b3bbe4573ed73b20fb270",
|
||||
"@rolldown/binding-linux-x64-musl@npm:1.1.5": "0d4734e4322eff798037f9e67b05bfa166408ccdde6fb2add24d59ff091a32ec845fb13ff9b9462bb77fcb4d7a791e9a2c8a3ee3e16854d3d642a4ce69e5e805",
|
||||
"@rolldown/binding-openharmony-arm64@npm:1.1.5": "3d6f9691c63f3b1992bb13b92b51925d24a6d6c65b20fb01add210fd1601f407f7d9448523af53430bae70e0f5af38ef8be106f4208b5470daf6e2768961508c",
|
||||
"@rolldown/binding-wasm32-wasi@npm:1.1.5": "df056f3085b7eef23b6476c61e7c81b22eded254d14b388332f57d08df5c834e11cc2ab90c9c506c62d97d3797ee4b7347144d48eb2e8355e9913ae3c3e4fb2e",
|
||||
"@rolldown/binding-win32-arm64-msvc@npm:1.1.5": "d75c654eabc4c79948ed07a539841878763367db4da4ee74c373ad7bcc7abd8fc7923e94905d690e42edb1a12c7cdee15262bad31510e87e46798251234b3751",
|
||||
"@rolldown/binding-win32-x64-msvc@npm:1.1.5": "95fe450d126ce37235b184d6724b9d39bca9525b8aa1bdf8732e1f42781177b55eeaf92cc507dda9af54f89fcb1697059feda9a407b4903688bb6b6065028796",
|
||||
"@rollup/rollup-android-arm-eabi@npm:4.60.4": "713883389421bcaea56b37c79e624da343aeaa28812de226542407bb1e62c3593c24b0b94ee2fa74893963b124b1d6a6eac4b10bbd54c1736923dc67a953b3de",
|
||||
"@rollup/rollup-android-arm64@npm:4.60.4": "04117967684c227a7d764e13f85c66093619ff8a800a2004138a258cbfeb4748db8bc477496e0c9421c1cbb1ad5ca92e2665a143c6cdba33502aa59cd2c04ffe",
|
||||
"@rollup/rollup-darwin-arm64@npm:4.60.4": "3e7fe7279af3981c4e9b5cc4ca3099ff403545a1b63e2e66c2f5fae400fdd05c82ec430d087c0f444b59fb56a23a5ac3b802129d99c9e13be4a299aa8d2cf538",
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "outline";
|
||||
version = "1.9.2";
|
||||
version = "1.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "outline";
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "panache";
|
||||
version = "3.8.0";
|
||||
version = "3.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jolars";
|
||||
repo = "panache";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6BNdRhBeRLxWof0Dq9vVP2Qae8pwCwYHyUePSn/GhI0=";
|
||||
hash = "sha256-13v2J7qRgkX55vjFt0daU26J/IhmECCr1H0fVEW72rk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-xdykhQiZPPdKOjVoQbBbVw5TfNF2X2DFqzryvDG4Kt4=";
|
||||
cargoHash = "sha256-D8SfoPjfIHnrvjYG6lJbqAHL1jkAI5st2105OP9md6s=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -109,11 +109,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "petsc";
|
||||
version = "3.25.4";
|
||||
version = "3.25.5";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-iF8HPlqhSkOUkAWDTMOUfWSFsLHMASeOeTXJw7qqgYQ=";
|
||||
hash = "sha256-atNPjeL59fJqPMJ4LVS2goh1riyA3ewwMynUA+YPVd4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "plakar";
|
||||
version = "1.1.5";
|
||||
version = "1.1.6";
|
||||
|
||||
# to avoid having all the Test(Get|Set|Validate)Service.* tests fail on darwin
|
||||
__darwinAllowLocalNetworking = true;
|
||||
@@ -22,12 +22,12 @@ buildGoModule (finalAttrs: {
|
||||
owner = "PlakarKorp";
|
||||
repo = "plakar";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6uw20jqAtJnPEeNrMsK/jA7+stdY4tAEkPe+mov6UNo=";
|
||||
hash = "sha256-AnVhWvfE2H5GfsgZyS14nla4vWZy7iIlD3lBP+LAJvA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-s/4vTHFFfOuGnVc3FK0B5aa9kRATr356/mGydw4cMng=";
|
||||
|
||||
# Remove in next release
|
||||
# Remove in next next release
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "backup-allow-multiple-ignore-files.patch";
|
||||
@@ -37,6 +37,11 @@ buildGoModule (finalAttrs: {
|
||||
})
|
||||
];
|
||||
|
||||
# broken test introduce in 1.1.6
|
||||
postPatch = ''
|
||||
rm login/completion_code_test.go
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
makeBinaryWrapper
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
buildNpmPackage rec {
|
||||
pname = "playwright-mcp";
|
||||
# nixpkgs-update: no auto update
|
||||
version = "0.0.78";
|
||||
version = "0.0.80";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Microsoft";
|
||||
repo = "playwright-mcp";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-k5dhHABKZqph3RzFcJjD+/RcMB+lZZ0UiS6eNGyAEtE=";
|
||||
hash = "sha256-pIePGuIxBaHqvP6QVLzGSef0uarYE+X/rs3LWZEU22U=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-Oe0jtvxKyQMQ6uSwBQoGisvv4n0lR6EcyElzh9GHZac=";
|
||||
npmDepsHash = "sha256-3T4XNZSUL5sbcHmWfn9Dfigu635FACVEZ/EHSKYu1+8=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user