Merge staging-next into staging

This commit is contained in:
nixpkgs-ci[bot]
2026-04-05 00:28:24 +00:00
committed by GitHub
153 changed files with 2602 additions and 1955 deletions

View File

@@ -95,15 +95,12 @@ runs:
// This would fail without --refetch, because the we had a partial clone before, but changed it above.
await run('git', 'fetch', '--depth=1', '--refetch', 'origin', ...(commits.map(({ sha }) => sha)))
// Checking out onto tmpfs takes 1s and is faster by at least factor 10x.
// On Linux, checking out onto tmpfs takes 1s and is faster by at least 10x.
// Currently, on Darwin we can only allocate 3.5GB, which isn't enough.
// See https://github.com/NixOS/nixpkgs/pull/506437
await run('mkdir', 'nixpkgs')
switch (process.env.RUNNER_OS) {
case 'macOS':
await run('sudo', 'mount_tmpfs', 'nixpkgs')
break
case 'Linux':
await run('sudo', 'mount', '-t', 'tmpfs', 'tmpfs', 'nixpkgs')
break
if (process.env.RUNNER_OS === 'Linux') {
await run('sudo', 'mount', '-t', 'tmpfs', 'tmpfs', 'nixpkgs')
}
// Create all worktrees in parallel.
@@ -134,3 +131,6 @@ runs:
await rm('pin-bump.patch')
}
}
console.log('final disk usage:')
await run('df', '-h')

2
.github/zizmor.yml vendored
View File

@@ -10,3 +10,5 @@
rules:
dangerous-triggers:
disable: true
secrets-outside-env:
disable: true

View File

@@ -9,9 +9,9 @@
},
"branch": "nixpkgs-unstable",
"submodules": false,
"revision": "bde09022887110deb780067364a0818e89258968",
"url": "https://github.com/NixOS/nixpkgs/archive/bde09022887110deb780067364a0818e89258968.tar.gz",
"hash": "13mi187zpa4rw680qbwp7pmykjia8cra3nwvjqmsjba3qhlzif5l"
"revision": "106eb93cbb9d4e4726bf6bc367a3114f7ed6b32f",
"url": "https://github.com/NixOS/nixpkgs/archive/106eb93cbb9d4e4726bf6bc367a3114f7ed6b32f.tar.gz",
"hash": "0wyyhddz2mqhmq938d337223675jpd83dd5lsks2nhz0hs4r3jha"
},
"treefmt-nix": {
"type": "Git",
@@ -22,9 +22,9 @@
},
"branch": "main",
"submodules": false,
"revision": "e96d59dff5c0d7fddb9d113ba108f03c3ef99eca",
"url": "https://github.com/numtide/treefmt-nix/archive/e96d59dff5c0d7fddb9d113ba108f03c3ef99eca.tar.gz",
"hash": "02gqyxila3ghw8gifq3mns639x86jcq079kvfvjm42mibx7z5fzb"
"revision": "75925962939880974e3ab417879daffcba36c4a3",
"url": "https://github.com/numtide/treefmt-nix/archive/75925962939880974e3ab417879daffcba36c4a3.tar.gz",
"hash": "118zlbyzmh21x6rad2vrxjkdfyicd8lx3s0if8b791n51hz1r9ns"
}
},
"version": 5

View File

@@ -226,6 +226,8 @@
- `light` has been removed because it was unmaintained.
`brightnessctl` and `acpilight` provide similar functionality.
- `opensmtpd-filter-dkimsign` is now installed into `libexec/smtpd` instead of `libexec/opensmtpd` so that now it is properly linked into the environment built by `services.opensmtpd.procPackages`. If you hardcoded path to `filter-dkimsign` please consider using this option.
- `services.openssh.settings.AcceptEnv` now explicitly defined as an option that takes a list of strings, to facilitate option merging. Setting it to a string value is no longer supported.
- All Xfce packages have been moved to top level (e.g. if you previously added `pkgs.xfce.xfce4-whiskermenu-plugin` to `environment.systemPackages`, you will need to change it to `pkgs.xfce4-whiskermenu-plugin`). The `xfce` scope will be removed in NixOS 26.11.

View File

@@ -52,6 +52,8 @@
- [reaction](https://reaction.ppom.me/), a daemon that scans program outputs for repeated patterns, and takes action. A common usage is to scan ssh and webserver logs, and to ban hosts that cause multiple authentication errors. A modern alternative to fail2ban. Available as [services.reaction](#opt-services.reaction.enable).
- [papra](https://papra.app/), an open-source document management platform designed to help you organize, secure, and archive your files effortlessly. Available as [services.papra](#opt-services.papra.enable).
- [rqbit](https://github.com/ikatson/rqbit), a bittorrent client written in Rust. It has HTTP API and Web UI, and can be used as a library. Available as [services.rqbit](#opt-services.rqbit.enable).
- [Tailscale Serve](https://tailscale.com/kb/1552/tailscale-services), configure Tailscale Serve for exposing local services to your tailnet. Available as [services.tailscale.serve](#opt-services.tailscale.serve.enable).

View File

@@ -1729,6 +1729,7 @@
./services/web-apps/openwebrx.nix
./services/web-apps/outline.nix
./services/web-apps/pairdrop.nix
./services/web-apps/papra.nix
./services/web-apps/part-db.nix
./services/web-apps/pdfding.nix
./services/web-apps/peering-manager.nix

View File

@@ -0,0 +1,103 @@
{
config,
pkgs,
lib,
...
}:
let
cfg = config.services.papra;
defaultUser = "papra";
defaultGroup = "papra";
defaultEnv = {
SERVER_SERVE_PUBLIC_DIR = true;
PORT = 1221;
DATABASE_URL = "file:/var/lib/papra/db.sqlite";
DOCUMENT_STORAGE_FILESYSTEM_ROOT = "/var/lib/papra/local-documents";
};
in
{
options = {
services.papra = {
enable = lib.mkEnableOption "Papra";
user = lib.mkOption {
default = defaultUser;
type = lib.types.str;
description = "User under which Papra runs.";
};
group = lib.mkOption {
default = defaultGroup;
type = lib.types.str;
description = ''
If the default user "${defaultUser}" is configured then this is the primary
group of that user.
'';
};
package = lib.mkPackageOption pkgs "papra" { };
environment = lib.mkOption {
type =
with lib.types;
attrsOf (oneOf [
str
int
float
bool
path
package
]);
default = defaultEnv;
example = {
PORT = 1221;
};
description = "Environment variables to set for the service.";
};
environmentFile = lib.mkOption {
type = with lib.types; nullOr path;
default = null;
description = "Environment file, usefult to provide secrets to the service";
};
};
};
config = lib.mkIf cfg.enable {
users = {
users = lib.optionalAttrs (cfg.user == defaultUser) {
"${defaultUser}" = {
description = "Papra service user";
isSystemUser = true;
group = cfg.group;
};
};
groups = lib.optionalAttrs (cfg.group == defaultGroup) {
"${defaultGroup}" = { };
};
};
systemd.services.papra = {
wantedBy = [ "multi-user.target" ];
serviceConfig = {
Restart = "on-failure";
ExecStartPre = "${lib.getExe pkgs.tsx} ${cfg.package}/lib/src/scripts/migrate-up.script.ts";
ExecStart = "${cfg.package}/bin/papra";
User = cfg.user;
Group = cfg.group;
StateDirectory = "papra";
EnvironmentFile = cfg.environmentFile;
};
environment =
let
environmentwithDefaults = defaultEnv // cfg.environment;
in
(lib.mapAttrs (
_: s: if lib.isBool s then lib.boolToString s else toString s
) environmentwithDefaults);
};
};
meta = {
maintainers = with lib.maintainers; [ wariuccio ];
};
}

View File

@@ -2,6 +2,7 @@
config,
lib,
pkgs,
utils,
...
}@host:
@@ -1052,8 +1053,14 @@ in
}
// (optionalAttrs containerConfig.autoStart {
wantedBy = [ "machines.target" ];
wants = [ "network.target" ] ++ (map (i: "sys-subsystem-net-devices-${i}.device") cfg.interfaces);
after = [ "network.target" ] ++ (map (i: "sys-subsystem-net-devices-${i}.device") cfg.interfaces);
wants = [
"network.target"
]
++ (map (i: "sys-subsystem-net-devices-${utils.escapeSystemdPath i}.device") cfg.interfaces);
after = [
"network.target"
]
++ (map (i: "sys-subsystem-net-devices-${utils.escapeSystemdPath i}.device") cfg.interfaces);
restartTriggers = [
containerConfig.path
config.environment.etc."${configurationDirectoryName}/${name}.conf".source

View File

@@ -25,6 +25,28 @@
};
};
};
autoStart =
{ ... }:
{
virtualisation.vlans = [ 1 ];
networking.useNetworkd = true;
systemd.network.netdevs."20-dummy-test".netdevConfig = {
Name = "dummy-test";
Kind = "dummy";
};
containers.autoStart = {
autoStart = true;
privateNetwork = true;
interfaces = [ "dummy-test" ];
config = {
networking.firewall.enable = false;
};
};
};
bridged =
{ ... }:
{
@@ -117,6 +139,16 @@
# that the device is present in the container.
server.succeed("nixos-container run server -- ip a show dev eth1 >&2")
with subtest("Simple dummy interface is up, with autoStart enabled"):
autoStart.wait_for_unit("container@autoStart")
# Check if any dependency of container@autoStart.service timed out.
# If a non-existing .device dependency is set in Wants, systemd will
# wait until that unit times out, resulting a delay of the container.
autoStart.fail("journalctl _PID=1 | grep sys-subsystem-net-devices | grep 'timed out'")
autoStart.succeed("nixos-container run autoStart -- ip a show dev dummy-test >&2")
with subtest("Physical device in bridge in container can ping server"):
bridged.wait_for_unit("default.target")
bridged.succeed("nixos-container start bridged")

File diff suppressed because it is too large Load Diff

View File

@@ -158,12 +158,12 @@
};
beancount = buildGrammar {
language = "beancount";
version = "0.0.0+rev=d7a03a7";
version = "0.0.0+rev=429cff8";
src = fetchFromGitHub {
owner = "polarmutex";
repo = "tree-sitter-beancount";
rev = "d7a03a7506fbbbc4b16a9a2054ff7c2b337744b8";
hash = "sha256-vPQpAw27NkmpPB67girPXF7y87TsH7hE946m36/e7UQ=";
rev = "429cff869513cf9e34a2cf604fbfaaedc467e809";
hash = "sha256-UJ8bswQJB7UYspNKLWaEXMOR4XlKVHfd7rvV5iaA5Tw=";
};
meta.homepage = "https://github.com/polarmutex/tree-sitter-beancount";
};
@@ -1126,12 +1126,12 @@
};
gotmpl = buildGrammar {
language = "gotmpl";
version = "0.0.0+rev=04270cd";
version = "0.0.0+rev=aa71f63";
src = fetchFromGitHub {
owner = "ngalaiko";
repo = "tree-sitter-go-template";
rev = "04270cd3512e2c7de0c5f2823725d7b0c4c01fda";
hash = "sha256-DE5obq7mhDPSfXLImCL7ti1C0FQMU0uDslhaRBWhbPo=";
rev = "aa71f63de226c5592dfbfc1f29949522d7c95fac";
hash = "sha256-QSzUyRDGdBH9TaG3YCHnJp12WcR8kdbsZFIk8I+JW1Y=";
};
meta.homepage = "https://github.com/ngalaiko/tree-sitter-go-template";
};
@@ -1269,23 +1269,23 @@
};
heex = buildGrammar {
language = "heex";
version = "0.0.0+rev=3968d6e";
version = "0.0.0+rev=5842537";
src = fetchFromGitHub {
owner = "connorlay";
repo = "tree-sitter-heex";
rev = "3968d6e20b3c4cc234f339eddd6b7d118516e281";
hash = "sha256-HHsyiUxkUqKGs3kH/dIW8b89umD7+28M0sfXIt9PuQ8=";
rev = "5842537f734d7c12685bf27d6005313e3e5a47a0";
hash = "sha256-1p2drpkA+5o+WSH5cv+zPVx30lNhQ9bqX5JHA0YSS2Y=";
};
meta.homepage = "https://github.com/connorlay/tree-sitter-heex";
};
helm = buildGrammar {
language = "helm";
version = "0.0.0+rev=04270cd";
version = "0.0.0+rev=aa71f63";
src = fetchFromGitHub {
owner = "ngalaiko";
repo = "tree-sitter-go-template";
rev = "04270cd3512e2c7de0c5f2823725d7b0c4c01fda";
hash = "sha256-DE5obq7mhDPSfXLImCL7ti1C0FQMU0uDslhaRBWhbPo=";
rev = "aa71f63de226c5592dfbfc1f29949522d7c95fac";
hash = "sha256-QSzUyRDGdBH9TaG3YCHnJp12WcR8kdbsZFIk8I+JW1Y=";
};
location = "dialects/helm";
meta.homepage = "https://github.com/ngalaiko/tree-sitter-go-template";
@@ -1408,12 +1408,12 @@
};
idl = buildGrammar {
language = "idl";
version = "0.0.0+rev=57c4ba0";
version = "0.0.0+rev=fb65762";
src = fetchFromGitHub {
owner = "cathaysia";
repo = "tree-sitter-idl";
rev = "57c4ba057415ebe8e184fb11716c985dc3545e5e";
hash = "sha256-Y5HGPM2Dbqp+zLBq/SJt5ikdnJGfKujYRfjygpcpSmI=";
rev = "fb65762a13538b397e41a5fc1e9564c9df841410";
hash = "sha256-CDbE9TxcxZWhyv6DPgw/ygvY5fayNF4usTlZPGp/KjM=";
};
meta.homepage = "https://github.com/cathaysia/tree-sitter-idl";
};
@@ -1488,12 +1488,12 @@
};
javadoc = buildGrammar {
language = "javadoc";
version = "0.0.0+rev=42c9bc3";
version = "0.0.0+rev=e2f56b4";
src = fetchFromGitHub {
owner = "rmuir";
repo = "tree-sitter-javadoc";
rev = "42c9bc340c90ec15ed96eb4314269e8249376be9";
hash = "sha256-ww8U9Ro8lbwojxzWgW4C4ggQW9B0NaYIctNFmXN5r5Q=";
rev = "e2f56b4d0df08f6ed5df8bae266f9e75b340a9ab";
hash = "sha256-31HnXUtuimS9gr71r6Rs3VZYmiR8N8iuNNWsbe7Sz48=";
};
meta.homepage = "https://github.com/rmuir/tree-sitter-javadoc";
};
@@ -1510,12 +1510,12 @@
};
jinja = buildGrammar {
language = "jinja";
version = "0.0.0+rev=7bd0422";
version = "0.0.0+rev=413dba9";
src = fetchFromGitHub {
owner = "cathaysia";
repo = "tree-sitter-jinja";
rev = "7bd0422c6a57aaabfee8603502d7708d0a536f5f";
hash = "sha256-ZRAgY8W9FN6TRD9aFgypVd2X+pXs8oNp9qCB9qen9DY=";
rev = "413dba9fea354b62f6adada1815b2f504e32ffb5";
hash = "sha256-edHxTYvMfBh0OJbEfKgSqumV2JH/48cQ2u0Uq8e4CxM=";
};
location = "tree-sitter-jinja";
passthru.requires = [
@@ -1525,16 +1525,27 @@
};
jinja_inline = buildGrammar {
language = "jinja_inline";
version = "0.0.0+rev=7bd0422";
version = "0.0.0+rev=413dba9";
src = fetchFromGitHub {
owner = "cathaysia";
repo = "tree-sitter-jinja";
rev = "7bd0422c6a57aaabfee8603502d7708d0a536f5f";
hash = "sha256-ZRAgY8W9FN6TRD9aFgypVd2X+pXs8oNp9qCB9qen9DY=";
rev = "413dba9fea354b62f6adada1815b2f504e32ffb5";
hash = "sha256-edHxTYvMfBh0OJbEfKgSqumV2JH/48cQ2u0Uq8e4CxM=";
};
location = "tree-sitter-jinja_inline";
meta.homepage = "https://github.com/cathaysia/tree-sitter-jinja";
};
jjdescription = buildGrammar {
language = "jjdescription";
version = "0.0.0+rev=v1.0.3";
src = fetchFromGitHub {
owner = "ribru17";
repo = "tree-sitter-jjdescription";
tag = "v1.0.3";
hash = "sha256-3v/SiIQIR8ptUnzzRVTaqcznw3kXqdWlS2Ua/f6npDU=";
};
meta.homepage = "https://github.com/ribru17/tree-sitter-jjdescription";
};
jq = buildGrammar {
language = "jq";
version = "0.0.0+rev=c204e36";
@@ -1603,12 +1614,12 @@
};
just = buildGrammar {
language = "just";
version = "0.0.0+rev=d9da862";
version = "0.0.0+rev=5685543";
src = fetchFromGitHub {
owner = "IndianBoy42";
repo = "tree-sitter-just";
rev = "d9da862c156020c1a83d3c6ccdda32be6d8a5d4a";
hash = "sha256-YV+vab/QqGHVPV1e3wjd0w1nFskJEIU4ukq/yIlojk0=";
rev = "5685543a6e64f66335e25518c9ae8ffa1dae3d01";
hash = "sha256-lrW5E+HIqrDSWZ4+KOjIc80/wYm/WV9ZOfdLXxPIbX4=";
};
meta.homepage = "https://github.com/IndianBoy42/tree-sitter-just";
};
@@ -1669,12 +1680,12 @@
};
kotlin = buildGrammar {
language = "kotlin";
version = "0.0.0+rev=802fd92";
version = "0.0.0+rev=93bfeee";
src = fetchFromGitHub {
owner = "fwcd";
repo = "tree-sitter-kotlin";
rev = "802fd920c153b02b9d266369a3ef061622f2bbf0";
hash = "sha256-q7HTLFw/W1E6GXV2VMuPFKqDvJBv5OHeUK23zuTzZ0s=";
rev = "93bfeee1555d2b1442d68c44b0afde2a3b069e46";
hash = "sha256-9kNYaT0A9/B5/Vzg2d02XRYORlQpI9zK0e8E26FEEDg=";
};
meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin";
};
@@ -1758,12 +1769,12 @@
};
liquid = buildGrammar {
language = "liquid";
version = "0.0.0+rev=fa11c7b";
version = "0.0.0+rev=9566ca7";
src = fetchFromGitHub {
owner = "hankthetank27";
repo = "tree-sitter-liquid";
rev = "fa11c7ba45038b61e03a8a00ad667fb5f3d72088";
hash = "sha256-zDBaW8Tb5MgdLJTIJmZzkR0KqAqmEortAI6jbEspgqE=";
rev = "9566ca79911052919fce09d26f1f655b5e093857";
hash = "sha256-KUp/uqTV8C98TLJ4VDtbB9Dygq4DQNv1VInzTtYS/BA=";
};
meta.homepage = "https://github.com/hankthetank27/tree-sitter-liquid";
};
@@ -1931,12 +1942,12 @@
};
mlir = buildGrammar {
language = "mlir";
version = "0.0.0+rev=90d41fd";
version = "0.0.0+rev=96fa0ad";
src = fetchFromGitHub {
owner = "artagnon";
repo = "tree-sitter-mlir";
rev = "90d41fd327a8a6ded2fb366909ea86d8e31392ea";
hash = "sha256-efwVQGp3FR9xtViyfF/ChGg2eBPnm6bf2inmP0nOO+g=";
rev = "96fa0adc3028cc6a9d281370c9f213a457c4a2d0";
hash = "sha256-6zXWbcwptKfJxZzx9txteVS1LSTSD9XUs3B4JsJLZlk=";
};
generate = true;
meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
@@ -2081,24 +2092,24 @@
};
ocaml = buildGrammar {
language = "ocaml";
version = "0.0.0+rev=3ef7c00";
version = "0.0.0+rev=5a979b3";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-ocaml";
rev = "3ef7c00b29e41e3a0c1d18e82ea37c64d72b93fc";
hash = "sha256-8u1jtUFMjykVG6aCDzqcb4vFCY401CZ2o+JPGMadg6o=";
rev = "5a979b3ec7f1fe990b8e8c4412294a0cf7228e45";
hash = "sha256-dG9v5/NcYR8J33wEfA8BpJNFd5i4M8Cay+gBxjiRIqw=";
};
location = "grammars/ocaml";
meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml";
};
ocaml_interface = buildGrammar {
language = "ocaml_interface";
version = "0.0.0+rev=3ef7c00";
version = "0.0.0+rev=5a979b3";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-ocaml";
rev = "3ef7c00b29e41e3a0c1d18e82ea37c64d72b93fc";
hash = "sha256-8u1jtUFMjykVG6aCDzqcb4vFCY401CZ2o+JPGMadg6o=";
rev = "5a979b3ec7f1fe990b8e8c4412294a0cf7228e45";
hash = "sha256-dG9v5/NcYR8J33wEfA8BpJNFd5i4M8Cay+gBxjiRIqw=";
};
location = "grammars/interface";
passthru.requires = [
@@ -2225,12 +2236,12 @@
};
pkl = buildGrammar {
language = "pkl";
version = "0.0.0+rev=7c8a0d1";
version = "0.0.0+rev=f5beed1";
src = fetchFromGitHub {
owner = "apple";
repo = "tree-sitter-pkl";
rev = "7c8a0d15d83c1a436e91277d5023340f1ae5726b";
hash = "sha256-C4ArUeydTyd1eyC2auVAW7k0mqHM6tIxkjjjvPHb3eA=";
rev = "f5beed1da8e5fc856a1a11e29a929d0b7cdcfe3c";
hash = "sha256-q0K+q8GEOiwbgFjA/jiY/Hg6kPlgqMUvH8g+GdEDU3I=";
};
meta.homepage = "https://github.com/apple/tree-sitter-pkl";
};
@@ -2247,12 +2258,12 @@
};
pod = buildGrammar {
language = "pod";
version = "0.0.0+rev=4559a97";
version = "0.0.0+rev=57c606a";
src = fetchFromGitHub {
owner = "tree-sitter-perl";
repo = "tree-sitter-pod";
rev = "4559a9767eb15d757dce24107b840b137f673d33";
hash = "sha256-yTmPjiR5Gf2oAruRjQp3tiVze8UwksY6t4L8Dvuh00U=";
rev = "57c606aa3373ba876d44113d13fe7bdc2c060723";
hash = "sha256-HE4jwqAn4jfyonFkUzA0n+MZxWa7LuV8Cfq5wgrDwjI=";
};
generate = true;
meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-pod";
@@ -2730,12 +2741,12 @@
};
rust = buildGrammar {
language = "rust";
version = "0.0.0+rev=8a1ccae";
version = "0.0.0+rev=77a3747";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-rust";
rev = "8a1ccae7aaccdc11b04dbd803453e3e9cfd9159b";
hash = "sha256-nx7FiGQ2ybaq6YSuToQSQbH6Vj+JNWSXacuPumHGV/Q=";
rev = "77a3747266f4d621d0757825e6b11edcbf991ca5";
hash = "sha256-Ls6tB6IxXDQDWwx0BJ7RgbheelC4MH8z97E7wwhkDcY=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust";
};
@@ -3011,12 +3022,12 @@
};
supercollider = buildGrammar {
language = "supercollider";
version = "0.0.0+rev=e2d1480";
version = "0.0.0+rev=2b03ff4";
src = fetchFromGitHub {
owner = "madskjeldgaard";
repo = "tree-sitter-supercollider";
rev = "e2d1480de0a62cd53f81645cb39bc1f3fa2dce5a";
hash = "sha256-7vmL+o/WdvDntwOHg+ETdsRn77BegSqG0s84yLTNRx8=";
rev = "2b03ff49dd19b046add072d0861c4d1ca8a384c8";
hash = "sha256-ED33VmoSMR0NbrBaw4v19k98r4mJ7S1hDJLmU5vFa14=";
};
meta.homepage = "https://github.com/madskjeldgaard/tree-sitter-supercollider";
};
@@ -3354,12 +3365,12 @@
};
typoscript = buildGrammar {
language = "typoscript";
version = "0.0.0+rev=1811c76";
version = "0.0.0+rev=b5d0162";
src = fetchFromGitHub {
owner = "Teddytrombone";
repo = "tree-sitter-typoscript";
rev = "1811c767f3f72be669891b524a07c58b1eb0db87";
hash = "sha256-Eu7YMaMH1Xz2H3lmpYOqG42MA29Decaw27bpIwP5I/0=";
rev = "b5d0162b328ec52cf300054a8a23d47f84f55cb4";
hash = "sha256-wO5f7iwfpPABNSjjQvF5422awARL84czN142EcxX7kA=";
};
meta.homepage = "https://github.com/Teddytrombone/tree-sitter-typoscript";
};
@@ -3646,12 +3657,12 @@
};
yuck = buildGrammar {
language = "yuck";
version = "0.0.0+rev=e877f6a";
version = "0.0.0+rev=6c60112";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-yuck";
rev = "e877f6ade4b77d5ef8787075141053631ba12318";
hash = "sha256-l8c1/7q8S78jGyl+VAVVgs8wq58PrrjycyJfWXsCgAI=";
rev = "6c60112b3b3e739fb1ca4a8ea4bea2b6ffe11318";
hash = "sha256-ZbUN9lv2nGgpQ0rU+H38gSCdCSav//47ESHXDMuQX7c=";
};
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-yuck";
};
@@ -4171,6 +4182,9 @@
jinja_inline = buildQueries {
language = "jinja_inline";
};
jjdescription = buildQueries {
language = "jjdescription";
};
jq = buildQueries {
language = "jq";
};

View File

@@ -867,6 +867,7 @@ assertNoAdditions {
dependencies = [ self.plenary-nvim ];
nvimSkipModules = [
# Test mismatch of directory because of nix generated path
"conjure-spec.client.clojure.nrepl.server_spec"
"conjure-spec.client.common-lisp.swank_spec"
"conjure-spec.client.fennel.nfnl_spec"
"conjure-spec.client.guile.socket_spec"
@@ -1536,6 +1537,11 @@ assertNoAdditions {
];
};
hotpot-nvim = super.hotpot-nvim.overrideAttrs {
# NOTE: Vim:E919: Directory not found in 'packpath': "pack/*/opt/hotpot-fennel-update"
doCheck = false;
};
hover-nvim = super.hover-nvim.overrideAttrs {
# Single provider issue with reading from config
# /lua/hover/providers/fold_preview.lua:27: attempt to index local 'config' (a nil value)

View File

@@ -1800,7 +1800,7 @@ https://github.com/ywpkwon/yank-path.nvim/,HEAD,
https://github.com/gbprod/yanky.nvim/,HEAD,
https://github.com/HerringtonDarkholme/yats.vim/,,
https://github.com/mikavilpas/yazi.nvim/,HEAD,
https://github.com/lucasew/yescapsquit.vim/,HEAD,
https://github.com/lucasew-graveyard/yescapsquit.vim/,HEAD,
https://github.com/elkowar/yuck.vim/,HEAD,
https://github.com/fsharp/zarchive-vim-fsharp/,,
https://github.com/KabbAmine/zeavim.vim/,,

View File

@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "claude-code";
publisher = "anthropic";
version = "2.1.90";
hash = "sha256-8xHAEqxxCA0bw/4eNFL2PutMquD2H7FO1o2yycAJ4ME=";
version = "2.1.92";
hash = "sha256-L3W9LoFA6JzsPa20Md9rOJBG/siauIJeuDcE7euZxMg=";
};
postInstall = ''

View File

@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "mednafen-pce-fast";
version = "0-unstable-2026-03-13";
version = "0-unstable-2026-04-03";
src = fetchFromGitHub {
owner = "libretro";
repo = "beetle-pce-fast-libretro";
rev = "0fa44d2500ebc9bf96d2808209be27a69006df79";
hash = "sha256-NBL506+aaLRQh9XawvvynNRunWDPqxrt7ngy6FCmiIQ=";
rev = "15f6b56912df40593261b369d8c7f45911c9e11d";
hash = "sha256-w74AV9OLEht3nMDfT9OuDN3jEpfxGsKHLyJ14lhwEZc=";
};
makefile = "Makefile";

View File

@@ -128,11 +128,11 @@
"vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8="
},
"buildkite_buildkite": {
"hash": "sha256-RNWcVLpgBmwcHuopPRy0NkXXjmFUcWLn+GJy504J0ZA=",
"hash": "sha256-/Bg9Dym8mdcsjnTzlBs8iw6z4JpGBRvDo2kJeFJQ2MY=",
"homepage": "https://registry.terraform.io/providers/buildkite/buildkite",
"owner": "buildkite",
"repo": "terraform-provider-buildkite",
"rev": "v1.31.4",
"rev": "v1.32.0",
"spdx": "MIT",
"vendorHash": "sha256-CdaYWCQQ0L1LprQ5G/aXoA5GCQWCxOkkiDbMd20r7rs="
},
@@ -715,22 +715,22 @@
"vendorHash": "sha256-rd7QuDdq7xRMyaQIDyXY1DI2Tt/wy3oXan/nE0HIyT0="
},
"huaweicloud_huaweicloud": {
"hash": "sha256-dBjanfq9CghhGV8L4So3fV2LFw/Yx7g8lLPLWY3GVUI=",
"hash": "sha256-wkUdMBRyD16fDTC2+/Ie1Ugf9Eo1X3FQQXn2ivwpHx0=",
"homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud",
"owner": "huaweicloud",
"repo": "terraform-provider-huaweicloud",
"rev": "v1.88.0",
"rev": "v1.89.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
"ibm-cloud_ibm": {
"hash": "sha256-AUXroRfQMbfmRGUpu4SoTjPfZq2yOQncKVaNIyaEpA4=",
"hash": "sha256-0zJuYzNU4Q6RSzl6qNglRiJ4fcj9QA3wF/9UPBRx49c=",
"homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm",
"owner": "IBM-Cloud",
"repo": "terraform-provider-ibm",
"rev": "v1.89.0",
"rev": "v2.0.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-WFYO8S8AwXd7fOqFJ27LQ/OzweBiTK03a8zUDjsFInY="
"vendorHash": "sha256-0J10Nz6o12NuUJBkluiHWb8BElfuuz1wEKEQUb6epo0="
},
"icinga_icinga2": {
"hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=",

View File

@@ -80,8 +80,8 @@ rec {
inherit buildCommand name;
passAsFile = [ "buildCommand" ] ++ (derivationArgs.passAsFile or [ ]);
}
// lib.optionalAttrs (!derivationArgs ? meta) {
pos =
// {
${if !derivationArgs ? meta then "pos" else null} =
let
args = builtins.attrNames derivationArgs;
in
@@ -89,11 +89,9 @@ rec {
builtins.unsafeGetAttrPos (builtins.head args) derivationArgs
else
null;
${if runLocal then "preferLocalBuild" else null} = true;
${if runLocal then "allowSubstitutes" else null} = false;
}
// (lib.optionalAttrs runLocal {
preferLocalBuild = true;
allowSubstitutes = false;
})
// removeAttrs derivationArgs [ "passAsFile" ]
);
@@ -567,8 +565,8 @@ rec {
${postBuild}
'';
}
// lib.optionalAttrs (!args ? meta) {
pos =
// {
${if !args ? meta then "pos" else null} =
if args ? pname then
builtins.unsafeGetAttrPos "pname" args
else

View File

@@ -27,11 +27,11 @@ let
rec {
x86_64-linux = {
urlSuffix = "linux-x86_64.tar.gz";
hash = "sha256-A2XPADCc63OqskfPpkMwL8jCp9k7QsPyN2/FL+eCpfI=";
hash = "sha256-zr84SNbUuVWlLzYjQt1ZK2yk1sDgva3jzDUHsS1/7aM=";
};
x86_64-darwin = {
urlSuffix = "macos-universal.zip";
hash = "sha256-YanQYRaGCqq5bOLeSFqUYbq0EtVun80gxGdFJtyZdoI=";
hash = "sha256-m303tVHbyUUibBfyi8svpbbhgv/msBfh1WVIZl96XvQ=";
};
aarch64-darwin = x86_64-darwin;
}
@@ -40,7 +40,7 @@ let
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "appflowy";
version = "0.11.4";
version = "0.11.5";
src = fetchzip {
url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${finalAttrs.version}/AppFlowy-${finalAttrs.version}-${dist.urlSuffix}";

View File

@@ -10,13 +10,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "astro-language-server";
version = "2.16.3";
version = "2.16.6";
src = fetchFromGitHub {
owner = "withastro";
repo = "astro";
rev = "@astrojs/language-server@${finalAttrs.version}";
hash = "sha256-ONpSW6VMoiW1Q0Aa5Dp1pZx3LAQ2Kzv5YHKxHOxbXdo=";
tag = "@astrojs/language-server@${finalAttrs.version}";
hash = "sha256-xuAkfTVF+do7Tmk6LUOFkS7yunhVRkl+ZGpsOC7Ob4M=";
};
# https://pnpm.io/filtering#--filter-package_name-1
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
;
pnpm = pnpm_10;
fetcherVersion = 2;
hash = "sha256-Kqw4W3ZWRHWNnJYLGks9IHjCYAYEIigskwb//yKvb6c=";
hash = "sha256-QJSFRJ3U7M0B7ukiU+BYY2KdrcNUpyiOcGA7G3xja3I=";
};
nativeBuildInputs = [
@@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://github.com/withastro/astro/tree/main/packages/language-tools";
changelog = "https://github.com/withastro/astro/blob/%40astrojs/language-server%40${finalAttrs.version}/packages/language-tools/language-server/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = [ ];
maintainers = with lib.maintainers; [ miniharinn ];
mainProgram = "astro-ls";
platforms = lib.platforms.unix;
};

View File

@@ -25,10 +25,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
# for distribution builds. List all other default features.
buildNoDefaultFeatures = true;
buildFeatures = [
"ai"
"client"
"sync"
"clipboard"
"daemon"
"hex"
"sync"
];
nativeBuildInputs = [ installShellFiles ];

View File

@@ -24,6 +24,11 @@
"version": "1.41.0",
"hash": "sha256-/ixQr8KFGlZa43gGd2A7aBzwu9h+wLO6OqIMy3YbW+Y="
},
{
"pname": "Azure.Core",
"version": "1.43.0",
"hash": "sha256-/AE7soQTyaXesI7TdGKjSlxKR6z8t9HpdlOaNUC7eEk="
},
{
"pname": "Azure.Core",
"version": "1.44.1",
@@ -71,13 +76,13 @@
},
{
"pname": "Azure.Storage.Blobs",
"version": "12.21.2",
"hash": "sha256-DvdMGuophEbvvVtbRU3vsNwla0zTn5dn7HbW0Mr4P/o="
"version": "12.22.1",
"hash": "sha256-YPEJQ4MeV4rXoAwfroKVIaaXKZRvvQFJDyDaEawHxo0="
},
{
"pname": "Azure.Storage.Common",
"version": "12.20.1",
"hash": "sha256-XBDyzAEt5iwdyB3jgoG5TLyx5NZ/MoiEerBR/7U7F4w="
"version": "12.21.0",
"hash": "sha256-yS7Kq9+Ne/2oXT0KCEHXykIFceaza6xpsL+lr1KrbvU="
},
{
"pname": "Colors.Net",
@@ -141,8 +146,8 @@
},
{
"pname": "Microsoft.ApplicationInsights",
"version": "2.22.0",
"hash": "sha256-mUQ63atpT00r49ca50uZu2YCiLg3yd6r3HzTryqcuEA="
"version": "2.23.0",
"hash": "sha256-5sf3bg7CZZjHseK+F3foOchEhmVeioePxMZVvS6Rjb0="
},
{
"pname": "Microsoft.ApplicationInsights.AspNetCore",
@@ -151,8 +156,8 @@
},
{
"pname": "Microsoft.ApplicationInsights.AspNetCore",
"version": "2.22.0",
"hash": "sha256-BIa8rILgulQ+ZztaP3P5cD467x7Jpd+uSUBZZu2eeGc="
"version": "2.23.0",
"hash": "sha256-Q5XayWR5vRKYX2IrPqQnW2/8dITGReC9fORSxUSOQq8="
},
{
"pname": "Microsoft.ApplicationInsights.DependencyCollector",
@@ -161,28 +166,23 @@
},
{
"pname": "Microsoft.ApplicationInsights.DependencyCollector",
"version": "2.22.0",
"hash": "sha256-TDh1aRFgrjfBxFWFyJ0xRHzxlc2z88ZI5ceizO0In9I="
"version": "2.23.0",
"hash": "sha256-7sinHYtyjfpO9EsyeFlvTcI2sIzmZkN2OBeJrUtyUdg="
},
{
"pname": "Microsoft.ApplicationInsights.EventCounterCollector",
"version": "2.22.0",
"hash": "sha256-8pBA3ECv99HU8NlkEOSP5Y4kgPPzpCfVBKyNi+qip+Y="
"version": "2.23.0",
"hash": "sha256-aF+1pINoOKFjHUIalZFnEAmd3U3F5RaBBs26xOCWFeo="
},
{
"pname": "Microsoft.ApplicationInsights.PerfCounterCollector",
"version": "2.21.0",
"hash": "sha256-hcU7tR9ZcytiwubRWwEKUCN04p5htNkZTmRaNVb8aA8="
},
{
"pname": "Microsoft.ApplicationInsights.PerfCounterCollector",
"version": "2.22.0",
"hash": "sha256-pOUi4ANSyfHPLS8Q+WFskVcazXrd28ijvm/iVjoIFiM="
"version": "2.23.0",
"hash": "sha256-GXYvx/cHoLhvBjyUdEG9ObZPSIwwTmYhT5KlbaI8pM4="
},
{
"pname": "Microsoft.ApplicationInsights.SnapshotCollector",
"version": "1.4.4",
"hash": "sha256-oaxpiMbuHfDBIRjheo83iS7i+aAtqrlAvdnTXGHK4nk="
"version": "1.4.6",
"hash": "sha256-swprkO1f43DCGL4thcBDbdchgyKvB4fmS5Bfq5OrvRQ="
},
{
"pname": "Microsoft.ApplicationInsights.WindowsServer",
@@ -191,8 +191,8 @@
},
{
"pname": "Microsoft.ApplicationInsights.WindowsServer",
"version": "2.22.0",
"hash": "sha256-oaWcrMK/TCtExq9BrTRvVs98a0YnlnMEbntsMYZhrCI="
"version": "2.23.0",
"hash": "sha256-WQ1kNYXRYWiE34+EHimGd4FBX6Taq302OkiHY0gtkLc="
},
{
"pname": "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel",
@@ -201,8 +201,8 @@
},
{
"pname": "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel",
"version": "2.22.0",
"hash": "sha256-JkqPzRI+wdtefP1UulOenrA5kkGB0cWzZqa3SLP3p8w="
"version": "2.23.0",
"hash": "sha256-ljFMP7722wl6jWUtQQgJ2ZAvykeGL/qLT6IAW/LdPec="
},
{
"pname": "Microsoft.AspNet.WebApi.Client",
@@ -582,9 +582,9 @@
},
{
"pname": "Microsoft.Azure.Functions.PythonWorker",
"version": "4.40.2",
"hash": "sha256-XRH3J+iUr5Ox3jWb1dVwOeHEj4mQZC4RzNjfkj0zkhI=",
"url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.functions.pythonworker/4.40.2/microsoft.azure.functions.pythonworker.4.40.2.nupkg"
"version": "4.41.2",
"hash": "sha256-xxQvSgNl43VuJ2GoGzYHkwJh06ahiThsDvBYOmayqPU=",
"url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.functions.pythonworker/4.41.2/microsoft.azure.functions.pythonworker.4.41.2.nupkg"
},
{
"pname": "Microsoft.Azure.Functions.Worker.ItemTemplates",
@@ -616,30 +616,25 @@
"version": "3.0.32",
"hash": "sha256-u8xcdtQYUu8X52WNmpyNw4TRjmSlZulA6RmR08fV28w="
},
{
"pname": "Microsoft.Azure.WebJobs",
"version": "3.0.37",
"hash": "sha256-C6ztW9QdUgxNTsYewOZDQGrl3Pxy99X7J8kQxUpivMk="
},
{
"pname": "Microsoft.Azure.WebJobs",
"version": "3.0.39",
"hash": "sha256-Ndym81F4BFIHsH4NF/weySuRdWgzQQM8hHsjTW8c1vs="
},
{
"pname": "Microsoft.Azure.WebJobs",
"version": "3.0.41",
"hash": "sha256-w5ojyAOq2qewkpP8NC1r7YV/GiC9eFbRrRC+keB4CDA="
},
{
"pname": "Microsoft.Azure.WebJobs",
"version": "3.0.42",
"hash": "sha256-pAAq5ZcRZVgX2v/SSoK84cAiBbUCn4R2KK0ME3FIqtg="
},
{
"pname": "Microsoft.Azure.WebJobs",
"version": "3.0.43",
"hash": "sha256-Bw1HhUdmmPIGLm2++4XrbSm2lxdvS8baUpOXvRN18HY="
},
{
"pname": "Microsoft.Azure.WebJobs",
"version": "3.0.44",
"hash": "sha256-U6y8iCcNtY2hZKgmRc86OgzbmVpZwOxGsR15KYfYYMg="
},
{
"pname": "Microsoft.Azure.WebJobs.Core",
"version": "3.0.42",
"hash": "sha256-kIaV8zb9TO1M/Dac4P3Csa34CBDMaPRza534ll4FW7A="
"version": "3.0.44",
"hash": "sha256-qdkfPYChaUrSXnA+yPwEWDVf3NA5KquTUlNXjxRKMv0="
},
{
"pname": "Microsoft.Azure.WebJobs.Extensions",
@@ -668,8 +663,8 @@
},
{
"pname": "Microsoft.Azure.WebJobs.Host.Storage",
"version": "5.0.1",
"hash": "sha256-ZbjinILfgrME2Z+9LkdHD4fGoIwy44im9WJfDnANWng="
"version": "5.0.2",
"hash": "sha256-FOMP7w8YcOua4BDBuaIjzJ+z0duBOaivB8rvTG+f0g4="
},
{
"pname": "Microsoft.Azure.WebJobs.ItemTemplates",
@@ -678,9 +673,8 @@
},
{
"pname": "Microsoft.Azure.WebJobs.Logging.ApplicationInsights",
"version": "3.0.42-12121",
"hash": "sha256-LHQL+cdP95W4l3jkPNIAIIqfWIDk9rEtvh71ZrosToc=",
"url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/1e0b47db-42dd-4931-a098-8cb031234dcc/nuget/v3/flat2/microsoft.azure.webjobs.logging.applicationinsights/3.0.42-12121/microsoft.azure.webjobs.logging.applicationinsights.3.0.42-12121.nupkg"
"version": "3.0.44",
"hash": "sha256-dvP7dzgpEKebtyrMj5ojzYeOp7HDYL3vSS6n7MJaUhY="
},
{
"pname": "Microsoft.Azure.WebJobs.ProjectTemplates",
@@ -689,14 +683,14 @@
},
{
"pname": "Microsoft.Azure.WebJobs.Rpc.Core",
"version": "3.0.37",
"hash": "sha256-YXg+mFUP66g12KLz/UggGBOYW/LI3REzhS8f5Sd8usU="
"version": "3.0.44",
"hash": "sha256-AAPQ/qABYuVLZEO4+fVza6E62rdM2N3UhblgeWuuzx4="
},
{
"pname": "Microsoft.Azure.WebJobs.Script",
"version": "4.1045.200",
"hash": "sha256-OQJgJABMEtK+UMFNkQOyMuiYOe0CtiBVG1A5DA4MaIY=",
"url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.webjobs.script/4.1045.200/microsoft.azure.webjobs.script.4.1045.200.nupkg"
"version": "4.1046.100",
"hash": "sha256-urd7cB7bX5HFavRcwRYLIK9l9AUWWv/tvnnl/2iI10s=",
"url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.webjobs.script/4.1046.100/microsoft.azure.webjobs.script.4.1046.100.nupkg"
},
{
"pname": "Microsoft.Azure.WebJobs.Script.Abstractions",
@@ -705,15 +699,15 @@
},
{
"pname": "Microsoft.Azure.WebJobs.Script.Grpc",
"version": "4.1045.200",
"hash": "sha256-JA/mDxn6DR/PWED4Gieh9Gh0tGChIHNGIqINyZDL2P0=",
"url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.webjobs.script.grpc/4.1045.200/microsoft.azure.webjobs.script.grpc.4.1045.200.nupkg"
"version": "4.1046.100",
"hash": "sha256-s3jFYSGbF939VjBQFcRSg0nVfw0LM2WpqcZVFVVSEtg=",
"url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.webjobs.script.grpc/4.1046.100/microsoft.azure.webjobs.script.grpc.4.1046.100.nupkg"
},
{
"pname": "Microsoft.Azure.WebJobs.Script.WebHost",
"version": "4.1045.200",
"hash": "sha256-jaf7HzuWFYYU1zqPnx7b/c2D9ASCzNvohpA/JBwPL94=",
"url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.webjobs.script.webhost/4.1045.200/microsoft.azure.webjobs.script.webhost.4.1045.200.nupkg"
"version": "4.1046.100",
"hash": "sha256-IxQORWQFt4H89iLnOI3TCVwuMQeFtRNcNg8DhTtB0jo=",
"url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.webjobs.script.webhost/4.1046.100/microsoft.azure.webjobs.script.webhost.4.1046.100.nupkg"
},
{
"pname": "Microsoft.Azure.WebSites.DataProtection",
@@ -818,13 +812,8 @@
},
{
"pname": "Microsoft.Extensions.Azure",
"version": "1.7.1",
"hash": "sha256-ZEOoC9sU7DL/IRk7P5Bnqe5V2xZ7/scnwST4oIsxZlU="
},
{
"pname": "Microsoft.Extensions.Caching.Abstractions",
"version": "1.0.0",
"hash": "sha256-TSbJFK4eRIe1AKnzJNTTon30Tg+IECwZ2zTKy+qTXEg="
"version": "1.7.5",
"hash": "sha256-VBS4Kqkvn2pw7zqqbqK2no5jXDGcZbyd9Gh4wd2gzKk="
},
{
"pname": "Microsoft.Extensions.Caching.Abstractions",
@@ -911,6 +900,11 @@
"version": "9.0.6",
"hash": "sha256-11bIIn40Qadrlp1MZpQmAlpBHXPcbxB4Gjcp12EUQ1M="
},
{
"pname": "Microsoft.Extensions.Configuration.Binder",
"version": "2.1.0",
"hash": "sha256-FNOrXx7bJbc6qrscne8RhRj28kxK3uq+3ltdXzhCKHQ="
},
{
"pname": "Microsoft.Extensions.Configuration.Binder",
"version": "2.1.1",
@@ -968,8 +962,8 @@
},
{
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
"version": "1.0.0",
"hash": "sha256-EW99BPB7ztVVd5nONd4Qjn9Ji+a1FX+nAe3Z/a+UnzA="
"version": "2.1.0",
"hash": "sha256-WgS/QtxbITCpVjs1JPCWuJRrZSoplOtY7VfOXjLqDDA="
},
{
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
@@ -1211,6 +1205,11 @@
"version": "9.0.0",
"hash": "sha256-kR16c+N8nQrWeYLajqnXPg7RiXjZMSFLnKLEs4VfjcM="
},
{
"pname": "Microsoft.Extensions.Logging.Abstractions",
"version": "2.1.0",
"hash": "sha256-0i4YUnMQ4DE0KDp47pssJLUIw8YAsHf2NZN0xoOLb78="
},
{
"pname": "Microsoft.Extensions.Logging.Abstractions",
"version": "2.1.1",
@@ -1263,8 +1262,8 @@
},
{
"pname": "Microsoft.Extensions.Logging.ApplicationInsights",
"version": "2.22.0",
"hash": "sha256-nGGJRpZax8fv6NJSveHjNronvBYltEOFr4HU+zdc9vs="
"version": "2.23.0",
"hash": "sha256-ptN8Y3vyAW81he8VhJ5P7W/pxyBToKuBMEcQa9qXZjo="
},
{
"pname": "Microsoft.Extensions.Logging.Configuration",
@@ -1308,8 +1307,8 @@
},
{
"pname": "Microsoft.Extensions.Options",
"version": "1.0.0",
"hash": "sha256-vU5mAhwBnf0EXQw1QMNwkt1aiEA0xjUMZmXOBo/MIz4="
"version": "2.1.0",
"hash": "sha256-ol0tKlHOyX1qAQqNWuag0thb2mMCU2JHNiw0nzUhJnE="
},
{
"pname": "Microsoft.Extensions.Options",
@@ -2391,11 +2390,6 @@
"version": "4.3.0",
"hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="
},
{
"pname": "System.Private.Uri",
"version": "4.3.2",
"hash": "sha256-jB2+W3tTQ6D9XHy5sEFMAazIe1fu2jrENUO0cb48OgU="
},
{
"pname": "System.Reactive",
"version": "5.0.0",
@@ -2531,11 +2525,6 @@
"version": "5.0.0",
"hash": "sha256-neARSpLPUzPxEKhJRwoBzhPxK+cKIitLx7WBYncsYgo="
},
{
"pname": "System.Runtime.CompilerServices.Unsafe",
"version": "6.0.0",
"hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="
},
{
"pname": "System.Runtime.Extensions",
"version": "4.1.0",
@@ -2576,11 +2565,6 @@
"version": "4.3.0",
"hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="
},
{
"pname": "System.Runtime.Loader",
"version": "4.3.0",
"hash": "sha256-syG1GTFjYbwX146BD/L7t55j+DZqpHDc6z28kdSNzx0="
},
{
"pname": "System.Runtime.Numerics",
"version": "4.0.1",
@@ -2616,6 +2600,11 @@
"version": "6.0.0",
"hash": "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg="
},
{
"pname": "System.Security.Claims",
"version": "4.3.0",
"hash": "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks="
},
{
"pname": "System.Security.Cryptography.Algorithms",
"version": "4.2.0",
@@ -2746,6 +2735,11 @@
"version": "6.0.0",
"hash": "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs="
},
{
"pname": "System.Security.Principal",
"version": "4.3.0",
"hash": "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk="
},
{
"pname": "System.Security.Principal.Windows",
"version": "4.3.0",
@@ -2846,11 +2840,6 @@
"version": "4.3.0",
"hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="
},
{
"pname": "System.Threading.Channels",
"version": "8.0.0",
"hash": "sha256-c5TYoLNXDLroLIPnlfyMHk7nZ70QAckc/c7V199YChg="
},
{
"pname": "System.Threading.Tasks",
"version": "4.0.11",

View File

@@ -8,14 +8,14 @@
go,
}:
let
version = "4.7.0";
version = "4.8.0";
templatesVersion = "3.1.1648";
src = fetchFromGitHub {
owner = "Azure";
repo = "azure-functions-core-tools";
tag = version;
hash = "sha256-2Bs1jxJmZzzShSrUK3XP+cNdXlczPEr6UCnh4oQRaoA=";
hash = "sha256-OY2FPzST1ejU+OPccv7Qvd8cM3gtiiL2CQNj2APDIx0=";
};
templates = fetchurl {

View File

@@ -8,13 +8,13 @@
}:
buildGo126Module (finalAttrs: {
pname = "beszel";
version = "0.18.4";
version = "0.18.6";
src = fetchFromGitHub {
owner = "henrygd";
repo = "beszel";
tag = "v${finalAttrs.version}";
hash = "sha256-Ugxy23bLrKIDclrYRFJc6Nq4Ak2S3OLeyMaxuRkS/tY=";
hash = "sha256-CRO0Y3o3hwdE55D027fo0tvt9o7vsA1ooEBFlXuw2So=";
};
webui = buildNpmPackage {
@@ -51,13 +51,25 @@ buildGo126Module (finalAttrs: {
npmDepsHash = "sha256-509/n5OH4z6LZH+jlmDLl2DlqKrD7M5ajtalmF/4n1o=";
};
vendorHash = "sha256-V9P3VP4CsboaWPIt/MhtxYDsYH3pwKL4xK5YcLKgbI8=";
vendorHash = "sha256-g+UmoxBoCL3oGXNTY67Wz7y6FC/nkcS8020jhTq4JQE=";
tags = [ "testing" ];
preBuild = ''
mkdir -p internal/site/dist
cp -r ${finalAttrs.webui}/* internal/site/dist
'';
checkFlags =
let
skippedTests = [
"TestCollectorStartHelpers/nvtop_collector"
"TestApiRoutesAuthentication/GET_/update_-_shouldn't_exist_without_CHECK_UPDATES_env_var"
"TestConfigSyncWithTokens"
];
in
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
postInstall = ''
mv $out/bin/agent $out/bin/beszel-agent
mv $out/bin/hub $out/bin/beszel-hub

View File

@@ -13,13 +13,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "bngblaster";
version = "0.9.31";
version = "0.9.33";
src = fetchFromGitHub {
owner = "rtbrick";
repo = "bngblaster";
rev = finalAttrs.version;
hash = "sha256-/HGgC+I67sksc60gJD1G1FtUnTZrXct/aclcfCuS5wk=";
hash = "sha256-8Ka+fLDQdSadxXGd/xMt7qurdnSFE6jdi8bGnTH+mPQ=";
};
nativeBuildInputs = [ cmake ];

View File

@@ -3,24 +3,24 @@
let
pname = "brave";
version = "1.88.136";
version = "1.88.138";
allArchives = {
aarch64-linux = {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
hash = "sha256-niseHDxEz2fhGeLUCMtMK2GYhe4U5Zk/btf8jariaiA=";
hash = "sha256-8qsWJeHsSPukHbsYIssELvr5Sq6TIxnDzXak/eQrwYk=";
};
x86_64-linux = {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
hash = "sha256-2OLaXWJ7J58z7y9bUrzWNwRL1T6ZOCDHeUmcb/qnHY0=";
hash = "sha256-Z1cXDihjzrVTj9XsG9ral8NMZSdPqL4q8VIZ2Ee05Qc=";
};
aarch64-darwin = {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
hash = "sha256-Jf/dQy8o87iytsWcTUpPlYTOcdvnzJjlkH1M6y+x9Dw=";
hash = "sha256-yDBGo/J2b5iu9e4NvXN3EgYEDYaMq1V9MVb9xeGHpHo=";
};
x86_64-darwin = {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
hash = "sha256-NvDEExLdgeukyT7MTe1MR3Emp0o1Q2bdO5mpSWeBGcA=";
hash = "sha256-RzLlDoyqPdL51aDD4/3r+f8sO4Tz8Osso50fsFR3iBc=";
};
};

View File

@@ -1,46 +1,46 @@
{
"version": "2.1.91",
"buildDate": "2026-04-02T22:04:30Z",
"version": "2.1.92",
"buildDate": "2026-04-03T23:31:32Z",
"platforms": {
"darwin-arm64": {
"binary": "claude",
"checksum": "7433d76d3ec5d223a340e21d7a05f3d481d89999f228113168ad5d64c66fd376",
"size": 198092944
"checksum": "6d1b9657727dce81332b3cda11bfe0a8c83e2392e3c062a31022e10b0e71cdd1",
"size": 198736976
},
"darwin-x64": {
"binary": "claude",
"checksum": "47409dc476c199711d5c776cf359773f75cb9dc72ce7494a4e4cb100520e8ab4",
"size": 199574608
"checksum": "d422b5cc974b3bc4b28f698144fd0316f3e17774babe0bc1eb76c2bb0858d0aa",
"size": 200226896
},
"linux-arm64": {
"binary": "claude",
"checksum": "dddba100b352ea6d06aa7e036d5afe49749edddd1309a4aa22e47049fafcadf9",
"size": 230427200
"checksum": "08deb3d56477496eb92e624f492e25b123f4527dd5674f71afff58a48eccd953",
"size": 231082560
},
"linux-x64": {
"binary": "claude",
"checksum": "01b74e1b02e3330940b3526d2f6e00bf32f7fd9e6b3861be6a61e01cfd7296e6",
"size": 230161024
"checksum": "e22324514967ff2d5e9f91f0ee37e4675bf8b6dfec27fafb19cb25cc5b23fcaf",
"size": 230787712
},
"linux-arm64-musl": {
"binary": "claude",
"checksum": "3dcaacefb510f6aee3573d35fe65f5dccbbbf4b6fdcca9a5a5455c03556a2f8b",
"size": 223480256
"checksum": "d0163f8857511b8f9dad7de1f072de2ca8c4e881d006b3b43525af3534050ae3",
"size": 224201152
},
"linux-x64-musl": {
"binary": "claude",
"checksum": "b05d9447b7d9a4fa92f936b2275ca87db3bada52d8589bf4e4c49d437366942a",
"size": 224459200
"checksum": "e0f4a300ff9d0d9cb9c3ee37c706a9db239e3bbce96118245196ae6bc1b0492e",
"size": 225102272
},
"win32-x64": {
"binary": "claude.exe",
"checksum": "12f69849f6774749718520f41fb94f6fc30779b55d8f9b0acaaf20c755e6b55d",
"size": 239873184
"checksum": "ebd9007c464d912593418f133a61d9f24866428530a81e88e910a24823066415",
"size": 240482464
},
"win32-arm64": {
"binary": "claude.exe",
"checksum": "389de7f1f2b979cb4098f7752ca0099275cedabcfe3908a9886d143ef594972b",
"size": 236586144
"checksum": "c258bce79aefac609f909e5abde92d1653bcef47d3577656d299d1d56f1604bb",
"size": 237192864
}
}
}

View File

@@ -1,12 +1,12 @@
{
"name": "@anthropic-ai/claude-code",
"version": "2.1.91",
"version": "2.1.92",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@anthropic-ai/claude-code",
"version": "2.1.91",
"version": "2.1.92",
"license": "SEE LICENSE IN README.md",
"bin": {
"claude": "cli.js"

View File

@@ -15,14 +15,14 @@
}:
buildNpmPackage (finalAttrs: {
pname = "claude-code";
version = "2.1.91";
version = "2.1.92";
src = fetchzip {
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
hash = "sha256-u7jdM6hTYN05ZLPz630Yj7gI0PeCSArg4O6ItQRAMy4=";
hash = "sha256-CLLCtVK3TeXFZ8wBnRRHNc2MoUt7lTdMJwz8sZHpkFM=";
};
npmDepsHash = "sha256-0ppKP+XMgTzVVZtL7GDsOjgvSPUDrUa7SoG048RLaNg=";
npmDepsHash = "sha256-5LvH7fG5pti2SiXHQqgRxfFpxaXxzrmGxIoPR4dGE+8=";
strictDeps = true;

View File

@@ -8,13 +8,13 @@
stdenvNoCC.mkDerivation {
pname = "cli-tips";
version = "0-unstable-2025-06-13";
version = "0-unstable-2026-03-29";
src = fetchFromGitHub {
owner = "cli-stuff";
repo = "cli-tips";
rev = "be62dcd3fef8a32166775d90c5538a18bf7fed94";
hash = "sha256-irl9TXk+8ME8dXQmsYR13uIlqFyZyUgREXROxeX65VY=";
rev = "0268e0e3a8eddf21a61a4d21be3b5b81629b14b4";
hash = "sha256-Pjb3p2EIM+7fz83t9QTjSeFoxbvDYWTYoxtJ0MAMB2s=";
};
nativeBuildInputs = [ makeWrapper ];

View File

@@ -16,16 +16,16 @@
buildGoModule (finalAttrs: {
pname = "cliamp";
version = "1.27.8";
version = "1.34.0";
src = fetchFromGitHub {
owner = "bjarneo";
repo = "cliamp";
tag = "v${finalAttrs.version}";
hash = "sha256-htgNQTOiT4JwkpXy27tTColbVgvJA2qmm1giNbr3P7M=";
hash = "sha256-0WT3DRII4o58KFK+7UW0QgrJwrJwmPkKmTQeVXmtoZ0=";
};
vendorHash = "sha256-UMDCpfSGfvJmI+sImaFzgZpLNaLMgEnmGCqERwPokHM=";
vendorHash = "sha256-+uh+4ZYvnlKmRSIvZFlnfBPqU0CFFe/Op1Gr9hjIr4U=";
nativeBuildInputs = [
pkg-config

View File

@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ctl";
version = "1.5.3";
version = "1.5.5";
src = fetchFromGitHub {
owner = "ampas";
repo = "CTL";
rev = "ctl-${finalAttrs.version}";
hash = "sha256-jG+38jsPw+4CEAbOG+hudfPBPbZLG+Om7PszkFa6DuI=";
hash = "sha256-X6W6IXZUMBTZJTzpAk7FmoEhSPELTmhYv68dZmqUJ2g=";
};
nativeBuildInputs = [

View File

@@ -34,11 +34,11 @@
stdenvNoCC.mkDerivation rec {
pname = "deezer-enhanced";
version = "1.5.0";
version = "1.4.2";
src = fetchurl {
url = "https://github.com/duzda/deezer-enhanced/releases/download/v${version}/deezer-enhanced_${version}_amd64.deb";
hash = "sha256-UN+Jdtx6Zgt1c4Phc2mVmvL2fCw208vltzPPD8zpHBc=";
hash = "sha256-PRq5R0AXCsW+cEuf1EU+o7g6oa8K5jGAphoNC8cSNFw=";
};
nativeBuildInputs = [

View File

@@ -1,26 +1,31 @@
{
lib,
stdenv,
kdePackages,
qt6,
minizip,
fetchFromGitHub,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "doomrunner";
version = "1.9.1";
version = "1.9.2";
src = fetchFromGitHub {
owner = "Youda008";
repo = "DoomRunner";
tag = "v${finalAttrs.version}";
hash = "sha256-N5kj2Z3QW29kOw2khET6Z4E9nFBBjNTgKw2xbCQrWKY=";
hash = "sha256-YkLW3og51e2sydWUiMDr2DOr1uHxzv4Z3rr/WRys5bY=";
};
buildInputs = [ kdePackages.qtbase ];
buildInputs = [
minizip
qt6.qtbase
];
nativeBuildInputs = [
kdePackages.qmake
kdePackages.wrapQtAppsHook
qt6.qmake
qt6.wrapQtAppsHook
];
makeFlags = [
@@ -42,13 +47,15 @@ stdenv.mkDerivation (finalAttrs: {
rm -rf $out/usr
'';
passthru.updateScript = nix-update-script { };
meta = {
description = "Preset-oriented graphical launcher of various ported Doom engines";
mainProgram = "DoomRunner";
homepage = "https://github.com/Youda008/DoomRunner";
changelog = "https://github.com/Youda008/DoomRunner/blob/${finalAttrs.src.rev}/changelog.txt";
description = "Preset-oriented graphical launcher of various ported Doom engines";
homepage = "https://github.com/Youda008/DoomRunner";
license = lib.licenses.gpl3Only;
platforms = lib.platforms.all;
mainProgram = "DoomRunner";
maintainers = with lib.maintainers; [ keenanweaver ];
platforms = lib.platforms.all;
};
})

View File

@@ -1,16 +0,0 @@
--- a/book.toml
+++ b/book.toml
@@ -1,6 +1,5 @@
[book]
language = "en"
-multilingual = false
src = "book"
title = "Engage"
@@ -8,5 +7,5 @@ build-dir = "public"
[output.html]
-git-repository-icon = "fa-git-square"
+git-repository-icon = "fab-square-git"
git-repository-url = "https://gitlab.computer.surgery/charles/engage"

View File

@@ -3,21 +3,15 @@
installShellFiles,
rustPlatform,
fetchFromGitLab,
stdenv,
mdbook,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "engage";
version = "0.2.1";
outputs = [
"out"
"doc"
];
version = "0.3.0";
env = {
ENGAGE_DOCS_LINK = "file://${placeholder "doc"}/share/doc/engage/index.html";
ENGAGE_BOOK_PATH = "${placeholder "out"}/share/doc/${finalAttrs.pname}";
};
src = fetchFromGitLab {
@@ -25,29 +19,21 @@ rustPlatform.buildRustPackage (finalAttrs: {
owner = "charles";
repo = "engage";
rev = "v${finalAttrs.version}";
hash = "sha256-n7ypFJBYT712Uzh1NnWWSOIpEDKR0e6sQxbiIN6pZgo=";
hash = "sha256-dKnpovsBcx3fyDK2eSVf4vzJaQ0uNGcKoYSE56kUDEg=";
};
patches = [
# Support mdbook 0.5.x - remove deprecated multilingual field
./mdbook-0.5-support.patch
];
cargoHash = "sha256-UTIxxPBtxzsZilxriAT8ksl2ovoDzIhB+8f+b2cGN3k=";
cargoHash = "sha256-wHPjVP/hzMdmKVYDzjUGoaSKwcf7A9nYeM5HhvBQ+bc=";
nativeBuildInputs = [
installShellFiles
];
checkFlags = [
# Upstream doesn't set `ENGAGE_DOCS_LINK` during tests so the output differs.
"--skip=long_help"
];
buildAndTestSubdir = "crates/engage";
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
postInstall = ''
installShellCompletion --cmd engage ${
builtins.concatStringsSep " " (
map (shell: "--${shell} <($out/bin/engage completions ${shell})") [
map (shell: "--${shell} <(cargo xtask completions ${shell})") [
"bash"
"zsh"
"fish"
@@ -56,15 +42,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
}
${lib.getExe mdbook} build
mkdir -p "$doc/share/doc"
mv public "$doc/share/doc/engage"
mkdir -p $out/share/doc
mv public $out/share/doc/${finalAttrs.pname}
'';
meta = {
description = "Task runner with DAG-based parallelism";
description = "Process composer with ordering and parallelism based on directed acyclic graphs";
mainProgram = "engage";
homepage = "https://gitlab.computer.surgery/charles/engage";
changelog = "https://charles.gitlab-pages.computer.surgery/engage/changelog.html";
homepage = "https://engage.computer.surgery";
changelog = "https://engage.computer.surgery/changelog.html";
license = with lib.licenses; [
asl20
mit

View File

@@ -17,16 +17,16 @@
}:
let
version = "0.303.2";
version = "0.304.0";
src = fetchFromGitHub {
owner = "evcc-io";
repo = "evcc";
tag = version;
hash = "sha256-Z8kDC0dtKnsgIvjHFrLShwfKDqE5pkM/TSacadiOPa8=";
hash = "sha256-zT/V3b0SQbstUk/dLmCN7bufQ7NsS5UTHIzmQsnaHIU=";
};
vendorHash = "sha256-FFI3zVAISX1+r15yPxIto2GX//DQVHWajERPSwLbOSM=";
vendorHash = "sha256-7Uz/VYuVnRjpDHvwPO2LLif9iWrGDvxdsre0fENBiwU=";
commonMeta = {
license = lib.licenses.mit;
@@ -52,7 +52,7 @@ buildGo126Module rec {
npmDeps = fetchNpmDeps {
inherit src;
hash = "sha256-3YKYuwr6r0zgQvlrEZjhIDYmueWCAimjJF4YgeVa8WY=";
hash = "sha256-/M/htYm3T5DJfNKLMudItfKKQ179mrUWdL/EVGSt2ss=";
};
nativeBuildInputs = [

View File

@@ -8,13 +8,13 @@
buildGoModule (finalAttrs: {
pname = "fabric-ai";
version = "1.4.441";
version = "1.4.442";
src = fetchFromGitHub {
owner = "danielmiessler";
repo = "fabric";
tag = "v${finalAttrs.version}";
hash = "sha256-hbK4AOqK9IkvKPrQWCQd5K1IWcfXiP0fVPEMtstJSsI=";
hash = "sha256-f9GgCJC7Ho0W2eX98ooIrQ71ToCFJrQROQdewibvyAs=";
};
vendorHash = "sha256-Ay+ndVlyHwA93QdzMRsQfpp38MAzQgXX5pif6ElbO4M=";

View File

@@ -3,11 +3,9 @@
stdenv,
fetchurl,
autoPatchelfHook,
wrapQtAppsHook,
hidapi,
readline,
qtsvg,
qtxmlpatterns,
libsForQt5,
}:
stdenv.mkDerivation {
@@ -21,14 +19,14 @@ stdenv.mkDerivation {
nativeBuildInputs = [
autoPatchelfHook
wrapQtAppsHook
libsForQt5.wrapQtAppsHook
];
buildInputs = [
hidapi
readline
qtsvg
qtxmlpatterns
libsForQt5.qtsvg
libsForQt5.qtxmlpatterns
];
dontConfigure = true;

View File

@@ -18,15 +18,15 @@
perlPackages.buildPerlPackage rec {
pname = "foomatic-db-engine";
version = "0-unstable-2024-02-10";
version = "0-unstable-2026-04-13";
src = fetchFromGitHub {
# there is also a daily snapshot at the `downloadPage`,
# but it gets deleted quickly and would provoke 404 errors
owner = "OpenPrinting";
repo = "foomatic-db-engine";
rev = "a2b12271e145fe3fd34c3560d276a57e928296cb";
hash = "sha256-qM12qtGotf9C0cjO9IkmzlW9GWCkT2Um+6dU3mZm3DU=";
rev = "e4e7b9cd28ba160428f82bc5234559d1f50e5c42";
hash = "sha256-wpGFGr2H2adN4AVrYBNc+f4nE9x7OtzAxF5PkzmieXc=";
};
outputs = [ "out" ];

View File

@@ -1,38 +1,21 @@
From e46a41faac008ede4acbeb18db5b3076eb206de5 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sun, 3 Nov 2024 15:11:49 +0800
Subject: [PATCH] Add version info
---
main.go | 1 +
testdata/script/help.txtar | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/main.go b/main.go
index 0de5a2f..1c830b1 100644
--- a/main.go
+++ b/main.go
@@ -362,6 +362,7 @@ func mainErr(args []string) error {
// manually construct something like a pseudo-version.
// TODO: remove when this code is dead, hopefully in Go 1.22.
if mod.Version == "(devel)" {
+ mod.Version = "@version@"
var vcsTime time.Time
var vcsRevision string
for _, setting := range info.Settings {
diff --git a/testdata/script/help.txtar b/testdata/script/help.txtar
index 8f25260..859f492 100644
@@ -370,6 +370,7 @@
mod = mod.Replace
}
+ mod.Version = "@version@"
fmt.Printf("%s %s\n\n", mod.Path, mod.Version)
fmt.Printf("Build settings:\n")
for _, setting := range info.Settings {
--- a/testdata/script/help.txtar
+++ b/testdata/script/help.txtar
@@ -91,7 +91,7 @@ stderr 'directory not found'
# and to be able to use static VCS info, use an environment variable.
# First, test without the information, and then with it.
@@ -88,7 +88,7 @@
# Test the version command. Note that test binaries exclude VCS build info,
# and we reuse the test binary for garble itself, so that's missing.
exec garble version
-stdout -count=1 'mvdan.cc/garble \(devel\)'
+stdout -count=1 'mvdan.cc/garble @version@'
stdout -count=1 'Build settings'
stdout -count=3 '-compiler|GOOS|GOARCH'
! stdout 'vcs'
--
2.46.1

View File

@@ -1,7 +1,7 @@
{
lib,
stdenv,
buildGoModule,
buildGo125Module,
fetchFromGitHub,
git,
versionCheckHook,
@@ -9,15 +9,15 @@
nix-update-script,
}:
buildGoModule (finalAttrs: {
buildGo125Module (finalAttrs: {
pname = "garble";
version = "0.14.1";
version = "0.15.0";
src = fetchFromGitHub {
owner = "burrowers";
repo = "garble";
tag = "v${finalAttrs.version}";
hash = "sha256-zS/K2kOpWhJmr0NuWSjEjNXV8ILt81yLIQWSPDuMwt8=";
hash = "sha256-9Vjv5Eis+ALUm2aaXOj4i8w3UmylPggMXqgwXtD2YA8=";
};
__darwinAllowLocalNetworking = true;
@@ -34,10 +34,10 @@ buildGoModule (finalAttrs: {
checkFlags = [
"-skip"
"TestScript/gogarble"
"TestScript/gogarble|TestScript/gotoolchain|TestScript/tiny"
];
vendorHash = "sha256-xxG1aQrALVuJ7oVn+Z+sH655eFQ7rcYFmymGCUZD1uU=";
vendorHash = "sha256-EOmAb2k9LSzsvumsCZdeJIDKQBJBeRFt15mWAyyVl1k=";
# Used for some of the tests.
nativeCheckInputs = [

View File

@@ -7,16 +7,16 @@
}:
buildGoModule rec {
pname = "git-pkgs";
version = "0.15.0";
version = "0.15.2";
src = fetchFromGitHub {
owner = "git-pkgs";
repo = "git-pkgs";
tag = "v${version}";
hash = "sha256-ePkLzUlHgFTJjzcZ5SP1LNcSCnaUhTO2nxDpt/jjvBc=";
hash = "sha256-2vtzWzl9x6wd6XE0Z3a9Z/Ph9kschBwcTsNGC7JEFrA=";
};
vendorHash = "sha256-3753+h7NBpawkk0+UL+chIvS7vfklDU+T8uKjHsD6Yc=";
vendorHash = "sha256-USEs7eL0gwrddZDiKUUejYEBEAzWxt62qBo9o5/7AKc=";
subPackages = [ "." ];

View File

@@ -1,7 +1,7 @@
PATH
remote: .
specs:
github-linguist (9.1.0)
github-linguist (9.5.0)
cgi
charlock_holmes (~> 0.7.7)
mini_mime (~> 1.0)
@@ -10,26 +10,31 @@ PATH
GEM
remote: https://rubygems.org/
specs:
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
byebug (12.0.0)
cgi (0.4.2)
addressable (2.8.9)
public_suffix (>= 2.0.2, < 8.0)
byebug (13.0.0)
reline (>= 0.6.0)
cgi (0.5.1)
charlock_holmes (0.7.9)
coderay (1.1.3)
dotenv (3.1.8)
faraday (2.13.1)
csv (3.3.5)
dotenv (3.2.0)
faraday (2.14.1)
faraday-net_http (>= 2.0, < 3.5)
json
logger
faraday-net_http (3.4.0)
net-http (>= 0.5.0)
json (2.11.3)
licensed (4.5.0)
faraday-net_http (3.4.2)
net-http (~> 0.5)
io-console (0.8.2)
json (2.19.2)
licensed (5.0.6)
csv (~> 3.3)
json (~> 2.6)
licensee (~> 9.16)
ostruct (~> 0.6.3)
parallel (~> 1.22)
pathname-common_prefix (~> 0.0.1)
reverse_markdown (~> 2.1)
reverse_markdown (>= 2.1, < 4.0)
ruby-xxHash (~> 0.4.0)
thor (~> 1.2)
tomlrb (~> 2.0)
@@ -42,40 +47,44 @@ GEM
logger (1.7.0)
method_source (1.1.0)
mini_mime (1.1.5)
mini_portile2 (2.8.8)
minitest (5.25.5)
mocha (2.7.1)
mini_portile2 (2.8.9)
minitest (5.27.0)
mocha (2.8.2)
ruby2_keywords (>= 0.0.5)
net-http (0.6.0)
uri
nokogiri (1.18.10)
net-http (0.9.1)
uri (>= 0.11.1)
nokogiri (1.19.2)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
octokit (9.2.0)
faraday (>= 1, < 3)
sawyer (~> 0.9)
ostruct (0.6.3)
parallel (1.27.0)
pathname-common_prefix (0.0.2)
plist (3.7.2)
pry (0.15.2)
pry (0.16.0)
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (6.0.1)
reline (>= 0.6.0)
public_suffix (7.0.5)
racc (1.8.1)
rake (13.2.1)
rake (13.3.1)
rake-compiler (0.9.9)
rake
reverse_markdown (2.1.1)
reline (0.6.3)
io-console (~> 0.5)
reverse_markdown (3.0.2)
nokogiri
ruby-xxHash (0.4.0.2)
ruby2_keywords (0.0.5)
rugged (1.9.0)
sawyer (0.9.2)
sawyer (0.9.3)
addressable (>= 2.3.5)
faraday (>= 0.17.3, < 3)
thor (1.3.2)
tomlrb (2.0.3)
uri (1.0.3)
thor (1.5.0)
tomlrb (2.0.4)
uri (1.1.1)
yajl-ruby (1.4.3)
PLATFORMS
@@ -85,7 +94,7 @@ DEPENDENCIES
bundler (~> 2.0)
byebug
github-linguist!
licensed (~> 4.0)
licensed (~> 5.0)
licensee (~> 9.15)
minitest (~> 5.15)
mocha (~> 2.1)
@@ -96,4 +105,4 @@ DEPENDENCIES
yajl-ruby (~> 1.4)
BUNDLED WITH
2.5.22
2.6.9

View File

@@ -8,30 +8,31 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6";
sha256 = "11ali533wx91fh93xlk88gjqq8w0p7kxw09nlh41hwc9wv5ly5fc";
type = "gem";
};
version = "2.8.7";
version = "2.8.9";
};
byebug = {
dependencies = [ "reline" ];
groups = [ "debug" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "07hsr9zzl2mvf5gk65va4smdizlk9rsiz8wwxik0p96cj79518fl";
sha256 = "0pg05blj56sxdxq9d54386y9rlvj36vl95x21x9clh8rfpz3w9nj";
type = "gem";
};
version = "12.0.0";
version = "13.0.0";
};
cgi = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1rj7agrnd1a4282vg13qkpwky0379svdb2z2lc0wl8588q6ikjx3";
sha256 = "1s8qdw1nfh3njd47q154njlfyc2llcgi4ik13vz39adqd7yclgz9";
type = "gem";
};
version = "0.4.2";
version = "0.5.1";
};
charlock_holmes = {
groups = [ "default" ];
@@ -56,6 +57,19 @@
};
version = "1.1.3";
};
csv = {
groups = [
"default"
"development"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0gz7r2kazwwwyrwi95hbnhy54kwkfac5swh2gy5p5vw36fn38lbf";
type = "gem";
};
version = "3.3.5";
};
dotenv = {
groups = [
"default"
@@ -64,10 +78,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1hwjsddv666wpp42bip3fqx7c5qq6s8lwf74dj71yn7d1h37c4cy";
sha256 = "17b1zr9kih0i3wb7h4yq9i8vi6hjfq07857j437a8z7a44qvhxg3";
type = "gem";
};
version = "3.1.8";
version = "3.2.0";
};
faraday = {
dependencies = [
@@ -82,10 +96,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0xbv450qj2bx0qz9l2pjrd3kc057y6bglc3na7a78zby8ssiwlyc";
sha256 = "077n5ss3z3ds4vj54w201kd12smai853dp9c9n7ii7g3q7nwwg54";
type = "gem";
};
version = "2.13.1";
version = "2.14.1";
};
faraday-net_http = {
dependencies = [ "net-http" ];
@@ -96,10 +110,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0jp5ci6g40d6i50bsywp35l97nc2fpi9a592r2cibwicdb6y9wd1";
sha256 = "0v4hfmc7d4lrqqj2wl366rm9551gd08zkv2ppwwnjlnkc217aizi";
type = "gem";
};
version = "3.4.0";
version = "3.4.2";
};
github-linguist = {
dependencies = [
@@ -114,7 +128,21 @@
path = ./.;
type = "path";
};
version = "9.1.0";
version = "9.5.0";
};
io-console = {
groups = [
"debug"
"default"
"development"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1k0lk3pwadm2myvpg893n8jshmrf2sigrd4ki15lymy7gixaxqyn";
type = "gem";
};
version = "0.8.2";
};
json = {
groups = [
@@ -124,15 +152,17 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1hfcz73wszgqprg2pr83qjbyfb0k93frbdvyhgmw0ryyl9cgc44s";
sha256 = "1kw39sqnr0lprwsd2h0zx1ic96skhqf88i14xv7c8drcicqvvqg7";
type = "gem";
};
version = "2.11.3";
version = "2.19.2";
};
licensed = {
dependencies = [
"csv"
"json"
"licensee"
"ostruct"
"parallel"
"pathname-common_prefix"
"reverse_markdown"
@@ -144,10 +174,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1hyphm8wyijpbz4wy2cyl6whxd66y2c9dqrljirl397gc08idykk";
sha256 = "0vz2xz4md69wn9l2073ln68mpjxycqqivkqg8bsr3i1d3q7lv4zs";
type = "gem";
};
version = "4.5.0";
version = "5.0.6";
};
licensee = {
dependencies = [
@@ -210,20 +240,20 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf";
sha256 = "12f2830x7pq3kj0v8nz0zjvaw02sv01bqs1zwdrc04704kwcgmqc";
type = "gem";
};
version = "2.8.8";
version = "2.8.9";
};
minitest = {
groups = [ "development" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0mn7q9yzrwinvfvkyjiz548a4rmcwbmz2fn9nyzh4j1snin6q6rr";
sha256 = "1mbpz92ml19rcxxfjrj91gmkif9khb1xpzyw38f81rvglgw1ffrd";
type = "gem";
};
version = "5.25.5";
version = "5.27.0";
};
mocha = {
dependencies = [ "ruby2_keywords" ];
@@ -231,10 +261,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0lgqyxxdxgfik77a7lk2hjkr6flimgxr4gcbg3y7bg1ybn6m6zcg";
sha256 = "1vjfizp8yq0319dkc8yzzxr2bv5f1ki1qiknyx72prs7vclyfxqz";
type = "gem";
};
version = "2.7.1";
version = "2.8.2";
};
net-http = {
dependencies = [ "uri" ];
@@ -245,24 +275,27 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1ysrwaabhf0sn24jrp0nnp51cdv0jf688mh5i6fsz63q2c6b48cn";
sha256 = "15k96fj6qwbaiv6g52l538ass95ds1qwgynqdridz29yqrkhpfi5";
type = "gem";
};
version = "0.6.0";
version = "0.9.1";
};
nokogiri = {
dependencies = [
"mini_portile2"
"racc"
];
groups = [ "default" ];
groups = [
"default"
"development"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1hcwwr2h8jnqqxmf8mfb52b0dchr7pm064ingflb78wa00qhgk6m";
sha256 = "0mhp90nf3g3yy5vgjnwd34czi6rbi0p7057vgngfmmdkknsxiz9q";
type = "gem";
};
version = "1.18.10";
version = "1.19.2";
};
octokit = {
dependencies = [
@@ -281,6 +314,19 @@
};
version = "9.2.0";
};
ostruct = {
groups = [
"default"
"development"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "04nrir9wdpc4izqwqbysxyly8y7hsfr4fsv69rw91lfi9d5fv8lm";
type = "gem";
};
version = "0.6.3";
};
parallel = {
groups = [
"default"
@@ -321,15 +367,16 @@
dependencies = [
"coderay"
"method_source"
"reline"
];
groups = [ "development" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0ssv704qg75mwlyagdfr9xxbzn1ziyqgzm0x474jkynk8234pm8j";
sha256 = "0kh5nv8v74k1ccy6gc7nd04aaf1cjkbk7g8pwy2izvcqaq36jv6p";
type = "gem";
};
version = "0.15.2";
version = "0.16.0";
};
public_suffix = {
groups = [
@@ -339,10 +386,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31";
sha256 = "08znfv30pxmdkjyihvbjqbvv874dj3nybmmyscl958dy3f7v12qs";
type = "gem";
};
version = "6.0.1";
version = "7.0.5";
};
racc = {
groups = [
@@ -362,10 +409,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6";
sha256 = "175iisqb211n0qbfyqd8jz2g01q6xj038zjf4q0nm8k6kz88k7lc";
type = "gem";
};
version = "13.2.1";
version = "13.3.1";
};
rake-compiler = {
dependencies = [ "rake" ];
@@ -378,6 +425,21 @@
};
version = "0.9.9";
};
reline = {
dependencies = [ "io-console" ];
groups = [
"debug"
"default"
"development"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0d8q5c4nh2g9pp758kizh8sfrvngynrjlm0i1zn3cnsnfd4v160i";
type = "gem";
};
version = "0.6.3";
};
reverse_markdown = {
dependencies = [ "nokogiri" ];
groups = [
@@ -387,10 +449,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0087vhw5ik50lxvddicns01clkx800fk5v5qnrvi3b42nrk6885j";
sha256 = "1bxqlpwnixn8x4bnna958w6m6qkdkbnd23b9j6ib3nrrrs9bp3l1";
type = "gem";
};
version = "2.1.1";
version = "3.0.2";
};
ruby-xxHash = {
groups = [
@@ -443,10 +505,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1jks1qjbmqm8f9kvwa81vqj39avaj9wdnzc531xm29a55bb74fps";
sha256 = "0hayryyz46nlkcb6j0ij0kxq6i3ryiigwfc6ccvp0108hhlij3qd";
type = "gem";
};
version = "0.9.2";
version = "0.9.3";
};
thor = {
groups = [
@@ -456,10 +518,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f";
sha256 = "0wsy88vg2mazl039392hqrcwvs5nb9kq8jhhrrclir2px1gybag3";
type = "gem";
};
version = "1.3.2";
version = "1.5.0";
};
tomlrb = {
groups = [
@@ -469,10 +531,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1xyl2nlfm39lklyaf0p7zj9psr60jvrlyfh26hrpk7wi4k7nlwy2";
sha256 = "168v339gqaly00i4zqg2ag2h10r3rl7999d0cqrrpb63gaa7fbr6";
type = "gem";
};
version = "2.0.3";
version = "2.0.4";
};
uri = {
groups = [
@@ -482,10 +544,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "04bhfvc25b07jaiaf62yrach7khhr5jlr5bx6nygg8pf11329wp9";
sha256 = "1ijpbj7mdrq7rhpq2kb51yykhrs2s54wfs6sm9z3icgz4y6sb7rp";
type = "gem";
};
version = "1.0.3";
version = "1.1.1";
};
yajl-ruby = {
groups = [ "development" ];

View File

@@ -8,12 +8,12 @@
let
gemName = "github-linguist";
version = "9.1.0";
version = "9.5.0";
src = fetchFromGitHub {
owner = "github-linguist";
repo = "linguist";
tag = "v${version}";
hash = "sha256-nPIUo6yQY6WvKuXvT1oOx6LZq49QLa9YIJmOrRYgAdg=";
hash = "sha256-kxPiHsWrd+iwvasXfHiwZYAJFMmzZGOsZtsor5Jf1fg=";
};
deps = bundlerEnv {

View File

@@ -1,72 +0,0 @@
{
lib,
stdenv,
fetchurl,
fetchpatch,
SDL,
SDL_gfx,
SDL_image,
tremor,
flac,
mpg123,
libmikmod,
speex,
ncurses,
keymap ? "default",
conf ? "unknown",
}:
stdenv.mkDerivation (finalAttrs: {
pname = "gmu";
version = "0.10.1";
src = fetchurl {
url = "https://wej.k.vu/files/gmu-${finalAttrs.version}.tar.gz";
sha256 = "03x0mc0xw2if0bpf0a15yprcyx1xccki039zvl2099dagwk6xskv";
};
patches = [
# pull pending upstream inclusion fix for ncurses-6.3:
# https://github.com/jhe2/gmu/pull/7
(fetchpatch {
name = "ncurses-6.3.patch";
url = "https://github.com/jhe2/gmu/commit/c8b3a10afee136feb333754ef6ec26383b11072f.patch";
sha256 = "0xp2j3jp8pkmv6yvnzi378m2dylbfsaqrsrkw7hbxw6kglzj399r";
})
# pull upstream fix for -fno-common toolchains like
# upstream gcc-10 of clang-13.
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/jhe2/gmu/commit/b705209f08ddfda141ad358ccd0c3d2d099be5e6.patch";
sha256 = "1ci2b8kz3r58rzmivlfhqjmcgqwlkwlzzhnyxlk36vmk240a3gqq";
})
];
buildInputs = [
SDL
SDL_gfx
SDL_image
tremor
flac
mpg123
libmikmod
speex
ncurses
];
makeFlags = [ "PREFIX=$(out)" ];
postInstall = ''
cp ${keymap}.keymap $out/share/gmu/default.keymap
cp gmuinput.${conf}.conf $out/share/gmu/gmuinput.conf
mkdir -p $out/etc/gmu
cp gmu.${conf}.conf $out/etc/gmu/gmu.conf
'';
meta = {
homepage = "http://wejp.k.vu/projects/gmu";
description = "Open source music player for portable gaming consoles and handhelds";
license = lib.licenses.gpl2;
};
})

View File

@@ -4,20 +4,25 @@
fetchFromGitHub,
versionCheckHook,
nix-update-script,
makeWrapper,
air,
nodejs,
bun,
templ,
}:
buildGoModule rec {
pname = "gowebly";
version = "3.0.5";
version = "3.1.0";
src = fetchFromGitHub {
owner = "gowebly";
repo = "gowebly";
tag = "v${version}";
hash = "sha256-r1yyMbnpt0sDgqkm/EqaYysQnm48uIXzQHqJObVpT9g=";
hash = "sha256-/MB8YuqeZUb9P6RPO2sgwtYShaNkEFckiVBtnHRPkc4=";
};
vendorHash = "sha256-N48/67fMPsylNGr6ixay4si+9ifUryxkIJxKDYU46+o=";
vendorHash = "sha256-8i1o0Dn4xJ1P3CrYDW0X8epiIpjmIac6gENBYi/bmQo=";
env.CGO_ENABLED = 0;
@@ -26,6 +31,22 @@ buildGoModule rec {
"-w"
];
nativeBuildInputs = [
makeWrapper
];
postInstall = ''
wrapProgram $out/bin/gowebly \
--prefix PATH : ${
lib.makeBinPath [
air
templ
bun
nodejs
]
}
'';
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "doctor";
doInstallCheck = true;

View File

@@ -2,6 +2,8 @@
lib,
rustPlatform,
fetchCrate,
versionCheckHook,
nix-update-script,
}:
rustPlatform.buildRustPackage (finalAttrs: {
@@ -9,7 +11,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
version = "0.9.1";
src = fetchCrate {
inherit (finalAttrs) pname version;
inherit (finalAttrs) version;
pname = "hayagriva";
hash = "sha256-9PGo/TPk5QuiVoa5wUGyHufW/VaxqhinxS+u2JMPZBY=";
};
@@ -26,15 +29,21 @@ rustPlatform.buildRustPackage (finalAttrs: {
"--skip=csl::tests::test_csl"
];
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
passthru.updateScript = nix-update-script { };
meta = {
description = "Work with references: Literature database management, storage, and citation formatting";
homepage = "https://github.com/typst/hayagriva";
changelog = "https://github.com/typst/hayagriva/releases/tag/v${finalAttrs.version}";
changelog = "https://github.com/typst/hayagriva/blob/v${finalAttrs.version}/CHANGELOG.md";
license = with lib.licenses; [
asl20
mit
];
maintainers = [ ];
maintainers = with lib.maintainers; [ trespaul ];
mainProgram = "hayagriva";
};
})

View File

@@ -10,13 +10,13 @@
buildGoModule (finalAttrs: {
pname = "kubevirt";
version = "1.7.2";
version = "1.8.1";
src = fetchFromGitHub {
owner = "kubevirt";
repo = "kubevirt";
rev = "v${finalAttrs.version}";
hash = "sha256-Bx2DzuKNcDkFnkyiEay9WosM6qZ4vnDLrz2NwNn5J3E=";
hash = "sha256-EBF2Pkw4Yl8D5ghE/SA/NOwC2lUQwpk1JZkujWPce6E=";
};
vendorHash = null;

View File

@@ -1,50 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libdynd";
version = "0.7.2";
src = fetchFromGitHub {
owner = "libdynd";
repo = "libdynd";
rev = "v${finalAttrs.version}";
sha256 = "0fkd5rawqni1cq51fmr76iw7ll4fmbahfwv4rglnsabbkylf73pr";
};
cmakeFlags = [
"-DDYND_BUILD_BENCHMARKS=OFF"
];
env.NIX_CFLAGS_COMPILE = toString [
# added to fix build with gcc7+
"-Wno-error=implicit-fallthrough"
"-Wno-error=nonnull"
"-Wno-error=tautological-compare"
"-Wno-error=class-memaccess"
"-Wno-error=parentheses"
"-Wno-error=deprecated-copy"
# Needed with GCC 12
"-Wno-error=deprecated-declarations"
"-Wno-error=maybe-uninitialized"
];
nativeBuildInputs = [ cmake ];
outputs = [
"out"
"dev"
];
outputDoc = "dev";
meta = {
description = "C++ dynamic ndarray library, with Python exposure";
homepage = "http://libdynd.org";
license = lib.licenses.bsd2;
platforms = lib.platforms.linux;
};
})

View File

@@ -16,6 +16,11 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-OgXnNGIgWZDIChRdEfmHwvl+oQM03V3a/HnndGLjcHk=";
};
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-fail "set(ver_patch 0)" "set(ver_patch 1)"
'';
nativeBuildInputs = [ cmake ];
meta = {

View File

@@ -10,7 +10,9 @@
libnl,
libxcrypt,
pkg-config,
rdma-core,
withBluez ? false,
withRdma ? false,
withRemote ? false,
# for passthru.tests
@@ -46,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
bash
]
++ lib.optionals stdenv.hostPlatform.isLinux [ libnl ]
++ lib.optionals withRdma [ rdma-core ]
++ lib.optionals withRemote [ libxcrypt ]
++ lib.optionals withBluez [ bluez ];
@@ -63,6 +66,9 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals stdenv.hostPlatform.isDarwin [
"--disable-universal"
]
++ lib.optionals withRdma [
"--enable-rdma"
]
++ lib.optionals withRemote [
"--enable-remote"
]

View File

@@ -78,7 +78,7 @@ let
in
effectiveStdenv.mkDerivation (finalAttrs: {
pname = "llama-cpp";
version = "8548";
version = "8664";
outputs = [
"out"
@@ -89,7 +89,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
owner = "ggml-org";
repo = "llama.cpp";
tag = "b${finalAttrs.version}";
hash = "sha256-DBsTZBkngCnPbSZzs9zqWgIN1+tn8xTJ8EkNYg3xaLE=";
hash = "sha256-JTQg8A+8S7O/GSnRTDmvQuwDSuss+ydv6JDrNxWNeK8=";
leaveDotGit = true;
postFetch = ''
git -C "$out" rev-parse --short HEAD > $out/COMMIT
@@ -99,10 +99,6 @@ effectiveStdenv.mkDerivation (finalAttrs: {
patches = [ ];
postPatch = ''
rm tools/server/public/index.html.gz
'';
nativeBuildInputs = [
cmake
installShellFiles

View File

@@ -3,8 +3,6 @@
autoPatchelfHook,
lib,
makeWrapper,
requireFile,
runCommand,
stdenv,
symlinkJoin,
# arguments from default.nix
@@ -91,9 +89,13 @@ stdenv.mkDerivation {
meta
pname
src
version
;
version =
version # a comment to trick nixfmt
+ lib.optionalString cudaSupport "-cuda"
+ lib.optionalString (lang != "en") "-${lang}";
nativeBuildInputs = [
autoPatchelfHook
makeWrapper

View File

@@ -1,34 +1,61 @@
{
callPackage,
requireFile,
config,
lib,
cudaPackages,
cudaSupport ? config.cudaSupport,
/*
If you want an older version or a version with web documentation or different language,
you can override any of the following attributes:
```nix
my_mathematica = mathematica.override {
version = "X.Y.Z";
lang = "??";
webdoc = true;
};
```
This, however, requires that the version you are requesting is known to nixpkgs
and is added as an entry in `./versions.nix`.
If it is not, you can manually specify all the necessary information:
```nix
my_mathematica = mathematica.override {
versionInfo = {
version = "X.Y.Z";
lang = "en";
language = "English";
# Get this hash via a command similar to this:
# nix-hash --type sha256 --sri \
# $(nix store add-path Wolfram_XX.X.X_BNDL_LINUX.sh --name 'Wolfram_XX.X.X_BNDL_LINUX.sh')
hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
installer = "Installer_File_Name.sh";
};
};
```
`versionInfo` will take precedence over `version`, `lang`, & `webdoc`.
*/
lang ? "en",
webdoc ? false,
version ? null,
versionInfo ? null,
/*
If you wish to completely override the src, use:
By default, this nix expression will try to find the installer in the Nix Store
based on the filename and hash (either found in ./versions.nix or provided by user in `versionInfo`).
But you can completely override the `src`:
```nix
my_mathematica = mathematica.override {
source = pkgs.requireFile {
name = "Mathematica_XX.X.X_BNDL_LINUX.sh";
# Get this hash via a command similar to this:
# nix-store --query --hash \
# $(nix store add-path Mathematica_XX.X.X_BNDL_LINUX.sh --name 'Mathematica_XX.X.X_BNDL_LINUX.sh')
sha256 = "0000000000000000000000000000000000000000000000000000";
message = ''
Your override for Mathematica includes a different src for the installer,
and it is missing.
'';
hashMode = "recursive";
source = pkgs.fetchurl {
url = "https://example.com/Wolfram_XX.X.X_BNDL_LINUX.sh";
hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
};
}
};
```
*/
source ? null,
}:
let
versions = callPackage ./versions.nix { };
versions = import ./versions.nix;
matching-versions = lib.sort (v1: v2: lib.versionOlder v2.version v1.version) (
lib.filter (
@@ -56,19 +83,31 @@ let
in
lib.compareLists lib.compare (sublist as) (sublist bs) == 0;
matchesDoc = v: (builtins.match ".*[0-9]_LIN(UX)?.sh" v.src.name != null) == webdoc;
matchesDoc = v: (builtins.match ".*[0-9]_LIN(UX)?.sh" v.installer != null) == webdoc;
selected = lib.defaultTo found-version versionInfo;
defaultSource = requireFile {
name = selected.installer;
message = ''
This nix expression requires that ${selected.installer} is
already part of the store. Find the file on your Mathematica CD
and add it to the nix store with nix-store --add-fixed sha256 <FILE>.
'';
inherit (selected) hash;
};
in
callPackage ./generic.nix {
inherit cudaSupport cudaPackages;
inherit (found-version) lang;
src = if source == null then found-version.src else source;
pname = "mathematica";
version =
found-version.version
+ lib.optionalString cudaSupport "-cuda"
+ lib.optionalString (lang != "en") "-${lang}";
inherit (selected) version lang;
src = lib.defaultTo defaultSource source;
meta = {
description = "Wolfram Mathematica computational software system";
homepage = "https://www.wolfram.com/mathematica/";

View File

@@ -1,231 +1,203 @@
{ lib, requireFile }:
/*
To calculate the hash of an installer, use a command like this:
nix --extra-experimental-features nix-command hash file <installer-file>
*/
let
versions = [
{
version = "14.3.0";
lang = "en";
language = "English";
sha256 = "sha256-F4Rl4xz3vso+N//Uz7ZXvh5CrM6nsKMQxrRR11o/aNA=";
installer = "Wolfram_14.3.0_LIN.sh";
}
{
version = "14.3.0";
lang = "en";
language = "English";
sha256 = "sha256-FvcXXijGOcuRA1UFyVvPIyR1YaK/qrkMpLxf+mz+A/c=";
installer = "Wolfram_14.3.0_LIN_Bndl.sh";
}
{
version = "14.2.1";
lang = "en";
language = "English";
sha256 = "sha256-WNLuq9RviYF3Mj8uOALhmvcxGGHVq/TAGFMTGWoYBcc=";
installer = "Wolfram_14.2.1_LIN.sh";
}
{
version = "14.2.1";
lang = "en";
language = "English";
sha256 = "sha256-DcZbetr5wO3i/DkchgpsW3RGHfa1PslA4fK+bRQ68Bg=";
installer = "Wolfram_14.2.1_LIN_Bndl.sh";
}
{
version = "14.2.0";
lang = "en";
language = "English";
sha256 = "sha256-wIuyWufKuchPl7phCxVM9vIIkjUHfRxIECfDyGJliqs=";
installer = "Wolfram_14.2.0_LIN.sh";
}
{
version = "14.2.0";
lang = "en";
language = "English";
sha256 = "sha256-wY6acGoUc7y22enSi7RrcRFLvvPGaeYTta4yWExlXho=";
installer = "Wolfram_14.2.0_LIN_Bndl.sh";
}
{
version = "14.1.0";
lang = "en";
language = "English";
sha256 = "sha256-PCpjwqA6NC+iwvYxddYBlmF5+vl76r+MoIYAL91WFns=";
installer = "Wolfram_14.1.0_LIN.sh";
}
{
version = "14.1.0";
lang = "en";
language = "English";
sha256 = "sha256-pnu60Pv3xo3+MAkDLiU3yTPVbbQ00diV45vSVL8B310=";
installer = "Wolfram_14.1.0_LIN_Bndl.sh";
}
{
version = "14.0.0";
lang = "en";
language = "English";
sha256 = "sha256-NzMhGQZq6o6V4UdtJxUH/yyP2s7wjTR86SRA7lW7JfI=";
installer = "Mathematica_14.0.0_LINUX.sh";
}
{
version = "14.0.0";
lang = "en";
language = "English";
sha256 = "sha256-UrcBEg6G6nbVX++X0z0oG5JjieXL0AquAqtjzY5EBn4=";
installer = "Mathematica_14.0.0_BNDL_LINUX.sh";
}
{
version = "13.3.1";
lang = "en";
language = "English";
sha256 = "sha256-0+mYVGiF4Qn3eiLIoINSHVIqT8GtlBPFRYIOF+nHyQo=";
installer = "Mathematica_13.3.1_LINUX.sh";
}
{
version = "13.3.1";
lang = "en";
language = "English";
sha256 = "sha256-03R4s05fmTcZnlZIMSI6xlLER58MIoccoCr27F8BXOk=";
installer = "Mathematica_13.3.1_BNDL_LINUX.sh";
}
{
version = "13.3.0";
lang = "en";
language = "English";
sha256 = "sha256-24MC0O+kBUe3TrwXUb+7QZt8tQHvWVIT8F9B6Ih+4k8=";
installer = "Mathematica_13.3.0_LINUX.sh";
}
{
version = "13.3.0";
lang = "en";
language = "English";
sha256 = "sha256-91bw7+4ht+7g+eF32BNYf77yEQWyuPffisj4kB63pcI=";
installer = "Mathematica_13.3.0_BNDL_LINUX.sh";
}
{
version = "13.2.1";
lang = "en";
language = "English";
sha256 = "sha256-GA2k+jvE4mTJsIbMHce5c516h/glHLnXdthEfnNmk0w=";
installer = "Mathematica_13.2.1_LINUX.sh";
}
{
version = "13.2.1";
lang = "en";
language = "English";
sha256 = "sha256-ZvgG2W/gjQIo4hyXHsGta5FyTslrz/ltOe/ZK/U2Sx8=";
installer = "Mathematica_13.2.1_BNDL_LINUX.sh";
}
{
version = "13.2.0";
lang = "en";
language = "English";
sha256 = "sha256-T9XOXA6jpgN6bcO/do9sw1L73ABtyxuZCLzftv4Cl6o=";
installer = "Mathematica_13.2.0_LINUX.sh";
}
{
version = "13.2.0";
lang = "en";
language = "English";
sha256 = "sha256-YRUvl2H9SwpwDZx04ugd7ZnK5G+t88bzAObXsGGVhk0=";
installer = "Mathematica_13.2.0_BNDL_LINUX.sh";
}
{
version = "13.1.0";
lang = "en";
language = "English";
sha256 = "sha256-GZyUYslx/M4aFI3Pj9Osw3/w79/Jp/4T3mRE277pNuM=";
installer = "Mathematica_13.1.0_LINUX.sh";
}
{
version = "13.1.0";
lang = "en";
language = "English";
sha256 = "sha256-LIpGAJ3uTkZgjc0YykwusyyHQKlCnTvrZGStFfSOz60=";
installer = "Mathematica_13.1.0_BNDL_LINUX.sh";
}
{
version = "13.0.1";
lang = "en";
language = "English";
sha256 = "sha256-NnKpIMG0rxr9SAcz9tZ2Zbr4JYdX3+WabtbXRAzybbo=";
installer = "Mathematica_13.0.1_BNDL_LINUX.sh";
}
{
version = "13.0.0";
lang = "en";
language = "English";
sha256 = "sha256-FbutOaWZUDEyXR0Xj2OwDnFwbT7JAB66bRaB+8mR0+E=";
installer = "Mathematica_13.0.0_BNDL_LINUX.sh";
}
{
version = "12.3.1";
lang = "en";
language = "English";
sha256 = "sha256-UbnKsS/ZGwCep61JaKLIpZ6U3FXS5swdcSrNW6LE1Qk=";
installer = "Mathematica_12.3.1_LINUX.sh";
}
{
version = "12.3.0";
lang = "en";
language = "English";
sha256 = "sha256-BF3wRfbnlt7Vn2TrLg8ZSayI3LodW24F+1PqCkrtchU=";
installer = "Mathematica_12.3.0_LINUX.sh";
}
{
version = "12.2.0";
lang = "en";
language = "English";
sha256 = "sha256-O2Z2ogPGrbfpxBilSEsDeXQoe1vgnGTn3+p03cDkANc=";
installer = "Mathematica_12.2.0_LINUX.sh";
}
{
version = "12.1.1";
lang = "en";
language = "English";
sha256 = "sha256-rUe4hr5KmGTXD1I/eSYVoFHU68mH2aD2VLZFtOtDswo=";
installer = "Mathematica_12.1.1_LINUX.sh";
}
{
version = "12.1.0";
lang = "en";
language = "English";
sha256 = "sha256-56P1KKOTJkQj+K9wppAsnYpej/YB3VUNL7DPLYGgqZY=";
installer = "Mathematica_12.1.0_LINUX.sh";
}
{
version = "12.0.0";
lang = "en";
language = "English";
sha256 = "sha256-uftx4a/MHXLCABlv+kNFEtII+ikg4geHhDP1BOWK6dc=";
installer = "Mathematica_12.0.0_LINUX.sh";
}
];
in
lib.flip map versions (
[
{
version,
lang,
language,
sha256,
installer,
}:
{
inherit version lang;
src = requireFile {
name = installer;
message = ''
This nix expression requires that ${installer} is
already part of the store. Find the file on your Mathematica CD
and add it to the nix store with nix-store --add-fixed sha256 <FILE>.
'';
inherit sha256;
};
version = "14.3.0";
lang = "en";
language = "English";
hash = "sha256-F4Rl4xz3vso+N//Uz7ZXvh5CrM6nsKMQxrRR11o/aNA=";
installer = "Wolfram_14.3.0_LIN.sh";
}
)
{
version = "14.3.0";
lang = "en";
language = "English";
hash = "sha256-FvcXXijGOcuRA1UFyVvPIyR1YaK/qrkMpLxf+mz+A/c=";
installer = "Wolfram_14.3.0_LIN_Bndl.sh";
}
{
version = "14.2.1";
lang = "en";
language = "English";
hash = "sha256-WNLuq9RviYF3Mj8uOALhmvcxGGHVq/TAGFMTGWoYBcc=";
installer = "Wolfram_14.2.1_LIN.sh";
}
{
version = "14.2.1";
lang = "en";
language = "English";
hash = "sha256-DcZbetr5wO3i/DkchgpsW3RGHfa1PslA4fK+bRQ68Bg=";
installer = "Wolfram_14.2.1_LIN_Bndl.sh";
}
{
version = "14.2.0";
lang = "en";
language = "English";
hash = "sha256-wIuyWufKuchPl7phCxVM9vIIkjUHfRxIECfDyGJliqs=";
installer = "Wolfram_14.2.0_LIN.sh";
}
{
version = "14.2.0";
lang = "en";
language = "English";
hash = "sha256-wY6acGoUc7y22enSi7RrcRFLvvPGaeYTta4yWExlXho=";
installer = "Wolfram_14.2.0_LIN_Bndl.sh";
}
{
version = "14.1.0";
lang = "en";
language = "English";
hash = "sha256-PCpjwqA6NC+iwvYxddYBlmF5+vl76r+MoIYAL91WFns=";
installer = "Wolfram_14.1.0_LIN.sh";
}
{
version = "14.1.0";
lang = "en";
language = "English";
hash = "sha256-pnu60Pv3xo3+MAkDLiU3yTPVbbQ00diV45vSVL8B310=";
installer = "Wolfram_14.1.0_LIN_Bndl.sh";
}
{
version = "14.0.0";
lang = "en";
language = "English";
hash = "sha256-NzMhGQZq6o6V4UdtJxUH/yyP2s7wjTR86SRA7lW7JfI=";
installer = "Mathematica_14.0.0_LINUX.sh";
}
{
version = "14.0.0";
lang = "en";
language = "English";
hash = "sha256-UrcBEg6G6nbVX++X0z0oG5JjieXL0AquAqtjzY5EBn4=";
installer = "Mathematica_14.0.0_BNDL_LINUX.sh";
}
{
version = "13.3.1";
lang = "en";
language = "English";
hash = "sha256-0+mYVGiF4Qn3eiLIoINSHVIqT8GtlBPFRYIOF+nHyQo=";
installer = "Mathematica_13.3.1_LINUX.sh";
}
{
version = "13.3.1";
lang = "en";
language = "English";
hash = "sha256-03R4s05fmTcZnlZIMSI6xlLER58MIoccoCr27F8BXOk=";
installer = "Mathematica_13.3.1_BNDL_LINUX.sh";
}
{
version = "13.3.0";
lang = "en";
language = "English";
hash = "sha256-24MC0O+kBUe3TrwXUb+7QZt8tQHvWVIT8F9B6Ih+4k8=";
installer = "Mathematica_13.3.0_LINUX.sh";
}
{
version = "13.3.0";
lang = "en";
language = "English";
hash = "sha256-91bw7+4ht+7g+eF32BNYf77yEQWyuPffisj4kB63pcI=";
installer = "Mathematica_13.3.0_BNDL_LINUX.sh";
}
{
version = "13.2.1";
lang = "en";
language = "English";
hash = "sha256-GA2k+jvE4mTJsIbMHce5c516h/glHLnXdthEfnNmk0w=";
installer = "Mathematica_13.2.1_LINUX.sh";
}
{
version = "13.2.1";
lang = "en";
language = "English";
hash = "sha256-ZvgG2W/gjQIo4hyXHsGta5FyTslrz/ltOe/ZK/U2Sx8=";
installer = "Mathematica_13.2.1_BNDL_LINUX.sh";
}
{
version = "13.2.0";
lang = "en";
language = "English";
hash = "sha256-T9XOXA6jpgN6bcO/do9sw1L73ABtyxuZCLzftv4Cl6o=";
installer = "Mathematica_13.2.0_LINUX.sh";
}
{
version = "13.2.0";
lang = "en";
language = "English";
hash = "sha256-YRUvl2H9SwpwDZx04ugd7ZnK5G+t88bzAObXsGGVhk0=";
installer = "Mathematica_13.2.0_BNDL_LINUX.sh";
}
{
version = "13.1.0";
lang = "en";
language = "English";
hash = "sha256-GZyUYslx/M4aFI3Pj9Osw3/w79/Jp/4T3mRE277pNuM=";
installer = "Mathematica_13.1.0_LINUX.sh";
}
{
version = "13.1.0";
lang = "en";
language = "English";
hash = "sha256-LIpGAJ3uTkZgjc0YykwusyyHQKlCnTvrZGStFfSOz60=";
installer = "Mathematica_13.1.0_BNDL_LINUX.sh";
}
{
version = "13.0.1";
lang = "en";
language = "English";
hash = "sha256-NnKpIMG0rxr9SAcz9tZ2Zbr4JYdX3+WabtbXRAzybbo=";
installer = "Mathematica_13.0.1_BNDL_LINUX.sh";
}
{
version = "13.0.0";
lang = "en";
language = "English";
hash = "sha256-FbutOaWZUDEyXR0Xj2OwDnFwbT7JAB66bRaB+8mR0+E=";
installer = "Mathematica_13.0.0_BNDL_LINUX.sh";
}
{
version = "12.3.1";
lang = "en";
language = "English";
hash = "sha256-UbnKsS/ZGwCep61JaKLIpZ6U3FXS5swdcSrNW6LE1Qk=";
installer = "Mathematica_12.3.1_LINUX.sh";
}
{
version = "12.3.0";
lang = "en";
language = "English";
hash = "sha256-BF3wRfbnlt7Vn2TrLg8ZSayI3LodW24F+1PqCkrtchU=";
installer = "Mathematica_12.3.0_LINUX.sh";
}
{
version = "12.2.0";
lang = "en";
language = "English";
hash = "sha256-O2Z2ogPGrbfpxBilSEsDeXQoe1vgnGTn3+p03cDkANc=";
installer = "Mathematica_12.2.0_LINUX.sh";
}
{
version = "12.1.1";
lang = "en";
language = "English";
hash = "sha256-rUe4hr5KmGTXD1I/eSYVoFHU68mH2aD2VLZFtOtDswo=";
installer = "Mathematica_12.1.1_LINUX.sh";
}
{
version = "12.1.0";
lang = "en";
language = "English";
hash = "sha256-56P1KKOTJkQj+K9wppAsnYpej/YB3VUNL7DPLYGgqZY=";
installer = "Mathematica_12.1.0_LINUX.sh";
}
{
version = "12.0.0";
lang = "en";
language = "English";
hash = "sha256-uftx4a/MHXLCABlv+kNFEtII+ikg4geHhDP1BOWK6dc=";
installer = "Mathematica_12.0.0_LINUX.sh";
}
]

View File

@@ -0,0 +1,49 @@
{
lib,
python3Packages,
fetchFromGitHub,
}:
python3Packages.buildPythonApplication (finalAttrs: {
pname = "mcp-server-fetch";
version = "2026.1.26-unstable-2026-05-17";
pyproject = true;
src = fetchFromGitHub {
owner = "modelcontextprotocol";
repo = "servers";
rev = "f4244583a6af9425633e433a3eec000d23f4e011";
hash = "sha256-bHknioQu8i5RcFlBBdXUQjsV4WN1IScnwohGRxXgGDk=";
};
sourceRoot = "${finalAttrs.src.name}/src/fetch/";
build-system = with python3Packages; [
hatchling
];
dependencies = with python3Packages; [
httpx
markdownify
mcp
protego
pydantic
readabilipy
requests
];
# Tests require network access
doCheck = false;
pythonImportsCheck = [ "mcp_server_fetch" ];
meta = {
changelog = "https://github.com/modelcontextprotocol/servers/releases/tag/${finalAttrs.version}";
description = "Model Context Protocol server providing tools to fetch and convert web content for usage by LLMs";
homepage = "https://github.com/modelcontextprotocol/servers";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ drupol ];
mainProgram = "mcp-server-fetch";
platforms = lib.platforms.all;
};
})

View File

@@ -0,0 +1,45 @@
{
lib,
buildNpmPackage,
typescript,
fetchFromGitHub,
}:
buildNpmPackage (finalAttrs: {
pname = "mcp-server-filesystem";
version = "2026.1.26";
src = fetchFromGitHub {
owner = "modelcontextprotocol";
repo = "servers";
tag = finalAttrs.version;
hash = "sha256-uULXUEHFZpYm/fmF6PkOFCxS+B+0q3dMveLG+3JHrhk=";
};
nativeBuildInputs = [
typescript
];
dontNpmPrune = true;
npmWorkspace = "src/filesystem";
npmDepsHash = "sha256-jmz4JdpeHH07vJQFntBwrENbJaIcOuZMb7+qf497VOE=";
# TODO: revisit this when https://github.com/NixOS/nixpkgs/pull/333759 has landed
postInstall = ''
rm -rf $out/lib/node_modules/@modelcontextprotocol/servers/node_modules/@modelcontextprotocol/server-filesystem
rm -rf $out/lib/node_modules/@modelcontextprotocol/servers/node_modules/@modelcontextprotocol/server-memory
rm -rf $out/lib/node_modules/@modelcontextprotocol/servers/node_modules/@modelcontextprotocol/server-everything
rm -rf $out/lib/node_modules/@modelcontextprotocol/servers/node_modules/@modelcontextprotocol/server-sequential-thinking
rm -rf $out/lib/node_modules/@modelcontextprotocol/servers/node_modules/.bin
'';
meta = {
changelog = "https://github.com/modelcontextprotocol/servers/releases/tag/${finalAttrs.version}";
description = "MCP server for filesystem access";
homepage = "https://github.com/modelcontextprotocol/servers";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ drupol ];
mainProgram = "mcp-server-filesystem";
platforms = lib.platforms.all;
};
})

View File

@@ -0,0 +1,47 @@
{
lib,
python3Packages,
fetchFromGitHub,
}:
python3Packages.buildPythonApplication (finalAttrs: {
pname = "mcp-server-git";
version = "2026.1.26";
pyproject = true;
src = fetchFromGitHub {
owner = "modelcontextprotocol";
repo = "servers";
tag = finalAttrs.version;
hash = "sha256-uULXUEHFZpYm/fmF6PkOFCxS+B+0q3dMveLG+3JHrhk=";
};
sourceRoot = "${finalAttrs.src.name}/src/git/";
build-system = with python3Packages; [
hatchling
];
dependencies = with python3Packages; [
click
gitpython
mcp
pydantic
];
nativeCheckInputs = with python3Packages; [
pytestCheckHook
];
pythonImportsCheck = [ "mcp_server_git" ];
meta = {
changelog = "https://github.com/modelcontextprotocol/servers/releases/tag/${finalAttrs.version}";
description = "Model Context Protocol server providing tools to read, search, and manipulate Git repositories programmatically via LLMs";
homepage = "https://github.com/modelcontextprotocol/servers";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ drupol ];
mainProgram = "mcp-server-git";
platforms = lib.platforms.all;
};
})

View File

@@ -0,0 +1,45 @@
{
lib,
buildNpmPackage,
typescript,
fetchFromGitHub,
}:
buildNpmPackage (finalAttrs: {
pname = "mcp-server-memory";
version = "2026.1.26";
src = fetchFromGitHub {
owner = "modelcontextprotocol";
repo = "servers";
tag = finalAttrs.version;
hash = "sha256-uULXUEHFZpYm/fmF6PkOFCxS+B+0q3dMveLG+3JHrhk=";
};
nativeBuildInputs = [
typescript
];
dontNpmPrune = true;
npmWorkspace = "src/memory";
npmDepsHash = "sha256-jmz4JdpeHH07vJQFntBwrENbJaIcOuZMb7+qf497VOE=";
# TODO: revisit this when https://github.com/NixOS/nixpkgs/pull/333759 has landed
postInstall = ''
rm -rf $out/lib/node_modules/@modelcontextprotocol/servers/node_modules/@modelcontextprotocol/server-filesystem
rm -rf $out/lib/node_modules/@modelcontextprotocol/servers/node_modules/@modelcontextprotocol/server-memory
rm -rf $out/lib/node_modules/@modelcontextprotocol/servers/node_modules/@modelcontextprotocol/server-everything
rm -rf $out/lib/node_modules/@modelcontextprotocol/servers/node_modules/@modelcontextprotocol/server-sequential-thinking
rm -rf $out/lib/node_modules/@modelcontextprotocol/servers/node_modules/.bin
'';
meta = {
changelog = "https://github.com/modelcontextprotocol/servers/releases/tag/${finalAttrs.version}";
description = "MCP server for enabling memory for Claude through a knowledge graph";
homepage = "https://github.com/modelcontextprotocol/servers";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ drupol ];
mainProgram = "mcp-server-memory";
platforms = lib.platforms.all;
};
})

View File

@@ -0,0 +1,45 @@
{
lib,
buildNpmPackage,
typescript,
fetchFromGitHub,
}:
buildNpmPackage (finalAttrs: {
pname = "mcp-server-sequential-thinking";
version = "2026.1.26";
src = fetchFromGitHub {
owner = "modelcontextprotocol";
repo = "servers";
tag = finalAttrs.version;
hash = "sha256-uULXUEHFZpYm/fmF6PkOFCxS+B+0q3dMveLG+3JHrhk=";
};
nativeBuildInputs = [
typescript
];
dontNpmPrune = true;
npmWorkspace = "src/sequentialthinking";
npmDepsHash = "sha256-jmz4JdpeHH07vJQFntBwrENbJaIcOuZMb7+qf497VOE=";
# TODO: revisit this when https://github.com/NixOS/nixpkgs/pull/333759 has landed
postInstall = ''
rm -rf $out/lib/node_modules/@modelcontextprotocol/servers/node_modules/@modelcontextprotocol/server-filesystem
rm -rf $out/lib/node_modules/@modelcontextprotocol/servers/node_modules/@modelcontextprotocol/server-memory
rm -rf $out/lib/node_modules/@modelcontextprotocol/servers/node_modules/@modelcontextprotocol/server-everything
rm -rf $out/lib/node_modules/@modelcontextprotocol/servers/node_modules/@modelcontextprotocol/server-sequential-thinking
rm -rf $out/lib/node_modules/@modelcontextprotocol/servers/node_modules/.bin
'';
meta = {
changelog = "https://github.com/modelcontextprotocol/servers/releases/tag/${finalAttrs.version}";
description = "MCP server for sequential thinking and problem solving";
homepage = "https://github.com/modelcontextprotocol/servers";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ drupol ];
mainProgram = "mcp-server-memory";
platforms = lib.platforms.all;
};
})

View File

@@ -0,0 +1,48 @@
{
lib,
python3Packages,
fetchFromGitHub,
}:
python3Packages.buildPythonApplication (finalAttrs: {
pname = "mcp-server-time";
version = "2026.1.26";
pyproject = true;
src = fetchFromGitHub {
owner = "modelcontextprotocol";
repo = "servers";
tag = finalAttrs.version;
hash = "sha256-uULXUEHFZpYm/fmF6PkOFCxS+B+0q3dMveLG+3JHrhk=";
};
sourceRoot = "${finalAttrs.src.name}/src/time/";
build-system = with python3Packages; [
hatchling
];
dependencies = with python3Packages; [
mcp
pydantic
tzdata
tzlocal
];
nativeCheckInputs = with python3Packages; [
freezegun
pytestCheckHook
];
pythonImportsCheck = [ "mcp_server_time" ];
meta = {
changelog = "https://github.com/modelcontextprotocol/servers/releases/tag/${finalAttrs.version}";
description = "Model Context Protocol server providing tools for time queries and timezone conversions for LLMs";
homepage = "https://github.com/modelcontextprotocol/servers";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ drupol ];
mainProgram = "mcp-server-git";
platforms = lib.platforms.all;
};
})

View File

@@ -0,0 +1,34 @@
diff --git a/src/levelblit.c b/src/levelblit.c
index 5a04a8e..f530aa8 100644
--- a/src/levelblit.c
+++ b/src/levelblit.c
@@ -2575,7 +2575,7 @@ void SpecialTile(int x, int y)
break;
case 42:
if (rooms[player_room].room_type == 5) {
- if (CanGetArtifact(rooms[player_room].room_param)) {
+ if (CanGetArtifact()) {
} else {
sprintf(message, _("The artifact is tainted with shadow. You must slay more of the shadow first.") );
diff --git a/src/save.h b/src/save.h
index dd67443..bcf0471 100644
--- a/src/save.h
+++ b/src/save.h
@@ -24,7 +24,7 @@
#ifndef SAVE_H
#define SAVE_H
-void DoSaveGame();
+void DoSaveGame(char *);
void FWInt(int val);
void FWChar(unsigned char i);
@@ -39,6 +39,6 @@ void SaveGame(char *);
void LoadGame(char *);
void CloseFile();
-int IsSaveFile();
+int IsSaveFile(char *);
#endif

View File

@@ -28,6 +28,9 @@ stdenv.mkDerivation (finalAttrs: {
url = "https://gitlab.com/meritous/meritous/-/commit/68029f02ccaea86fb96d6dd01edb269ac3e6eff0.patch";
hash = "sha256-YRV0cEcn6nEJUdHF/cheezNbsgZmjy0rSUw0tuhUYf0=";
})
# https://gitlab.com/meritous/meritous/-/merge_requests/6
./gcc15-fix.patch
];
prePatch = ''

View File

@@ -39,7 +39,7 @@ buildGoModule (finalAttrs: {
updateScript = nix-update-script {
extraArgs = [
"--version-regex"
"mimir-(3\.[0-9.]+)"
"mimir-(3\\.[0-9.]+)"
];
};
tests = {

View File

@@ -9,12 +9,12 @@
}:
let
pname = "models-dev";
version = "0-unstable-2026-03-26";
version = "0-unstable-2026-04-04";
src = fetchFromGitHub {
owner = "anomalyco";
repo = "models.dev";
rev = "62015086c67bd76ebeb29cecb468834c9e17b938";
hash = "sha256-fIqUY3usE8pf10Q0SmLUZ9VB6TXeyiXcX4j97NRS4u4=";
rev = "1eb0b8c8e17ffddd89f53b2a3e426777dc560542";
hash = "sha256-KICnZDxBt6eo4sVJCpp2gBJgzht7+qB6i9pykXze7AY=";
};
node_modules = stdenvNoCC.mkDerivation {

View File

@@ -31,13 +31,13 @@ in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "modrinth-app-unwrapped";
version = "0.12.4";
version = "0.12.6";
src = fetchFromGitHub {
owner = "modrinth";
repo = "code";
tag = "v${finalAttrs.version}";
hash = "sha256-Cx6GBkncRF8dK8Xa5UELVZYMQ8BuReLxeLvZZpBwkuE=";
hash = "sha256-qVFDCn+8dtiIULNIq37wIrqaUNvNIoXoHl8QhUTyz48=";
};
patches = [
@@ -67,7 +67,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
--replace-fail '1.0.0-local' '${finalAttrs.version}'
'';
cargoHash = "sha256-kQD/g90gtWFp7Nb8W4H5wfYA71yTnA/4affXdmhQgyY=";
cargoHash = "sha256-PDsq5XEU+ZfyGzwtwxQ3i2TURjhies/Up3SVysOprZ0=";
mitmCache = gradle.fetchDeps {
inherit (finalAttrs) pname;
data = ./deps.json;
@@ -77,7 +77,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
inherit (finalAttrs) pname version src;
pnpm = pnpm_9;
fetcherVersion = 3;
hash = "sha256-pY0Ppp+swKkLP2qg3GYrWRPKkWeyHQZ9i7AfephZf1U=";
hash = "sha256-JD+mzSHMVLGnkc5Jrxy+mtZ8W82E0pQhglsC3NmfszQ=";
};
nativeBuildInputs = [

View File

@@ -1,30 +1,31 @@
{
fetchPypi,
lib,
nb-cli,
fetchFromGitHub,
python3,
nb-cli,
testers,
}:
python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "nb-cli";
version = "1.6.0";
version = "1.7.3";
pyproject = true;
src = fetchPypi {
pname = "nb_cli";
inherit (finalAttrs) version;
hash = "sha256-IbYyPZuhTkr4RInIR1lpMzl2+VYzu4IFQt2pOko92ZQ=";
src = fetchFromGitHub {
owner = "nonebot";
repo = "nb-cli";
tag = "v${finalAttrs.version}";
hash = "sha256-/OZHDMfwaajePiQ7Nb6BsQcpUPybP5SDWHWG/tVUxCo=";
};
pythonRelaxDeps = [
"watchfiles"
"noneprompt"
];
pythonRemoveDeps = [ "pip" ];
build-system = [
python3.pkgs.babel
python3.pkgs.pdm-backend
# too strict
pythonRelaxDeps = true;
build-system = with python3.pkgs; [
babel
pdm-backend
];
dependencies = with python3.pkgs; [

View File

@@ -1,6 +1,6 @@
{
lib,
buildGo126Module,
buildGoModule,
fetchFromGitHub,
go-swag,
versionCheckHook,
@@ -46,15 +46,15 @@ let
in
(formats.yaml { }).generate "frontend-templates.yaml" (officialThemes ++ communityThemes);
in
buildGo126Module (finalAttrs: {
buildGoModule (finalAttrs: {
pname = "nezha";
version = "2.0.5";
version = "2.0.6";
src = fetchFromGitHub {
owner = "nezhahq";
repo = "nezha";
tag = "v${finalAttrs.version}";
hash = "sha256-g5mXt0NfRFezLmQ27FAE+wU+a+sSHlCzx2oh/z1Xz+I=";
hash = "sha256-ZqDqua76y9b2bqcb8kVzZHqQzBAuhoxWT4yEj95wvyk=";
};
proxyVendor = true;
@@ -94,7 +94,7 @@ buildGo126Module (finalAttrs: {
GOROOT=''${GOROOT-$(go env GOROOT)} swag init --pd -d cmd/dashboard -g main.go -o cmd/dashboard/docs
'';
vendorHash = "sha256-k1Xcmsx1QnkDCmSijtdG+rB34L6d1AbNLuU14zWTDhY=";
vendorHash = "sha256-gRvWCX+6fSTEbL6Rp7FRoqNXz1HRVIlYl4ADi/fIq80=";
ldflags = [
"-s"

View File

@@ -68,13 +68,13 @@ let
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "noctalia-shell";
version = "4.7.1";
version = "4.7.5";
src = fetchFromGitHub {
owner = "noctalia-dev";
repo = "noctalia-shell";
tag = "v${finalAttrs.version}";
hash = "sha256-h5jMVGjgrfVPufMG3AMj/HGfU/EqU/4WEK7HCKhMN2E=";
hash = "sha256-0xoCuJSRSWcn4mCX382lCxqLbnuOrrqS4dOcdpoUmZg=";
};
nativeBuildInputs = [

View File

@@ -7,16 +7,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "obs-do";
version = "0.1.12";
version = "0.1.13";
src = fetchFromGitHub {
owner = "jonhoo";
repo = "obs-do";
tag = "v${finalAttrs.version}";
hash = "sha256-BYZI8XirNon7P2ckyXaLkFiU4OuwK2y9eLccj0D/2W4=";
hash = "sha256-GDCz6PfRf1dhVzBTHoVyctkWduQiGcMpGHRg/EbiImU=";
};
cargoHash = "sha256-V5j+zi7ogwxs2kCMRjDD7pF8yBWE6p7J2UAOXeJGbFw=";
cargoHash = "sha256-28t4sKSjVn+Ao7cbdmSjQbj2E/CZ4eTeoH4Tj9YRlo8=";
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;

View File

@@ -67,6 +67,11 @@ python3Packages.buildPythonApplication (finalAttrs: {
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
'';
postInstall = ''
mkdir -p "$out/share/applications"
mv openfreebuds_qt/assets/pw.mmk.OpenFreebuds.desktop "$out/share/applications"
'';
passthru.updateScript = nix-update-script { };
meta = {

View File

@@ -1,8 +1,8 @@
diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c
index e049f07c..a1bd03a0 100644
index 2365b1ee..b1b6bcec 100644
--- a/usr.sbin/smtpd/smtpd.c
+++ b/usr.sbin/smtpd/smtpd.c
@@ -1157,6 +1157,7 @@ fork_proc_backend(const char *key, const char *conf, const char *procname)
@@ -1224,6 +1224,7 @@ fork_proc_backend(const char *key, const char *conf, const char *procname,
char path[PATH_MAX];
char name[PATH_MAX];
char *arg;
@@ -10,7 +10,7 @@ index e049f07c..a1bd03a0 100644
if (strlcpy(name, conf, sizeof(name)) >= sizeof(name)) {
log_warnx("warn: %s-proc: conf too long", key);
@@ -1167,7 +1168,12 @@ fork_proc_backend(const char *key, const char *conf, const char *procname)
@@ -1234,7 +1235,12 @@ fork_proc_backend(const char *key, const char *conf, const char *procname,
if (arg)
*arg++ = '\0';
@@ -24,20 +24,41 @@ index e049f07c..a1bd03a0 100644
(ssize_t)sizeof(path)) {
log_warn("warn: %s-proc: exec path too long", key);
return (-1);
@@ -1387,6 +1393,7 @@ fork_filter_process(const char *name, const char *command, const char *user, con
int sp[2], errfd[2];
struct passwd *pw;
struct group *gr;
+ char *proc_path;
char exec[_POSIX_ARG_MAX];
int execr;
@@ -1455,8 +1462,12 @@ fork_filter_process(const char *name, const char *command, const char *user, con
if (command[0] == '/')
execr = snprintf(exec, sizeof(exec), "exec %s", command);
else
+ proc_path = getenv("OPENSMTPD_PROC_PATH");
+ if (proc_path == NULL) {
+ proc_path = PATH_LIBEXEC;
+ }
execr = snprintf(exec, sizeof(exec), "exec %s/%s",
- PATH_LIBEXEC, command);
+ proc_path, command);
if (execr >= (int) sizeof(exec))
fatalx("%s: exec path too long", name);
diff --git a/usr.sbin/smtpd/table.c b/usr.sbin/smtpd/table.c
index 9cfdfb99..24dfcca4 100644
index e62b47af..2ee186bf 100644
--- a/usr.sbin/smtpd/table.c
+++ b/usr.sbin/smtpd/table.c
@@ -201,6 +201,7 @@ table_create(const char *backend, const char *name, const char *tag,
@@ -229,17 +229,23 @@ table_create(struct smtpd *conf, const char *backend, const char *name,
struct table *t;
struct table_backend *tb;
char buf[LINE_MAX];
char path[LINE_MAX];
+ const char *proc_path;
size_t n;
struct stat sb;
@@ -215,11 +216,16 @@ table_create(const char *backend, const char *name, const char *tag,
if (name && table_find(name, NULL))
if (name && table_find(conf, name))
fatalx("table_create: table \"%s\" already defined", name);
+ proc_path = getenv("OPENSMTPD_PROC_PATH");

View File

@@ -75,6 +75,8 @@ stdenv.mkDerivation rec {
ln -s $out/opt/resources/assets/icons/256x256.png $out/share/pixmaps/osmium.png
ln -s $out/opt/resources/assets/icons/256x256.png $out/share/icons/hicolor/256x256/apps/osmium.png
ln -s "$desktopItem/share/applications" $out/share
runHook postInstall
'';

View File

@@ -22,13 +22,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ovito";
version = "3.15.0";
version = "3.15.2";
src = fetchFromGitLab {
owner = "stuko";
repo = "ovito";
tag = "v${finalAttrs.version}";
hash = "sha256-017GjyHPHqrZt03lRFJn9yxFhD6HHyhX5vxsRX06PdA=";
hash = "sha256-A7TE84B63JG2X4iBUxQiahLSYTlu7y+x92NTii26pmg=";
fetchSubmodules = true;
};

View File

@@ -0,0 +1,101 @@
{
makeBinaryWrapper,
nodejs,
node-gyp,
fetchPnpmDeps,
fetchFromGitHub,
pnpm_10,
pnpmConfigHook,
stdenv,
lib,
vips,
pkg-config,
python3,
}:
let
pnpm = pnpm_10;
in
stdenv.mkDerivation (finalAttrs: {
pname = "papra";
version = "26.2.2";
src = fetchFromGitHub {
owner = "papra-hq";
repo = "papra";
tag = "@papra/app@${finalAttrs.version}";
hash = "sha256-0MIar+fBwXRE8LlVLZDx/C0GOYVpobDTqFwkMs2k06Y=";
};
nativeBuildInputs = [
makeBinaryWrapper
nodejs
node-gyp
python3
pkg-config
pnpmConfigHook
pnpm
];
buildInputs = [
vips
];
env.SHARP_FORCE_GLOBAL_LIBVIPS = 1;
env.npm_config_nodedir = nodejs;
postPatch = ''
substituteInPlace apps/papra-server/src/modules/app/static-assets/static-assets.routes.ts \
--replace-fail "./public" "$out/lib/public" \
--replace-fail "public/index.html" "$out/lib/public/index.html"
'';
buildPhase = ''
runHook preBuild
pnpm config set inject-workspace-packages true
pushd node_modules/sharp
pnpm run install
popd
pnpm --filter "@papra/app-client..." run build
pnpm --filter "@papra/app-server..." run build
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/{bin,lib}
pnpm deploy --filter=@papra/app-server --prod $out/lib/
mkdir -p $out/lib/public
cp -r apps/papra-client/dist/* $out/lib/public/
makeWrapper "${lib.getExe nodejs}" $out/bin/papra \
--add-flags "$out/lib/dist/index.js" \
--set "NODE_PATH" $out/lib/node_modules
runHook postInstall
'';
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
pnpm = pnpm;
fetcherVersion = 3;
hash = "sha256-NQakyRlL6deG13yt+FlmVcVvEkNWHW0Lhf/3NecfwaE=";
pnpmWorkspaces = [
"@papra/app-client..."
"@papra/app-server..."
];
};
meta = {
description = "Open-source document management platform designed to help you organize, secure, and archive your files effortlessly.";
homepage = "https://papra.app/";
changelog = "https://github.com/papra-hq/papra/releases";
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ wariuccio ];
};
})

View File

@@ -37,6 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
postInstall = ''
installManPage pimsync.1 pimsync.conf.5 pimsync-migration.7
installShellCompletion --zsh contrib/_pimsync
'';
nativeInstallCheckInputs = [

View File

@@ -40,14 +40,14 @@ stdenv.mkDerivation (finalAttrs: {
+ lib.optionalString enableQt "-qt"
+ lib.optionalString (!enableQt) "-sdl"
+ lib.optionalString forceWayland "-wayland";
version = "1.19.3";
version = "1.20.3";
src = fetchFromGitHub {
owner = "hrydgard";
repo = "ppsspp";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-71oIjUXYGFNyhcXQP65Bd2gYF6golrPR4USwS7bTxFQ=";
hash = "sha256-BE+4juBSl4mwN7hQNevC1F4UMoVEWB1zhRUgB2ejf/M=";
};
patches = lib.optionals useSystemFfmpeg [

View File

@@ -26,6 +26,9 @@ stdenv.mkDerivation (finalAttrs: {
dontConfigure = true;
postPatch = ''
substituteInPlace compiler/wla-dx/CMakeLists.txt \
--replace-fail "cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
substituteInPlace tools/816-opt/Makefile \
--replace-fail 'LDFLAGS := -lpthread' 'LDFLAGS :=' \
--replace-fail 'LDFLAGS := -pthread' 'LDFLAGS += -pthread' \

View File

@@ -23,13 +23,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "pvz-portable-unwrapped";
version = "0.1.19";
version = "0.1.20";
src = fetchFromGitHub {
owner = "wszqkzqk";
repo = "PvZ-Portable";
tag = finalAttrs.version;
hash = "sha256-G+otMVg/RYpRSEGSvMYocMyN27ixJW9w+bNXCU9Otl0=";
hash = "sha256-8E23G3x97E/J0MNomi5vvrua9+S2zzoTOtyVp4YsqO8=";
};
nativeBuildInputs = [

View File

@@ -14,13 +14,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "pvzge";
version = "0.7.1";
version = "0.8.1";
src = fetchFromGitHub {
owner = "Gzh0821";
repo = "pvzge_web";
tag = "v${finalAttrs.version}";
hash = "sha256-IZaJBbliudkVLOEgOwxXkUn9aET+NJrgdPi8FAA7HCE=";
hash = "sha256-juo+kM7IK+e3qPHH+V+/1D0NqQiZfXYEtvX940dLarQ=";
};
iconSrc = fetchurl {

View File

@@ -11,7 +11,7 @@
copyDesktopItems,
}:
let
version = "2.66.1";
version = "2.66.2";
in
python3Packages.buildPythonApplication rec {
inherit version;
@@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
owner = "pyfa-org";
repo = "Pyfa";
tag = "v${version}";
hash = "sha256-lSX+ZCPUjXE5t8OmKcA9yD+g6Xiizj1Qi6+SstZbq2g=";
hash = "sha256-LXmmbgnm1CZzwNtNj0TEaKh3xN6np5SseE1hoP25Emc=";
};
desktopItems = [

View File

@@ -8,22 +8,20 @@
}:
python3Packages.buildPythonApplication rec {
pname = "qbit-manage";
version = "4.6.5";
version = "4.7.0";
src = fetchFromGitHub {
owner = "StuffAnThings";
repo = "qbit_manage";
tag = "v${version}";
hash = "sha256-JCsbf2mPRhs7Mbekl946G/y/CSNSSvQBLvlwVy/Avcg=";
hash = "sha256-cPN4GhB7TuhiGau8Nb9hVNubF6fppyS2tuFGJ+spPaI=";
};
pyproject = true;
build-system = [ python3Packages.setuptools ];
postPatch = ''
substituteInPlace pyproject.toml \
--replace "==" ">=" \
--replace "bencodepy" "bencode.py"
substituteInPlace pyproject.toml --replace "==" ">="
'';
dependencies = with python3Packages; [
@@ -43,10 +41,9 @@ python3Packages.buildPythonApplication rec {
];
pythonRelaxDeps = [
"croniter"
"fastapi"
"gitpython"
"humanize"
"ruamel.yaml"
"requests"
"uvicorn"
];

View File

@@ -2,6 +2,7 @@
lib,
rustPlatform,
fetchFromGitHub,
cacert,
protobuf,
pkg-config,
openssl,
@@ -13,16 +14,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "qdrant";
version = "1.16.3";
version = "1.17.1";
src = fetchFromGitHub {
owner = "qdrant";
repo = "qdrant";
tag = "v${finalAttrs.version}";
hash = "sha256-p2xQStTwbC6MoEsaM1JXlBHK2CqwIfD7x+WwciuY49s=";
hash = "sha256-EGk1BM8/SjH4LO25fG5GGtRXTnhA9prmGR5MxyzJNd4=";
};
cargoHash = "sha256-DEOMoG13eDDEadScwQOD6jxuJBxaU2+fUNK/QLXLG8M=";
cargoHash = "sha256-8+tMZQUsyouNbxlvykfQ66/THd9PMPnVUbWaXwMtVCM=";
nativeBuildInputs = [
protobuf
@@ -39,6 +40,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
# Needed to get openssl-sys to use pkg-config.
env.OPENSSL_NO_VENDOR = 1;
nativeCheckInputs = [ cacert ];
checkFlags = [
# This test assumes the process starts without any existing children,
# which is not reliable in the Nix build sandbox.
"--skip=common::metrics::procfs_metrics::test_child_processes"
];
# Fix cargo-auditable issue with bench_rocksdb = ["dep:rocksdb"]
auditable = false;
@@ -59,6 +68,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
'';
homepage = "https://github.com/qdrant/qdrant";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ dit7ya ];
maintainers = with lib.maintainers; [
dit7ya
miniharinn
];
};
})

View File

@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "qobuz-player";
version = "0.8.0";
version = "0.9.0";
src = fetchFromGitHub {
owner = "SofusA";
repo = "qobuz-player";
tag = "v${finalAttrs.version}";
hash = "sha256-qAGaosIsS7IodzIJL/7kd5MNC/CW2fY7iYD6CrYSdmw=";
hash = "sha256-uslU/HQognLMNz/w9hMdtpzby2neE+VC8Y+RV2XMd7Q=";
};
cargoHash = "sha256-428sWFx+DYyf8RrsY6hzytGmtmO7lmIJIoS2TfnGoh4=";
cargoHash = "sha256-vcII4SDE5zOgzS83CCLhffc7OEksmcMtXYb76r6M1JM=";
nativeBuildInputs = [
pkg-config

View File

@@ -14,17 +14,17 @@
buildNpmPackage (finalAttrs: {
pname = "qwen-code";
version = "0.13.1";
version = "0.14.0";
src = fetchFromGitHub {
owner = "QwenLM";
repo = "qwen-code";
tag = "v${finalAttrs.version}";
hash = "sha256-8qSjr/VsJX6p6/sBRr9jlu2jjPhr1ZpdPe9WZofL/ug=";
hash = "sha256-XeJeBNfIFo2XowIRGgxixAtfz1saeKxt93/EK7EF5tA=";
};
npmDepsFetcherVersion = 3;
npmDepsHash = "sha256-nmydorBc1r7OA/oXvetKw7ivyeqSppScINFXEpPYES0=";
npmDepsHash = "sha256-UeEldKIcCS7km1nuyfLlSawDVBQDn+k97wxe9ZgaHtM=";
# npm 11 incompatible with fetchNpmDeps
# https://github.com/NixOS/nixpkgs/issues/474535
@@ -76,7 +76,11 @@ buildNpmPackage (finalAttrs: {
buildPhase = ''
runHook preBuild
# Build web-templates package first (required by main bundle)
# Build several internal packages first (required by main bundle)
npm run build --workspace=@qwen-code/channel-base
npm run build --workspace=@qwen-code/channel-telegram
npm run build --workspace=@qwen-code/channel-weixin
npm run build --workspace=@qwen-code/channel-dingtalk
npm run build --workspace=@qwen-code/web-templates
npm run generate

View File

@@ -40,17 +40,17 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "reaper";
version = "7.66";
version = "7.67";
src = fetchurl {
url = url_for_platform finalAttrs.version stdenv.hostPlatform.qemuArch;
hash =
if stdenv.hostPlatform.isDarwin then
"sha256-I+nZtcOhzlrX0xLJBxB6DE1ZtYNgMRHuutOW6MVZuMc="
"sha256-obsp3zSJ71nfmY8TEnFrs1v545klBSUZcruIb39/BnM="
else
{
x86_64-linux = "sha256-GMNtVql069snZzvaUrw0SEygbbnafS20HSzLdQDC6yU=";
aarch64-linux = "sha256-imoVxmC9oPzcl8dDtrs93/ADEB9NQFCThHZlxb8FIac=";
x86_64-linux = "sha256-VZSt3epsSvqBSiYjK0JIX0kWLTagxbcEBBk2t0b6WXI=";
aarch64-linux = "sha256-XYMeykqf9QCzD6jHU/9Lrx266A3pBq3YePKDP2Sjfhc=";
}
.${stdenv.hostPlatform.system};
};

View File

@@ -1,24 +1,20 @@
diff --git a/assets/data/stream_data.json b/assets/data/stream_data.json
index c049ec7..fe51488 100644
index 6069c5d..fe51488 100644
--- a/assets/data/stream_data.json
+++ b/assets/data/stream_data.json
@@ -1,18 +1 @@
@@ -1,14 +1 @@
-[
- {
- "name": "Radio Frittura",
- "url_string": "https://radio.frittura.org/frittura.ogg"
- "url_string": "https://radio.frittura.org/rebels"
- },
- {
- "name": "Matt Johnson radio",
- "url_string": "https://us2.internet-radio.com/proxy/mattjohnsonradio?mp=/stream"
- },
- {
- "name" : "Lofi 24/7",
- "name": "Lofi 24/7",
- "url_string": "http://usa9.fastcast4u.com/proxy/jamz?mp=/1"
- },
- {
- "name" : "Radio Sarajevo",
- "url_string": "https://cast2.asurahosting.com/proxy/balkanhi/stream"
- }
-]
\ No newline at end of file

View File

@@ -14,16 +14,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "rebels-in-the-sky";
version = "1.5.1";
version = "1.6.0";
src = fetchFromGitHub {
owner = "ricott1";
repo = "rebels-in-the-sky";
tag = "v${finalAttrs.version}";
hash = "sha256-VyQfwZWvutc5BnAi6BbIfgRm5G4xBre76cyraQSvn6o=";
hash = "sha256-P0GPdMTOomqNQ6WLfZnASO1FiD7DJTHj/a8eoYzAvAY=";
};
cargoHash = "sha256-PL5WhqCLlH482uDoWETfwHarz3e2NJ0vezDMs52QavQ=";
cargoHash = "sha256-Ldy/1Gv1qguWQ2lLk0jiiq7nM9r85LY7pXkXf2nCUA0=";
patches = lib.optionals (!withRadio) [
./disable-radio.patch

View File

@@ -1,60 +0,0 @@
diff --git a/scripts/fetchPufferfish.sh b/scripts/fetchPufferfish.sh
index 95e30053..8866767c 100755
--- a/scripts/fetchPufferfish.sh
+++ b/scripts/fetchPufferfish.sh
@@ -11,10 +11,6 @@ CURR_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
EXTERNAL_DIR=${CURR_DIR}/../external
INSTALL_DIR=${CURR_DIR}/../external/install
-if [ -d ${EXTERNAL_DIR}/pufferfish ] ; then
- rm -fr ${EXTERNAL_DIR}/pufferfish
-fi
-
if [ -d ${INSTALL_DIR}/include/pufferfish ] ; then
rm -fr ${INSTALL_DIR}/include/pufferfish
fi
@@ -23,42 +19,10 @@ if [ -d ${INSTALL_DIR}/src/pufferfish ] ; then
rm -fr ${INSTALL_DIR}/src/pufferfish
fi
-SVER=salmon-v1.10.3
-#SVER=develop
-#SVER=sketch-mode
-
-EXPECTED_SHA256=52b6699de0d33814b73edb3455175568c2330d8014be017dce7b564e54134860
-
-mkdir -p ${EXTERNAL_DIR}
-curl -k -L https://github.com/COMBINE-lab/pufferfish/archive/${SVER}.zip -o ${EXTERNAL_DIR}/pufferfish.zip
-
-hashcheck=""
-if exists sha256sum; then
- hashcheck="sha256sum"
-elif exists shasum; then
- hashcheck="shasum -a256"
-else
- unset hashcheck
-fi
-
-
-if [ -z "${hashcheck-}" ]; then
- echo "Couldn't find shasum command; can't verify contents of downloaded pufferfish";
-else
-
- if [[ $SVER != develop && $SVER != onetbb ]]; then
- echo "${EXPECTED_SHA256} ${EXTERNAL_DIR}/pufferfish.zip" | ${hashcheck} -c - || { echo "pufferfish.zip did not match expected SHA1! Exiting."; exit 1; }
- else
- echo "not testing sha since pulling from develop"
- fi
-fi
-
-
-rm -fr ${EXTERNAL_DIR}/pufferfish
-unzip ${EXTERNAL_DIR}/pufferfish.zip -d ${EXTERNAL_DIR}
-mv ${EXTERNAL_DIR}/pufferfish-${SVER} ${EXTERNAL_DIR}/pufferfish
mkdir -p ${INSTALL_DIR}/include/pufferfish
+# This is needed later when pufferfish is compiled for Salmon
+cp -r ${pufferFishSrc} ${EXTERNAL_DIR}/pufferfish
cp ${EXTERNAL_DIR}/pufferfish/include/ProgOpts.hpp ${INSTALL_DIR}/include/pufferfish
cp ${EXTERNAL_DIR}/pufferfish/include/BooPHF.hpp ${INSTALL_DIR}/include/pufferfish

View File

@@ -0,0 +1,21 @@
diff --git a/cmake/SalmonDependencies.cmake b/cmake/SalmonDependencies.cmake
index b6bebe0..a67571a 100644
--- a/cmake/SalmonDependencies.cmake
+++ b/cmake/SalmonDependencies.cmake
@@ -86,6 +86,8 @@ if(ZLIBNG_FOUND)
set(SALMON_ZLIB_LIBRARIES ZLIBNG::ZLIBNG)
set(ZLIB_INCLUDE_DIR ${ZLIBNG_INCLUDE_DIR})
set(ZLIB_LIBRARY ZLIBNG::ZLIBNG)
+ add_library(zlibstatic ALIAS ${ZLIB_LIBRARY})
+ message(STATUS "Created zlibstatic alias for pufferfish embedded mode")
elseif(SALMON_FETCH_MISSING_DEPS)
message(STATUS "zlib-ng not found; fetching pinned zlib-ng release in compatibility mode")
set(ZLIB_COMPAT ON CACHE BOOL "" FORCE)
@@ -421,6 +423,7 @@ else()
set(SALMON_CURL_LIBRARIES "" CACHE INTERNAL "" FORCE)
endif()
if(SALMON_USE_SYSTEM_DEPS)
+ find_package(OpenSSL REQUIRED)
find_package(HTSlib QUIET)
endif()
if(HTSlib_FOUND)

View File

@@ -3,45 +3,62 @@
stdenv,
boost,
bzip2,
catch2_3,
cereal,
cmake,
curl,
fetchFromGitHub,
htslib,
icu,
jemalloc,
libdeflate,
libgff,
libiconv,
libstaden-read,
pkg-config,
mimalloc,
onetbb,
openssl,
pkg-config,
python3,
xz,
zlib,
zlib-ng,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "salmon";
version = "1.10.3";
version = "1.11.4";
# SALMON_PUFFERFISH_GIT_TAG defined in cmake/SalmonDependencies.cmake
pufferFishSrc = fetchFromGitHub {
owner = "COMBINE-lab";
repo = "pufferfish";
rev = "salmon-v${finalAttrs.version}";
hash = "sha256-g4pfNuc620WQ7UDv8PQHVbbTVt78aGVqcHHMszmBIkA=";
fetchSubmodules = true;
rev = "ace68c1c022816ba8c50a1a07c5d08f2abd597d6";
hash = "sha256-Zwl45sUYSmHOqsYLZPscigjgd1V3Waza0jRvhvNh7jU=";
};
# SALMON_FQFEEDER_GIT_TAG defined in cmake/SalmonDependencies.cmake
FQFeederSrc = fetchFromGitHub {
owner = "rob-p";
repo = "FQFeeder";
rev = "f5b08d1002351c192b69048ac9f6cf4c7c116265";
hash = "sha256-csRKUdNlEKKHNIvKRRTt79+27LBmnsJpswzBnWtA/XU=";
};
src = fetchFromGitHub {
owner = "COMBINE-lab";
repo = "salmon";
rev = "v${finalAttrs.version}";
hash = "sha256-HGcDqu0XzgrU3erHavigXCoj3VKk82ixMLY10Kk9MW4=";
hash = "sha256-BjWXNQtycSwCTe40kujN/YzCNhGjkz2ULGOYtI01yos=";
};
patches = [
# Use pufferfish source fetched by nix
./fetch-pufferfish.patch
];
patches = [ ./fix_pufferfish.patch ];
postPatch = "patchShebangs .";
postPatch = ''
patchShebangs .
substituteInPlace CMakeLists.txt --replace-fail "CMP0167 OLD" "CMP0167 NEW"
'';
buildInputs = [
(boost.override {
@@ -49,21 +66,38 @@ stdenv.mkDerivation (finalAttrs: {
enabledStatic = true;
})
bzip2
catch2_3
cereal
curl
htslib
icu
jemalloc
libdeflate
libgff
libstaden-read
mimalloc
onetbb
openssl
xz
zlib
zlib-ng
]
++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
nativeBuildInputs = [
cmake
pkg-config
python3
];
cmakeFlags = [
"-DSALMON_PUFFERFISH_SOURCE_DIR=${finalAttrs.pufferFishSrc}"
"-DSALMON_FQFEEDER_SOURCE_DIR=${finalAttrs.FQFeederSrc}"
];
# These are needed to please htslib
env.NIX_LDFLAGS = toString [
"-lcrypto"
"-ldeflate"
];
strictDeps = true;

View File

@@ -1,6 +1,5 @@
{
lib,
stdenv,
buildGoModule,
fetchFromGitea,
fetchFromGitHub,
@@ -19,17 +18,17 @@ in
buildGoModule (finalAttrs: {
pname = "searchix";
version = "0.4.5";
version = "0.4.6";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "alinnow";
repo = "searchix";
tag = "v${finalAttrs.version}";
hash = "sha256-2pffyKBX+ICYEN+42gwN2byjw+T9H4esi2+oTqs52GE=";
hash = "sha256-anmPuZ2En0KNhbnf4MiwiR/YP8QabOrjHHcQoZJ5Dho=";
};
vendorHash = "sha256-yfcQgy4cQFRvtsyLHLojnJaWhle1ZR3unmaFQj8ljuw=";
vendorHash = "sha256-BG6v4HsXtSCmEmzdawH1YfEfDMbXNH8XGMF+jJgy+3w=";
overrideModAttrs = old: {
# netdb.go allows /etc/protocols and /etc/services to not exist and happily proceeds, but it panic()s if they exist but return permission denied.

View File

@@ -1,11 +1,11 @@
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index e69150cd..c4ce7975 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -392,17 +392,6 @@
set(deploy_tool_options_arg "-force-openssl --release --no-translations")
diff --git i/app/CMakeLists.txt w/app/CMakeLists.txt
index 1ab415ea..23792435 100644
--- i/app/CMakeLists.txt
+++ w/app/CMakeLists.txt
@@ -872,17 +872,6 @@ elseif(WIN32)
set(deploy_tool_options_arg "-force-openssl --release --no-translations --no-compiler-runtime")
endif()
-qt_generate_deploy_qml_app_script(
- TARGET ${PROJECT_EXECUTABLE}
- OUTPUT_SCRIPT deploy_script
@@ -17,9 +17,6 @@ index e69150cd..c4ce7975 100644
-
-install(SCRIPT ${deploy_script})
-
#-------------------------------------------------------------------------------
# Packaging
#-------------------------------------------------------------------------------
--
2.47.2
#---------------------------------------------------------------------------------------------------
# CPack installer/package generation
#---------------------------------------------------------------------------------------------------

View File

@@ -4,29 +4,34 @@
fetchFromGitHub,
cmake,
qt6,
expat,
zlib,
pkg-config,
wrapGAppsHook3,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "serial-studio";
version = "3.1.10-unstable-2025-12-12";
version = "3.2.4";
src = fetchFromGitHub {
owner = "Serial-Studio";
repo = "Serial-Studio";
rev = "b2e8b5430da59969dd697636677873f3f6c10c7c";
hash = "sha256-O/KAYKpVGn2Q0CPaReh564P5l+ilHuQYRJ4w5aFKZmg=";
fetchSubmodules = true;
tag = "v${finalAttrs.version}";
hash = "sha256-KY7ePFeO29jKnaFbP5IJo1Z/OqldTvmZUGuzZ+yqyK8=";
};
nativeBuildInputs = [
cmake
qt6.wrapQtAppsHook
pkg-config
wrapGAppsHook3 # required for FileChooser
];
buildInputs = [
expat
zlib
qt6.qtbase
qt6.qtdeclarative
qt6.qtsvg
@@ -39,12 +44,23 @@ stdenv.mkDerivation (finalAttrs: {
qt6.qt5compat
];
cmakeFlags = [
(lib.cmakeBool "USE_SYSTEM_ZLIB" true)
(lib.cmakeBool "USE_SYSTEM_EXPAT" true)
];
patches = [ ./0001-CMake-Deploy-Fix.patch ];
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir -p $out/{Applications,bin}
mv $out/Serial-Studio-GPL3.app $out/Applications
ln --symbolic $out/Applications/Serial-Studio-GPL3.app/Contents/MacOS/Serial-Studio-GPL3 $out/bin/serial-studio
ln -s $out/Applications/Serial-Studio-GPL3.app/Contents/MacOS/Serial-Studio-GPL3 $out/bin/serial-studio-gpl3
'';
dontWrapGApps = true;
preFixup = ''
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
passthru.updateScript = nix-update-script {
@@ -53,8 +69,8 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Multi-purpose serial data visualization & processing program";
mainProgram = "serial-studio";
homepage = "https://serial-studio.github.io/";
mainProgram = "serial-studio-gpl3";
homepage = "https://serial-studio.com/";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ sikmir ];
platforms = lib.platforms.unix;

View File

@@ -8,14 +8,14 @@
}:
buildDartApplication rec {
pname = "serverpod_cli";
version = "3.4.4";
version = "3.4.5";
# Fetch the whole monorepo
src = fetchFromGitHub {
owner = "serverpod";
repo = "serverpod";
tag = version;
hash = "sha256-c/JsEUNGsa55slbJ33ZMr72+UelhiWKls5d2dUumJ+A=";
hash = "sha256-hxZ5s4VZWFyNdhVpBU/SZyFYuB6Xh4YBYzE9amduOTo=";
};
sourceRoot = "${src.name}/tools/serverpod_cli";

View File

@@ -44,11 +44,11 @@
"dependency": "direct main",
"description": {
"name": "async",
"sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
"sha256": "e2eb0491ba5ddb6177742d2da23904574082139b07c1e33b8503b9f46f3e1a37",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.13.0"
"version": "2.13.1"
},
"boolean_selector": {
"dependency": "transitive",
@@ -74,11 +74,11 @@
"dependency": "transitive",
"description": {
"name": "built_value",
"sha256": "6ae8a6435a8c6520c7077b107e77f1fb4ba7009633259a4d49a8afd8e7efc5e9",
"sha256": "0730c18c770d05636a8f945c32a4d7d81cb6e0f0148c8db4ad12e7748f7e49af",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "8.12.4"
"version": "8.12.5"
},
"checked_yaml": {
"dependency": "transitive",
@@ -514,51 +514,51 @@
"dependency": "transitive",
"description": {
"name": "serverpod_client",
"sha256": "e7aecd8fb0a4ad86fcb931fb411f6e408b65c0fbcdb046940530cdaef8dea2db",
"sha256": "bb927f4880cfb982c198426818d09cd3b07830f6232e25169dfc0ab443fc83a7",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.4.4"
"version": "3.4.5"
},
"serverpod_lints": {
"dependency": "direct dev",
"description": {
"name": "serverpod_lints",
"sha256": "ad270a1d5315f1edd4f7474a00dc937b4e3a8043d59c15c19cf5bdd0272183ca",
"sha256": "04ce1b4023c12499351b7945884ee5dce69ebe8edd7f5787673a53ef941b976f",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.4.4"
"version": "3.4.5"
},
"serverpod_serialization": {
"dependency": "direct main",
"description": {
"name": "serverpod_serialization",
"sha256": "6b087d9e6075dec0973c31220b0ba09f67d31d79cb691f689a704e4b7f8343a3",
"sha256": "be8f84c9409bafe35d1ab65abeaa5c2f7d92116155059e489366c7fdedcca55f",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.4.4"
"version": "3.4.5"
},
"serverpod_service_client": {
"dependency": "direct main",
"description": {
"name": "serverpod_service_client",
"sha256": "2d81f988f25ce136f3695f53564836853dca822fd01bf12065b9bab5b566306c",
"sha256": "beb5f12f095b880bd12676648fd6733c9c3afbaa922aa4f1364d4e97b4b4b664",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.4.4"
"version": "3.4.5"
},
"serverpod_shared": {
"dependency": "direct main",
"description": {
"name": "serverpod_shared",
"sha256": "8ebb1107e7a8f5bae35228a93f6a7701067d4dab4f340b4e34b010786668c46f",
"sha256": "de25d8bfe73f43544f120ae7584fefe37d47f713bf98d2af4a784d89cccadc2d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.4.4"
"version": "3.4.5"
},
"shelf": {
"dependency": "transitive",
@@ -684,31 +684,31 @@
"dependency": "direct dev",
"description": {
"name": "test",
"sha256": "280d6d890011ca966ad08df7e8a4ddfab0fb3aa49f96ed6de56e3521347a9ae7",
"sha256": "8d9ceddbab833f180fbefed08afa76d7c03513dfdba87ffcec2718b02bbcbf20",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.30.0"
"version": "1.31.0"
},
"test_api": {
"dependency": "transitive",
"description": {
"name": "test_api",
"sha256": "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a",
"sha256": "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.7.10"
"version": "0.7.11"
},
"test_core": {
"dependency": "transitive",
"description": {
"name": "test_core",
"sha256": "0381bd1585d1a924763c308100f2138205252fb90c9d4eeaf28489ee65ccde51",
"sha256": "1991d4cfe85d5043241acac92962c3977c8d2f2add1ee73130c7b286417d1d34",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.6.16"
"version": "0.6.17"
},
"test_descriptor": {
"dependency": "direct dev",

View File

@@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "sigma-cli";
version = "2.0.1";
version = "2.0.2";
pyproject = true;
src = fetchFromGitHub {
owner = "SigmaHQ";
repo = "sigma-cli";
tag = "v${version}";
hash = "sha256-ZYWkQguoTmGo+kuyPSByyukdA2EMdWKjHddYsML9JwA=";
hash = "sha256-Gd41uNARH9RbyRkTDiXmP9gWTMpS9zlkb4rPF3ikRc8=";
};
pythonRelaxDeps = [ "click" ];

View File

@@ -8,17 +8,17 @@
python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "smassh";
version = "3.1.7";
version = "3.2.1";
pyproject = true;
src = fetchFromGitHub {
owner = "kraanzu";
repo = "smassh";
rev = "v${finalAttrs.version}";
hash = "sha256-i04DzsurF6sMMBHZjBOrkKKmkn6Nt6uF27QXABE3igg=";
tag = "v${finalAttrs.version}";
hash = "sha256-4w7mkZrm8m3MA18QLRRoRF022aaQP64iUGKUWsskqDk=";
};
nativeBuildInputs = with python3.pkgs; [ poetry-core ];
nativeBuildInputs = with python3.pkgs; [ hatchling ];
pythonRelaxDeps = [
"platformdirs"

Some files were not shown because too many files have changed in this diff Show More