Merge b32b62d598 into haskell-updates

This commit is contained in:
nixpkgs-ci[bot]
2026-03-17 00:28:23 +00:00
committed by GitHub
312 changed files with 2375 additions and 4115 deletions
+2
View File
@@ -5,3 +5,5 @@ updates:
schedule:
interval: "weekly"
labels: []
commit-message:
prefix: ".github"
+1 -1
View File
@@ -27,7 +27,7 @@ jobs:
steps:
# Use a GitHub App to create the PR so that CI gets triggered
# The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs
- uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
- uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
id: app-token
with:
app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
+1 -1
View File
@@ -56,7 +56,7 @@ jobs:
run: npm install @actions/artifact@5.0.3 bottleneck@2.19.5
# Use a GitHub App, because it has much higher rate limits: 12,500 instead of 5,000 req / hour.
- uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
- uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_APP_ID
id: app-token
with:
+1 -1
View File
@@ -30,7 +30,7 @@ jobs:
ci/github-script
# Use the GitHub App to make sure the reaction happens with the same user who will later merge.
- uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
- uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_APP_ID
id: app-token
with:
+1 -1
View File
@@ -36,7 +36,7 @@ jobs:
# Use a GitHub App to create the PR so that CI gets triggered
# The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs
# We only need Pull Requests: write here, but the app is also used for backports.
- uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
- uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
id: app-token
with:
app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
+2 -2
View File
@@ -263,7 +263,7 @@ jobs:
target-as-trusted-at: ${{ inputs.targetSha }}
- name: Download output paths and eval stats for all systems
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
with:
pattern: ${{ inputs.artifact-prefix }}diff-*
path: diff
@@ -353,7 +353,7 @@ jobs:
needs: [versions, eval]
steps:
- name: Download output paths and eval stats for all versions
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
with:
pattern: "*-diff-*"
path: versions
+1 -1
View File
@@ -26,7 +26,7 @@ jobs:
steps:
# Use a GitHub App to create the PR so that CI gets triggered
# The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs
- uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
- uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
id: app-token
with:
app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
+1 -1
View File
@@ -27,7 +27,7 @@ jobs:
ci/github-script
# Use the GitHub App to make sure the reaction happens with the same user who will later merge.
- uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
- uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_APP_ID
id: app-token
with:
+1 -1
View File
@@ -19,7 +19,7 @@ jobs:
steps:
# Use a GitHub App to create the PR so that CI gets triggered and to
# request team member lists.
- uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
- uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
id: app-token
with:
app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
+2
View File
@@ -95,6 +95,8 @@
- `spoof` has been removed, as there are many issues upstream with it working on modern OS versions, and it appears to be unmaintained.
- `duckstation` package has been removed, as it was requested by upstream and build source were changed to be incompatible with NixOS.
- `nodePackages.coc-go` and `nodePackages.coc-tsserver`, along with their vim plugins, have been removed from nixpkgs due to being unmaintained.
- `nodePackages.wavedrom-cli` has been removed, as it was unmaintained within nixpkgs.
+16 -12
View File
@@ -230,6 +230,7 @@
"kloenk": 12898828,
"konradmalik": 13033392,
"kubukoz": 894884,
"lilyball": 714,
"lutzmor": 9321736,
"magistau": 43097806,
"maljub01": 350635,
@@ -268,6 +269,7 @@
"willcohen": 5185341,
"willjr": 5904828,
"wldhx": 15619766,
"yamashitax": 99486674,
"yeongsheng-tan": 809030,
"youhaveme9": 58213083,
"yzx9": 41458459,
@@ -278,9 +280,11 @@
"documentation-team": {
"description": "Maintain nixpkgs/NixOS documentation and tools for building it. https://nixos.org/community/teams/documentation",
"id": 6590023,
"maintainers": {},
"maintainers": {
"hsjobeki": 50398876
},
"members": {
"hsjobeki": 50398876,
"friedow": 17351844,
"wamirez": 24505474
},
"name": "Documentation Team"
@@ -486,8 +490,7 @@
"frederictobiasc": 26125115,
"heywoodlh": 18178614,
"maevii": 41077433,
"rorosen": 76747196,
"superherointj": 5861043
"rorosen": 76747196
},
"name": "k3s"
},
@@ -616,9 +619,8 @@
},
"members": {
"aanderse": 7755101,
"jnsgruk": 668505,
"megheaiulian": 1788114,
"mkg20001": 7735145
"herbetom": 15121114,
"megheaiulian": 1788114
},
"name": "LXC"
},
@@ -684,12 +686,11 @@
"description": "Maintain the official Nix formatter and apply it to Nixpkgs: https://nixos.org/community/teams/formatting/",
"id": 9676823,
"maintainers": {
"infinisil": 20525370,
"MattSturgeon": 5046562,
"jfly": 277474
},
"members": {
"0x4A6F": 9675338,
"MattSturgeon": 5046562,
"Sereja313": 112060595,
"dyegoaurelio": 42411160
},
@@ -716,7 +717,7 @@
"id": 3620128,
"maintainers": {
"jopejoe1": 34899572,
"leona-ya": 11006031
"yayayayaka": 73759599
},
"members": {},
"name": "nixos-release-managers"
@@ -926,7 +927,9 @@
"balsoft": 18467667,
"infinisil": 20525370
},
"members": {},
"members": {
"pyrox0": 35778371
},
"name": "Security review"
},
"static": {
@@ -968,7 +971,8 @@
"description": "Maintain systemd for NixOS",
"id": 3894007,
"maintainers": {
"flokli": 183879
"flokli": 183879,
"nikstur": 61635709
},
"members": {
"ElvishJerricco": 1365692,
+21 -2
View File
@@ -9698,10 +9698,10 @@
keys = [ { fingerprint = "275F 6749 AFD2 379D 1033 548C 1237 AB12 2E6F 4761"; } ];
};
gigglesquid = {
email = "jack.connors@protonmail.com";
email = "jack.connors@gigglesquid.tech";
github = "GiggleSquid";
githubId = 3685154;
name = "Jack connors";
name = "Jack Connors";
keys = [ { fingerprint = "21DF 8034 B212 EDFF 9F19 9C19 F65B 7583 7ABF D019"; } ];
};
gila = {
@@ -10078,6 +10078,13 @@
githubId = 11212268;
name = "gruve-p";
};
gs-101 = {
email = "gabrielsantosdesouza@disroot.org";
github = "gs-101";
githubId = 172639817;
keys = [ { fingerprint = "D1D3 37F6 CB32 02DC B9BA 337B F9D8 EABC F57E ED58"; } ];
name = "Gabriel Santos";
};
gschwartz = {
email = "gsch@pennmedicine.upenn.edu";
github = "GregorySchwartz";
@@ -13739,6 +13746,12 @@
githubId = 41012641;
name = "Benjamin Kaylor";
};
kaynetik = {
email = "aleksandar@nesovic.dev";
github = "kaynetik";
githubId = 48174247;
name = "Aleksandar Nesovic";
};
kazcw = {
email = "kaz@lambdaverse.org";
github = "kazcw";
@@ -24528,6 +24541,12 @@
githubId = 75371;
name = "Stig Palmquist";
};
sgomezsal = {
email = "contact@sgomezsal.com";
github = "sgomezsal";
githubId = 79657820;
name = "Santiago Gomez";
};
sgraf = {
email = "sgraf1337@gmail.com";
github = "sgraf812";
-1
View File
@@ -880,7 +880,6 @@
./services/misc/ihaskell.nix
./services/misc/iio-niri.nix
./services/misc/input-remapper.nix
./services/misc/inventree.nix
./services/misc/invidious-router.nix
./services/misc/irkerd.nix
./services/misc/jackett.nix
@@ -275,7 +275,10 @@ in
ProtectKernelModules = true;
ProtectKernelTunables = true;
ProtectProc = "invisible";
ProtectSystem = "full";
ProtectSystem = "strict";
ReadWritePaths = [
cfg.home
];
RemoveIPC = true;
RestrictAddressFamilies = [
"AF_UNIX"
@@ -22,6 +22,7 @@ let
cfg = config.services.displayManager.dms-greeter;
cfgDms = config.programs.dms-shell;
cfgAutoLogin = config.services.displayManager.autoLogin;
sessionData = config.services.displayManager.sessionData;
cacheDir = "/var/lib/dms-greeter";
@@ -52,6 +53,38 @@ let
} ${optionalString cfg.logs.save "> ${cfg.logs.path} 2>&1"}
'';
autoLoginCommand =
pkgs.runCommand "dms-greeter-autologin-command"
{
nativeBuildInputs = [
pkgs.gnugrep
pkgs.coreutils
];
}
''
set -euo pipefail
session="${sessionData.autologinSession}"
desktops="${sessionData.desktops}"
for sessionFile in \
"$desktops/share/wayland-sessions/$session.desktop" \
"$desktops/share/xsessions/$session.desktop"
do
if [ -f "$sessionFile" ]; then
command="$(grep -m1 '^Exec=' "$sessionFile" | cut -d= -f2- || true)"
if [ -n "$command" ]; then
printf '%s\n' "$command" > "$out"
exit 0
fi
fi
done
echo "dms-greeter autologin: could not resolve Exec for session '$session'" >&2
exit 1
'';
jq = getExe pkgs.jq;
configFilesFromHome =
@@ -217,6 +250,13 @@ in
programs.${cfg.compositor.name}.enable = true;
'';
}
{
assertion = cfgAutoLogin.enable -> sessionData.autologinSession != null;
message = ''
dms-greeter auto-login requires services.displayManager.defaultSession to be set,
or at least one session in services.displayManager.sessionPackages.
'';
}
];
services.greetd = {
@@ -227,7 +267,8 @@ in
command = getExe greeterScript;
};
initial_session = mkIf (cfgAutoLogin.enable && (cfgAutoLogin.user != null)) {
inherit (cfgAutoLogin) user command;
inherit (cfgAutoLogin) user;
command = ''${getExe pkgs.bash} -lc "${pkgs.systemd}/bin/systemd-cat $(<${autoLoginCommand})"'';
};
};
};
@@ -290,7 +331,9 @@ in
fi
if [ -f settings.json ]; then
if cp "$(${jq} -r '.customThemeFile' settings.json)" custom-theme.json; then
theme_file="$(${jq} -r '.customThemeFile // empty' settings.json)"
if [ -f "$theme_file" ] && [ -r "$theme_file" ]; then
cp "$theme_file" custom-theme.json
mv settings.json settings.orig.json
${jq} '.customThemeFile = "${cacheDir}/custom-theme.json"' settings.orig.json > settings.json
fi
-446
View File
@@ -1,446 +0,0 @@
{
config,
pkgs,
lib,
...
}:
let
cfg = config.services.inventree;
pkg = cfg.package;
mysqlLocal = cfg.database.createLocally && cfg.database.dbtype == "mysql";
pgsqlLocal = cfg.database.createLocally && cfg.database.dbtype == "postgresql";
manage = pkgs.writeShellScriptBin "inventree-manage" ''
set -a
${lib.toShellVars cfg.settings}
${lib.optionalString (
cfg.database.passwordFile != null
) ''INVENTREE_DB_PASSWORD="$(<"${cfg.database.passwordFile}")"''}
set +a
pushd "${cfg.dataDir}"
sudo=exec
if [[ "$USER" != ${cfg.user} ]]; then
${
if config.security.sudo.enable then
"sudo='exec ${config.security.wrapperDir}/sudo -u ${cfg.user} -E'"
else
">&2 echo 'Aborting, inventree-manage must be run as user `${cfg.user}`!'; exit 2"
}
fi
$sudo ${cfg.package}/bin/inventree "$@"
popd
'';
in
{
meta.buildDocsInSandbox = false;
meta.maintainers = with lib.maintainers; [
kurogeek
];
options.services.inventree = with lib; {
enable = lib.mkEnableOption "inventree";
dataDir = mkOption {
type = types.str;
default = "/var/lib/inventree";
description = "Inventree's data storage path. Will be `/var/lib/inventree` by default.";
};
package = mkOption {
type = types.package;
description = "Which package to use for the InvenTree instance.";
default = pkgs.inventree;
defaultText = literalExpression "pkgs.inventree";
};
adminPasswordFile = mkOption {
type = types.nullOr lib.types.path;
default = null;
example = "/run/keys/inventree-password";
description = "Path to a file containing admin password";
};
secretKeyFile = mkOption {
type = types.path;
default = "${cfg.dataDir}/secret_key.txt";
defaultText = lib.literalExpression ''"''${cfg.dataDir}/secret_key.txt"'';
example = "/run/keys/inventree-secret-key";
description = ''
Path to a file containing the secret key
'';
};
database = {
dbtype = mkOption {
type = lib.types.nullOr (
lib.types.enum [
"postgresql"
"mysql"
]
);
default = "postgresql";
description = "Database type.";
};
dbhost = lib.mkOption {
type = lib.types.nullOr lib.types.str;
default =
if pgsqlLocal then
"/run/postgresql"
else if mysqlLocal then
"/run/mysqld/mysqld.sock"
else
"localhost";
defaultText = "localhost";
example = "localhost";
description = ''
Database host or socket path.
If [](#opt-services.inventree.database.createLocally) is true and
[](#opt-services.inventree.database.dbtype) is either `postgresql` or `mysql`,
defaults to the correct Unix socket instead.
'';
};
dbport = mkOption {
type = types.port;
default = 5432;
description = "Database host port.";
};
dbname = mkOption {
type = types.str;
default = "inventree";
description = "Database name.";
};
dbuser = mkOption {
type = types.str;
default = "inventree";
description = "Database username.";
};
passwordFile = mkOption {
type = with types; nullOr path;
default = null;
example = "/run/keys/inventree-dbpassword";
description = ''
A file containing the password corresponding to
<option>database.dbuser</option>.
'';
};
createLocally = mkOption {
type = types.bool;
default = true;
description = "Create the database and database user locally.";
};
};
domain = mkOption {
type = types.str;
default = "localhost";
example = "inventree.example.com";
description = ''
The INVENTREE_SITE_URL option defines the base URL for the
InvenTree server. This is a critical setting, and it is required
for correct operation of the server. If not specified, the
server will attempt to determine the site URL automatically -
but this may not always be correct!
The site URL is the URL that users will use to access the
InvenTree server. For example, if the server is accessible at
`https://inventree.example.com`, the site URL should be set to
`https://inventree.example.com`. Note that this is not
necessarily the same as the internal URL that the server is
running on - the internal URL will depend entirely on your
server configuration and may be obscured by a reverse proxy or
other such setup.
'';
};
user = mkOption {
type = types.str;
default = "inventree";
description = "User under which InvenTree runs.";
};
group = mkOption {
type = types.str;
default = "inventree";
description = "Group under which InvenTree runs.";
};
settings = mkOption {
type =
with lib.types;
attrsOf (
nullOr (oneOf [
path
str
])
);
default = { };
description = ''
InvenTree config options.
See [the documentation](https://docs.inventree.org/en/stable/start/config/) for available options.
'';
example = {
INVENTREE_CACHE_ENABLED = true;
INVENTREE_CACHE_HOST = "localhost";
INVENTREE_EMAIL_HOST = "smtp.example.com";
INVENTREE_EMAIL_PORT = 25;
};
};
};
config = lib.mkIf cfg.enable (
lib.mkMerge [
{
services.inventree.settings = {
INVENTREE_DB_ENGINE = cfg.database.dbtype;
INVENTREE_DB_NAME = cfg.database.dbname;
INVENTREE_DB_HOST = cfg.database.dbhost;
INVENTREE_DB_USER = cfg.database.dbuser;
INVENTREE_DB_PORT = toString cfg.database.dbport;
INVENTREE_CONFIG_FILE = lib.mkDefault "${cfg.dataDir}/config/config.yaml";
INVENTREE_OIDC_PRIVATE_KEY_FILE = lib.mkDefault "${cfg.dataDir}/config/oidc_private_key.txt";
INVENTREE_STATIC_ROOT = lib.mkDefault "${cfg.dataDir}/data/static_root";
INVENTREE_MEDIA_ROOT = lib.mkDefault "${cfg.dataDir}/data/media";
INVENTREE_BACKUP_DIR = lib.mkDefault "${cfg.dataDir}/data/backups";
INVENTREE_SITE_URL = lib.mkDefault "http://${cfg.domain}";
INVENTREE_PLUGIN_FILE = lib.mkDefault "${cfg.dataDir}/data/plugins/plugins.txt";
INVENTREE_PLUGIN_DIR = lib.mkDefault "${cfg.dataDir}/data/plugins";
INVENTREE_ADMIN_PASSWORD_FILE = lib.mkDefault cfg.adminPasswordFile;
INVENTREE_SECRET_KEY_FILE = lib.mkDefault cfg.secretKeyFile;
INVENTREE_AUTO_UPDATE = lib.mkDefault "false";
};
environment.systemPackages = [ manage ];
systemd.tmpfiles.rules = (
map (dir: "d ${dir} 0755 inventree inventree") [
"${cfg.dataDir}"
"${cfg.dataDir}/config"
"${cfg.dataDir}/data"
"${cfg.dataDir}/data/static_root"
"${cfg.dataDir}/data/media"
"${cfg.dataDir}/data/backups"
"${cfg.dataDir}/data/plugins"
]
);
services.postgresql = lib.mkIf pgsqlLocal {
enable = true;
ensureDatabases = [ cfg.database.dbname ];
ensureUsers = [
{
name = cfg.database.dbuser;
ensureDBOwnership = true;
}
];
};
services.mysql = lib.mkIf mysqlLocal {
enable = true;
package = lib.mkDefault pkgs.mariadb;
ensureDatabases = [ cfg.database.dbname ];
ensureUsers = [
{
name = cfg.database.dbuser;
ensurePermissions = {
"${cfg.database.dbname}.*" = "ALL PRIVILEGES";
};
}
];
};
services.nginx.enable = true;
services.nginx.virtualHosts.${cfg.domain} = {
locations =
let
unixPath = config.systemd.sockets.inventree-server.socketConfig.ListenStream;
in
{
"/" = {
extraConfig = ''
proxy_set_header Host $host;
proxy_set_header X-Forwarded-By $server_addr:$server_port;
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header CLIENT_IP $remote_addr;
proxy_pass_request_headers on;
proxy_redirect off;
client_max_body_size 100M;
proxy_buffering off;
proxy_request_buffering off;
'';
proxyPass = "http://unix:${unixPath}";
};
"/auth" = {
extraConfig = ''
internal;
proxy_pass_request_body off;
proxy_set_header Content-Length "";
proxy_set_header X-Original-URI $request_uri;
'';
proxyPass = "http://unix:${unixPath}:/auth/";
};
"/static/" = {
alias = "${cfg.settings.INVENTREE_STATIC_ROOT}/";
extraConfig = ''
autoindex on;
# Caching settings
expires 30d;
add_header Pragma public;
add_header Cache-Control "public";
'';
};
"/media/" = {
alias = "${cfg.settings.INVENTREE_MEDIA_ROOT}/";
extraConfig = ''
auth_request /auth;
add_header Content-disposition "attachment";
'';
};
};
};
systemd.services.inventree-setup = {
description = "Inventree setup";
wantedBy = [ "inventree.target" ];
partOf = [ "inventree.target" ];
after = lib.optional mysqlLocal "mysql.service" ++ lib.optional pgsqlLocal "postgresql.target";
requires = lib.optional mysqlLocal "mysql.service" ++ lib.optional pgsqlLocal "postgresql.target";
before = [
"inventree-static.service"
"inventree-server.service"
"inventree-qcluster.service"
];
serviceConfig = {
Type = "oneshot";
User = cfg.user;
Group = cfg.group;
RemainAfterExit = true;
PrivateTmp = true;
}
// lib.optionalAttrs (cfg.database.passwordFile != null) {
LoadCredential = "db_password:${cfg.database.passwordFile}";
};
environment = cfg.settings;
script = ''
set -euo pipefail
umask u=rwx,g=,o=
${
lib.optionalString (cfg.database.passwordFile != null) ''
INVENTREE_DB_PASSWORD=$(<"$CREDENTIALS_DIRECTORY/db_password")
''
} \
exec ${pkg}/bin/inventree migrate
'';
};
systemd.services.inventree-static = {
description = "Inventree static migration";
wantedBy = [ "inventree.target" ];
partOf = [ "inventree.target" ];
before = [ "inventree-server.service" ];
environment = cfg.settings;
serviceConfig = {
User = cfg.user;
Group = cfg.group;
StateDirectory = "inventree";
PrivateTmp = true;
}
// lib.optionalAttrs (cfg.database.passwordFile != null) {
LoadCredential = "db_password:${cfg.database.passwordFile}";
};
script = ''
${
lib.optionalString (cfg.database.passwordFile != null) ''
INVENTREE_DB_PASSWORD=$(<"$CREDENTIALS_DIRECTORY/db_password")
''
} \
exec ${pkg}/bin/inventree collectstatic --no-input
'';
};
systemd.services.inventree-server = {
description = "Inventree Gunicorn service";
requiredBy = [ "inventree.target" ];
partOf = [ "inventree.target" ];
environment = cfg.settings;
serviceConfig = {
User = cfg.user;
Group = cfg.group;
StateDirectory = "inventree";
PrivateTmp = true;
}
// lib.optionalAttrs (cfg.database.passwordFile != null) {
LoadCredential = "db_password:${cfg.database.passwordFile}";
};
script = ''
${
lib.optionalString (cfg.database.passwordFile != null) ''
INVENTREE_DB_PASSWORD=$(<"$CREDENTIALS_DIRECTORY/db_password")
''
} \
exec ${pkg}/bin/gunicorn InvenTree.wsgi
'';
};
systemd.sockets.inventree-server = {
wantedBy = [ "sockets.target" ];
partOf = [ "inventree.target" ];
socketConfig.ListenStream = "/run/inventree/gunicorn.socket";
};
systemd.services.inventree-qcluster = {
description = "InvenTree qcluster server";
requiredBy = [ "inventree.target" ];
wantedBy = [ "inventree.target" ];
partOf = [ "inventree.target" ];
environment = cfg.settings;
serviceConfig = {
User = cfg.user;
Group = cfg.group;
StateDirectory = "inventree";
PrivateTmp = true;
}
// lib.optionalAttrs (cfg.database.passwordFile != null) {
LoadCredential = "db_password:${cfg.database.passwordFile}";
};
script = ''
${
lib.optionalString (cfg.database.passwordFile != null) ''
INVENTREE_DB_PASSWORD=$(<"$CREDENTIALS_DIRECTORY/db_password")
''
} \
exec ${pkg}/bin/inventree qcluster
'';
};
systemd.targets.inventree = {
description = "Target for all InvenTree services";
wantedBy = [ "multi-user.target" ];
wants = [ "network-online.target" ];
after = [ "network-online.target" ];
};
users = lib.optionalAttrs (cfg.user == cfg.user) {
users.${cfg.user} = {
group = cfg.group;
isSystemUser = true;
home = cfg.dataDir;
};
groups.${cfg.group}.members = [ cfg.user ];
};
}
]
);
}
-1
View File
@@ -797,7 +797,6 @@ in
installer = handleTest ./installer.nix { };
installer-systemd-stage-1 = handleTest ./installer-systemd-stage-1.nix { };
intune = runTest ./intune.nix;
inventree = runTest ./inventree.nix;
invidious = runTest ./invidious.nix;
invoiceplane = runTest ./invoiceplane.nix;
iodine = runTest ./iodine.nix;
-33
View File
@@ -1,33 +0,0 @@
{ lib, ... }:
{
name = "inventree";
meta.maintainers = with lib.maintainers; [
kurogeek
];
nodes = {
psqlTest = {
services.inventree = {
enable = true;
};
};
mysqlTest = {
services.inventree = {
enable = true;
database.dbtype = "mysql";
};
};
};
testScript = ''
start_all()
psqlTest.wait_for_unit("inventree.target")
psqlTest.wait_for_unit("inventree-server.service")
psqlTest.wait_for_open_unix_socket("/run/inventree/gunicorn.socket")
psqlTest.wait_until_succeeds("curl -sf http://localhost/web")
mysqlTest.wait_for_unit("inventree.target")
mysqlTest.wait_for_unit("inventree-server.service")
mysqlTest.wait_for_open_unix_socket("/run/inventree/gunicorn.socket")
mysqlTest.wait_until_succeeds("curl -sf http://localhost/web")
'';
}
@@ -572,8 +572,8 @@ let
mktplcRef = {
name = "comment-tagged-templates";
publisher = "bierner";
version = "0.3.3";
hash = "sha256-M2XdMQ2l6oMYiHTdfRJ/n/Ys3LecEPwAozQtLBcn7FY=";
version = "0.4.0";
hash = "sha256-mI2VogA6JVEfFL5B3+Od23//uPmXeqP8Om2AnhCs2Hs=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/bierner.comment-tagged-templates/changelog";
@@ -1967,8 +1967,8 @@ let
mktplcRef = {
name = "gitlab-workflow";
publisher = "gitlab";
version = "6.71.4";
hash = "sha256-GIqokG+RFFmUHzrtln0PFHuSYsITZfw21WQspj2AT6U=";
version = "6.71.9";
hash = "sha256-8+5Njd4s3iSrZwwdEVvr/R+uv8i16wDdsbiv3xPISWc=";
};
meta = {
description = "GitLab extension for Visual Studio Code";
@@ -4324,8 +4324,8 @@ let
mktplcRef = {
publisher = "sonarsource";
name = "sonarlint-vscode";
version = "4.44.0";
hash = "sha256-6P29hCcOpEWNXSArnMPiWVwbbyhzlS1LCh3uSDWEfJo=";
version = "4.45.0";
hash = "sha256-itrjHAA3gseflNzOd8UKB8DbhwJ/cWkGuuopLOD83GM=";
};
meta.license = lib.licenses.lgpl3Only;
};
@@ -4772,8 +4772,8 @@ let
mktplcRef = {
name = "emacs-mcx";
publisher = "tuttieee";
version = "0.107.5";
hash = "sha256-8rsj1a/Tj4QpvGN83F3aMHNQVC/9TE61AFS5KhiIpy8=";
version = "0.109.1";
hash = "sha256-ndhIA9g0cONzs+nDPcY0wLjnelfyBUXV9HWfZL/nfmg=";
};
meta = {
changelog = "https://github.com/whitphx/vscode-emacs-mcx/blob/main/CHANGELOG.md";
@@ -5360,8 +5360,8 @@ let
mktplcRef = {
name = "pretty-ts-errors";
publisher = "yoavbls";
version = "0.8.3";
hash = "sha256-YhYHtn0/en0hOts+s/Imln9WzwSrUhwBJPH1qdISUrM=";
version = "0.8.4";
hash = "sha256-FyoT9S58aBkq9Q95fC8NaaHlCoUOpCBcOO8+/I33V70=";
};
meta = {
description = "Make TypeScript errors prettier and human-readable in VSCode";
@@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "mongodb-vscode";
publisher = "mongodb";
version = "1.14.6";
hash = "sha256-MACP/IvSk4JwD9DUWRD6pGYbgVQVzuCz8FvXdfHcphs=";
version = "1.15.1";
hash = "sha256-wdZ4Ro+L6We9GScVIlOBghPFv41xJD7x11Ni3iPshOI=";
};
meta = {
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "helm-diff";
version = "3.13.1";
version = "3.15.2";
src = fetchFromGitHub {
owner = "databus23";
repo = "helm-diff";
rev = "v${version}";
hash = "sha256-7LkXoPhLqZtc1jy8JOkZrHWSIqB2oZLHsEyeNk3vl60=";
hash = "sha256-gcIwg/EZ8A3RKSPuk3Ot6hPDS0m65V/IVqUs3VPbrSQ=";
};
vendorHash = "sha256-QSbml6M+ftQy4n+ybYWf2gCsbVmrnhX09w3ffW/JgUM=";
vendorHash = "sha256-7Qw5ggvyhffmVZH7jKF21y+m1KTroucQ/ZGP67D+EjY=";
ldflags = [
"-s"
@@ -45,11 +45,11 @@
"vendorHash": "sha256-btxzZZtvgeih+OUhc5QnF8ac22TxpGibffGNkljjq6c="
},
"aliyun_alicloud": {
"hash": "sha256-5KqzbCVLtpLo22BPOuZexkOS8Qv9i3/B9UCBWtGI5G8=",
"hash": "sha256-MkFDIGixsjQ6NfzI1X6fiLX4ozi7QA82jGryne/TcBU=",
"homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
"owner": "aliyun",
"repo": "terraform-provider-alicloud",
"rev": "v1.272.1",
"rev": "v1.273.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-Hvk2jckla1LcMankcdUTct8Kea0OznyxDxTJ+UrJHy0="
},
@@ -1004,11 +1004,11 @@
"vendorHash": "sha256-ucXmHK7jrahc78nE2cf5p5PPCSNV5DAQ53KM2SfJnjo="
},
"okta_okta": {
"hash": "sha256-2uQgmzz2dRkOb6OgM3w+IKe1/AY435wZbNmQmkiy8dM=",
"hash": "sha256-sr3Q39Lx47+OT4alUEic7PBvtZKTwQ9Do15YfbVn9b4=",
"homepage": "https://registry.terraform.io/providers/okta/okta",
"owner": "okta",
"repo": "terraform-provider-okta",
"rev": "v6.6.0",
"rev": "v6.6.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-EqXLfVayaOG/G3c6EkgQoPGNwnG2qKSlDo2ai/onmQE="
},
@@ -39,13 +39,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "profanity";
version = "0.15.1";
version = "0.16.0";
src = fetchFromGitHub {
owner = "profanity-im";
repo = "profanity";
rev = finalAttrs.version;
hash = "sha256-h+R+hasc45NZOneuqZ+z+yjfpsPm317OXq0LYe3t+cQ=";
hash = "sha256-/1ae2+iY01C0TyrvviZIcwUQDJvr2qq2DM0GVbjoynI=";
};
patches = [
@@ -6,21 +6,21 @@
# the following are non-haskell dependencies
makeWrapper,
which,
buildNpmPackage,
maude,
graphviz,
glibcLocales,
fetchpatch,
}:
let
inherit (haskellPackages) mkDerivation;
version = "1.10.0";
version = "1.12.0";
src = fetchFromGitHub {
owner = "tamarin-prover";
repo = "tamarin-prover";
rev = version;
hash = "sha256-v1BruU2p/Sg/g7b9a+QRza46bD7PkMtsGq82qFaNhpI=";
tag = version;
hash = "sha256-yXJIJENygr/lmkrVap4ohb8Pua4kri+yaD/Dy0Hpwn4=";
};
# tamarin has its own dependencies, but they're kept inside the repo,
@@ -141,6 +141,20 @@ let
}
);
tamarin-frontend = buildNpmPackage {
pname = "tamarin-frontend";
inherit version src;
sourceRoot = "source/frontend";
npmDepsHash = "sha256-GJiOCyTUfseZXd5WU018MKjxvrc+UOr7l7ZZSpzCS54=";
installPhase = ''
mkdir -p $out
cp dist/* $out/
'';
};
in
mkDerivation (
common "tamarin-prover" src
@@ -148,21 +162,16 @@ mkDerivation (
isLibrary = false;
isExecutable = true;
patches = [
# Allows tamarin-prover to run with Maude 3.5.1
# This should be removed on the next release
(fetchpatch {
url = "https://github.com/tamarin-prover/tamarin-prover/commit/1a41b507e7f60d081d8c91cd465386d57f814f11.patch";
includes = [ "src/Main/Console.hs" ];
hash = "sha256-X8qhscwy+efATrl3rLtn0Xi9M5a2CsFrjBbiqvVRtSE=";
})
];
# strip out unneeded deps manually
doHaddock = false;
enableSharedExecutables = false;
postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc";
preBuild = ''
cp ${tamarin-frontend}/*.js data/js/
cp ${tamarin-frontend}/*.css data/css/
'';
# wrap the prover to be sure it can find maude, sapic, etc
executableToolDepends = [
makeWrapper
@@ -6,7 +6,6 @@
ninja,
nv-codec-headers-12,
fetchFromGitHub,
fetchpatch2,
fetchurl,
addDriverRunpath,
autoAddDriverRunpath,
@@ -99,13 +98,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "obs-studio";
version = "32.0.4";
version = "32.1.0";
src = fetchFromGitHub {
owner = "obsproject";
repo = "obs-studio";
rev = finalAttrs.version;
hash = "sha256-OiLlYnHaW+ehHtz4N20ctkfL4WmCzI45+VUG5hHOga4=";
hash = "sha256-edmDqavmDT8+bl0nXmDqYPpkuitg9T8u2fI/j6mWoFc=";
fetchSubmodules = true;
};
@@ -113,11 +112,6 @@ stdenv.mkDerivation (finalAttrs: {
patches = [
./fix-nix-plugin-path.patch
# Fix build with Qt 6.10 https://github.com/obsproject/obs-studio/pull/12328
(fetchpatch2 {
url = "https://github.com/obsproject/obs-studio/commit/26dfacbd4f5217258a2f1c5472a544c65a182d10.patch?full_index=1";
hash = "sha256-gEWDzZ+GPCR+rmytXcbiBcvzLg8VwZCveMKkvho3COI=";
})
];
nativeBuildInputs = [
+3 -3
View File
@@ -8,13 +8,13 @@
}:
stdenv.mkDerivation {
pname = "airwindows";
version = "0-unstable-2026-02-22";
version = "0-unstable-2026-03-14";
src = fetchFromGitHub {
owner = "airwindows";
repo = "airwindows";
rev = "e78819e1ec1d77a93057c6bf8ef0eba0293ed782";
hash = "sha256-TH5FOTtnYNzlM1tysCbSO1wNFxyPSg5n9jUmFli5NJw=";
rev = "36106b00885d81efa9ac9a8c387e3431abac0471";
hash = "sha256-xf+gRy8t3uXpGwsVhPyO8J4YQ806KDZ1muR6A/7AhGM=";
};
# we patch helpers because honestly im spooked out by where those variables
@@ -0,0 +1,28 @@
{
lib,
stdenvNoCC,
fetchFromGitHub,
installFonts,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "alcarin-tengwar";
version = "0.83";
src = fetchFromGitHub {
owner = "Tosche";
repo = "Alcarin-Tengwar";
rev = "a4530d430ea01871b0b0a54d1de218d2ffde0ea5";
hash = "sha256-W1PJ2ABjtGUhWp6XBUq6Zox7uG81tMEs13GidfwgD6Q=";
};
nativeBuildInputs = [ installFonts ];
meta = {
description = "Typeface designed to provide Tengwar symbols";
homepage = "https://github.com/Tosche/Alcarin-Tengwar";
license = lib.licenses.ofl;
maintainers = with lib.maintainers; [ gs-101 ];
platforms = lib.platforms.all;
};
})
@@ -7,16 +7,16 @@
buildNpmPackage rec {
pname = "all-the-package-names";
version = "2.0.2379";
version = "2.0.2387";
src = fetchFromGitHub {
owner = "nice-registry";
repo = "all-the-package-names";
tag = "v${version}";
hash = "sha256-W1c0xFm6ZIpykfMegmc3PAX8X1SNhSpsN37ZhXn4424=";
hash = "sha256-0DuHzZdPjzoUXGgn7Kt7CGjvNXuYYAZqpuuQS86ECXM=";
};
npmDepsHash = "sha256-3sWgNa6ez5lZHQj6tThxXTYVpkDXHulb7mkiqVVyTlg=";
npmDepsHash = "sha256-CzWF/CbyVGGogeEFQOjldBWGP98q4q/x/KukAE4EJPo=";
passthru.updateScript = nix-update-script { };
+10 -3
View File
@@ -12,17 +12,18 @@
popt,
libxslt,
screen,
unstableGitUpdater,
}:
stdenv.mkDerivation {
pname = "apt-dater";
version = "1.0.4-unstable-2024-10-04";
version = "1.0.4-unstable-2026-02-15";
src = fetchFromGitHub {
owner = "DE-IBH";
repo = "apt-dater";
rev = "113ea9b72d318f316ea7cac8ddad5be004787a22";
hash = "sha256-/Ufa/pEbqD25kp+k0zm9MuLS1zG+xWqhpBkL7ng2+Bo=";
rev = "eb3df6923262051082df2e9377516553da9ba508";
hash = "sha256-I5TQ6sPIWD7jllelkvYjLa/7FI2IpWsGRS4FsxXQKGs=";
};
nativeBuildInputs = [
@@ -66,6 +67,12 @@ stdenv.mkDerivation {
doCheck = true;
# Use unstable to pull in gcc-15 fixes:
# https://github.com/DE-IBH/apt-dater/pull/187
passthru.updateScript = unstableGitUpdater {
tagPrefix = "v";
};
meta = {
homepage = "https://github.com/DE-IBH/apt-dater";
description = "Terminal-based remote package update manager";
-596
View File
@@ -79,21 +79,6 @@
"version": "12.20.1",
"hash": "sha256-XBDyzAEt5iwdyB3jgoG5TLyx5NZ/MoiEerBR/7U7F4w="
},
{
"pname": "Azure.Storage.Queues",
"version": "12.19.1",
"hash": "sha256-EskLp1RYDvnRpOMsTRylalh5VP5fUddTdG4eR9i1tO4="
},
{
"pname": "Castle.Core",
"version": "4.2.0",
"hash": "sha256-B25CLu7UhAuu7ITddB9wgqfrFtJD8BEsZO/tCBKxGyU="
},
{
"pname": "Castle.Core",
"version": "4.2.1",
"hash": "sha256-FPDdJfRQkjBQC8JwbXALf71HJfFMciJyenIIqJSWC6M="
},
{
"pname": "Colors.Net",
"version": "1.1.0",
@@ -104,16 +89,6 @@
"version": "2.0.9.136",
"hash": "sha256-wRvKTW4WisziZmglLOqbUXVv9pPh9MmF7HS/hcoj7fM="
},
{
"pname": "FluentAssertions",
"version": "5.2.0",
"hash": "sha256-S1k2Z3EBlGYSc9ofDm0hSVUUt9xog5rejfoXWLNXcpE="
},
{
"pname": "FSharp.Core",
"version": "3.1.2.5",
"hash": "sha256-MMIyGbKBNZFOgr4z8dC8jhICWtRPBCNzWc7ll2uU210="
},
{
"pname": "Google.Protobuf",
"version": "3.23.1",
@@ -244,56 +219,6 @@
"version": "2.2.0",
"hash": "sha256-NBUF/oT5TYVvuUW4/lws//1OfX8ldrAxY4+CLnmT3Ag="
},
{
"pname": "Microsoft.AspNetCore.App.Ref",
"version": "8.0.24",
"hash": "sha256-S8WKO+yB9fF56M2DOaqEOUzKL0/iXtCZQWcXeAV7zWE="
},
{
"pname": "Microsoft.AspNetCore.App.Ref",
"version": "9.0.13",
"hash": "sha256-uhcJ9ll5PEg4bX2PhIrxPZ270j2W2bYREarQCihyW7w="
},
{
"pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64",
"version": "8.0.24",
"hash": "sha256-K+AQgKYpIKFYxPSOKNm2hYyDlEhQCj8KN5FV9xdV8nY="
},
{
"pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64",
"version": "9.0.13",
"hash": "sha256-zPiQ1KhNkdc9w9B5bq9EWBrjBXJMBmdn5qUqubp+Xyo="
},
{
"pname": "Microsoft.AspNetCore.App.Runtime.linux-x64",
"version": "8.0.24",
"hash": "sha256-qNw/gjM/JGjL3K6bxr0xhF4tLcGVScMOnk4M6O8eezU="
},
{
"pname": "Microsoft.AspNetCore.App.Runtime.linux-x64",
"version": "9.0.13",
"hash": "sha256-RMGZEBbjAgzoZIf878drIgb33Q0+NYX6euOIV34BjQk="
},
{
"pname": "Microsoft.AspNetCore.App.Runtime.osx-arm64",
"version": "8.0.24",
"hash": "sha256-bS8XRDQ7cGOzqb5i43S4LjanOAfZXbsWOI4n/tnrBi0="
},
{
"pname": "Microsoft.AspNetCore.App.Runtime.osx-arm64",
"version": "9.0.13",
"hash": "sha256-NkAx5OX1eGgd+jr5a0z4Uys/l9AkI4CyqXQfGi7GNKs="
},
{
"pname": "Microsoft.AspNetCore.App.Runtime.osx-x64",
"version": "8.0.24",
"hash": "sha256-Ek789mAUCy/sYZY9ZhBYrVitFk/QCLHPp9+2WHZ9Wvc="
},
{
"pname": "Microsoft.AspNetCore.App.Runtime.osx-x64",
"version": "9.0.13",
"hash": "sha256-blbl3C1tBmx+u9paJVHhgX3y8IaHZI2RwZEidgIZVtU="
},
{
"pname": "Microsoft.AspNetCore.Authentication.Abstractions",
"version": "2.2.0",
@@ -796,11 +721,6 @@
"hash": "sha256-w59GMXgyodWUFJauwFOzWUydz+76iiXXzVMqjvFS7XQ=",
"url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/1e0b47db-42dd-4931-a098-8cb031234dcc/nuget/v3/flat2/microsoft.azure.websites.dataprotection/2.1.91-alpha/microsoft.azure.websites.dataprotection.2.1.91-alpha.nupkg"
},
{
"pname": "Microsoft.Bcl.AsyncInterfaces",
"version": "1.1.1",
"hash": "sha256-fAcX4sxE0veWM1CZBtXR/Unky+6sE33yrV7ohrWGKig="
},
{
"pname": "Microsoft.Bcl.AsyncInterfaces",
"version": "6.0.0",
@@ -866,11 +786,6 @@
"version": "3.3.1",
"hash": "sha256-rgPXlePpLyrkdyVxwmVZef3go/BTxCRGfu+639g6BFA="
},
{
"pname": "Microsoft.CodeCoverage",
"version": "1.0.3",
"hash": "sha256-vO0DJv2QNYfus4VzqVkNcnWQqmuUrM5le7supZRl/Uk="
},
{
"pname": "Microsoft.CSharp",
"version": "4.3.0",
@@ -891,16 +806,6 @@
"version": "4.7.0",
"hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="
},
{
"pname": "Microsoft.DotNet.ILCompiler",
"version": "9.0.13",
"hash": "sha256-yB24drjo/WDEU/nIgePA1UPgtFSb0oNBQrU6iXs1NRM="
},
{
"pname": "Microsoft.DotNet.PlatformAbstractions",
"version": "1.0.3",
"hash": "sha256-tE+2/zJAOpwaINSnmsq070K5xHQAzzqcrVkCxBFiXtk="
},
{
"pname": "Microsoft.DotNet.PlatformAbstractions",
"version": "2.1.0",
@@ -1111,11 +1016,6 @@
"version": "9.0.6",
"hash": "sha256-40rY38OwSqueIWr/KMvJX9u+vipN+AaRQ6eNCZLqrog="
},
{
"pname": "Microsoft.Extensions.DependencyModel",
"version": "1.0.3",
"hash": "sha256-NEcjABwtUqoDs6mrYKHJZ8Rn0EN5krHitnxghez6lO0="
},
{
"pname": "Microsoft.Extensions.DependencyModel",
"version": "2.1.0",
@@ -1581,116 +1481,11 @@
"version": "2.2.0",
"hash": "sha256-pb8AoacSvy8hGNGodU6Lhv1ooWtUSCZwjmwd89PM1HA="
},
{
"pname": "Microsoft.NET.ILLink.Tasks",
"version": "9.0.13",
"hash": "sha256-1fx7XZRRB//5B4GZlJuNsVKBin1UuTlijn49truBxn0="
},
{
"pname": "Microsoft.NET.StringTools",
"version": "1.0.0",
"hash": "sha256-smmwm1XbKsk0SPW74rd2uDubWzfd7RhfSkPr932cyhs="
},
{
"pname": "Microsoft.NET.Test.Sdk",
"version": "15.6.2",
"hash": "sha256-YlhxcIvjI3MZ8EidG8chXhlTsHE59U0nkbMUVDsQMYI="
},
{
"pname": "Microsoft.NETCore.App.Host.linux-arm64",
"version": "8.0.24",
"hash": "sha256-/dAJ/5dleJlkxMWd3kJSiME7Yq/QdlE73DZwM1C9KGQ="
},
{
"pname": "Microsoft.NETCore.App.Host.linux-arm64",
"version": "9.0.13",
"hash": "sha256-hyLmW3K44AcouG0o5iH7dF06+pgqcs29DoplRYFxeqI="
},
{
"pname": "Microsoft.NETCore.App.Host.linux-x64",
"version": "8.0.24",
"hash": "sha256-REGiuRAPAOZl0arcP/QCYH9gdiCBDGu0Vnp5LD5qPmE="
},
{
"pname": "Microsoft.NETCore.App.Host.linux-x64",
"version": "9.0.13",
"hash": "sha256-OQenvUHKKS0h1c2EirYATJIEgGpVCJvxHIykIV6NCaE="
},
{
"pname": "Microsoft.NETCore.App.Host.osx-arm64",
"version": "8.0.24",
"hash": "sha256-C3F39k9qyKPAASiaacsvER4GN2Ryw2dxKKpRECaylto="
},
{
"pname": "Microsoft.NETCore.App.Host.osx-arm64",
"version": "9.0.13",
"hash": "sha256-JAFf+vSH7jUnjhKPGPBzgsauq29Ux+aIYi/k8W2kzBs="
},
{
"pname": "Microsoft.NETCore.App.Host.osx-x64",
"version": "8.0.24",
"hash": "sha256-FHorC+fd57T98l+8CrcBCeuGye11IJdGBKeY2rM1fNM="
},
{
"pname": "Microsoft.NETCore.App.Host.osx-x64",
"version": "9.0.13",
"hash": "sha256-yFizMrUqfMUGV1uxUoAOJP4f5m2jAVAS+mt9SFSRhf4="
},
{
"pname": "Microsoft.NETCore.App.Ref",
"version": "8.0.24",
"hash": "sha256-1dP3uWhHcbXPI3kA4b14ZulF9m1lU9OPZ+hQ8TnZveY="
},
{
"pname": "Microsoft.NETCore.App.Ref",
"version": "9.0.13",
"hash": "sha256-igu/tb7UIgqgP8+hGThU0N+nowgeKBOGdRxam+zrJvM="
},
{
"pname": "Microsoft.NETCore.App.Runtime.linux-arm64",
"version": "8.0.24",
"hash": "sha256-oe/yKNEiAJwio7fZs0Hf+AfIkIuKsB+rpbyr1DGEx9I="
},
{
"pname": "Microsoft.NETCore.App.Runtime.linux-arm64",
"version": "9.0.13",
"hash": "sha256-8yfXrHaOJZdC6oOrHvLEwhx2YWhQZRlfMAzI2KG0R9E="
},
{
"pname": "Microsoft.NETCore.App.Runtime.linux-x64",
"version": "8.0.24",
"hash": "sha256-tliAyrTeTUdQIe5CkwQLvQMNKIesn303oS3EYzV9IjE="
},
{
"pname": "Microsoft.NETCore.App.Runtime.linux-x64",
"version": "9.0.13",
"hash": "sha256-yoB2mCxdhsE/grReVIyeH4Q2WpUA9hHxUyZemCC2Cuc="
},
{
"pname": "Microsoft.NETCore.App.Runtime.osx-arm64",
"version": "8.0.24",
"hash": "sha256-v20On/+Xs3U0EHlxmx0BqJXEhBLErOCb2ynmi7VGIa0="
},
{
"pname": "Microsoft.NETCore.App.Runtime.osx-arm64",
"version": "9.0.13",
"hash": "sha256-yWhIeOq7w5UTbxM27N6/pg/zqyj31ZcpaHUi4Ca2QD4="
},
{
"pname": "Microsoft.NETCore.App.Runtime.osx-x64",
"version": "8.0.24",
"hash": "sha256-JG1fpGbqOXqs6fYkeABAsZpdLUuOaeJVvk648DeGyew="
},
{
"pname": "Microsoft.NETCore.App.Runtime.osx-x64",
"version": "9.0.13",
"hash": "sha256-+LIth4iOI4rQwZTRvR+Y0bA3qxM4TUuZg72cqY5I0LA="
},
{
"pname": "Microsoft.NETCore.DotNetAppHost",
"version": "8.0.8",
"hash": "sha256-2KBKkVUlpiO1bOY+Ia2PKjurY2taV7CHnzU7Jr5HYUs="
},
{
"pname": "Microsoft.NETCore.Platforms",
"version": "1.0.1",
@@ -1741,16 +1536,6 @@
"version": "1.3.0",
"hash": "sha256-9nJA7a43OhJKCzFJPYfTJHL0JmVxVkNsYPexln8pFKE="
},
{
"pname": "Microsoft.TestPlatform.ObjectModel",
"version": "15.6.2",
"hash": "sha256-O4FJRxBPtUHE1IEd6/IepmkRHlwtTAJ2UbECqGzOpvo="
},
{
"pname": "Microsoft.TestPlatform.TestHost",
"version": "15.6.2",
"hash": "sha256-aTsuaMw1YvLqQhsb3JttF7w6PK31M/jDZMHOqkGz+uA="
},
{
"pname": "Microsoft.Win32.Primitives",
"version": "4.0.1",
@@ -1761,11 +1546,6 @@
"version": "4.3.0",
"hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="
},
{
"pname": "Microsoft.Win32.Registry",
"version": "4.0.0",
"hash": "sha256-M/06F/Z2wTHCh4pZOgtCjUGLD1FJXEJKCmzOeFMl7uo="
},
{
"pname": "Microsoft.Win32.Registry",
"version": "4.3.0",
@@ -1786,11 +1566,6 @@
"version": "1.0.0",
"hash": "sha256-/F61k7MY/fu2FcfW7CkyjuUroKwlYAXPQFVeDs1QknY="
},
{
"pname": "Moq",
"version": "4.8.2",
"hash": "sha256-eNFJeuk4nmYOoBiu4zOtcIyk96NYXr38vvthNLO4OCA="
},
{
"pname": "NCrontab.Signed",
"version": "3.3.3",
@@ -1826,11 +1601,6 @@
"version": "1.0.2",
"hash": "sha256-ZUj6YFSMZp5CZtXiamw49eZmbp1iYBuNsIKNnjxcRzA="
},
{
"pname": "NSubstitute",
"version": "3.1.0",
"hash": "sha256-aO5dsxr6fOTeWWseQkxx4+qkoErPP3UbBKDrH/uEmIk="
},
{
"pname": "NuGet.Common",
"version": "5.11.6",
@@ -1956,21 +1726,11 @@
"version": "2.3.3",
"hash": "sha256-Jeq5LBMWIormTaamIRR5aLl/mRuYmX9XiSBLnXmhDkA="
},
{
"pname": "RichardSzalay.MockHttp",
"version": "5.0.0",
"hash": "sha256-jwFUQe9HdC+gu9W/r4eipYgqbGr0eVA7F3sj2k25+40="
},
{
"pname": "runtime.any.System.Collections",
"version": "4.3.0",
"hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="
},
{
"pname": "runtime.any.System.Diagnostics.Tools",
"version": "4.3.0",
"hash": "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I="
},
{
"pname": "runtime.any.System.Diagnostics.Tracing",
"version": "4.3.0",
@@ -2041,61 +1801,21 @@
"version": "4.3.0",
"hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="
},
{
"pname": "runtime.any.System.Threading.Timer",
"version": "4.3.0",
"hash": "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs="
},
{
"pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="
},
{
"pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.2",
"hash": "sha256-EbnOqPOrAgI9eNheXLR++VnY4pHzMsEKw1dFPJ/Fl2c="
},
{
"pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="
},
{
"pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.2",
"hash": "sha256-mVg02TNvJc1BuHU03q3fH3M6cMgkKaQPBxraSHl/Btg="
},
{
"pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="
},
{
"pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.2",
"hash": "sha256-g9Uiikrl+M40hYe0JMlGHe/lrR0+nN05YF64wzLmBBA="
},
{
"pname": "runtime.linux-arm64.Microsoft.DotNet.ILCompiler",
"version": "9.0.13",
"hash": "sha256-vwIqC7MmdxuwprvPg5kxpl12HASsUSQdOsbC+UrrSxA="
},
{
"pname": "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost",
"version": "8.0.8",
"hash": "sha256-GRldzHE2XXJdR6qAdcxgLcXZM1gNoiGsfJg0M5qnlR4="
},
{
"pname": "runtime.linux-x64.Microsoft.DotNet.ILCompiler",
"version": "9.0.13",
"hash": "sha256-0jqd1+Q/0/JgekLDBdsGchsg/5BN5x88JzJS1iqVodE="
},
{
"pname": "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost",
"version": "8.0.8",
"hash": "sha256-Ls2+jcDC4FW9zO81O2JP6BtKeazhydWEiXBPg/GJsfw="
},
{
"pname": "runtime.native.System",
"version": "4.0.0",
@@ -2106,31 +1826,11 @@
"version": "4.3.0",
"hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="
},
{
"pname": "runtime.native.System.IO.Compression",
"version": "4.1.0",
"hash": "sha256-085JrZxNEwIHdBWKKKFsh1JzpF0AblvrUsz5T8kH4jQ="
},
{
"pname": "runtime.native.System.IO.Compression",
"version": "4.3.0",
"hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="
},
{
"pname": "runtime.native.System.Net.Http",
"version": "4.0.1",
"hash": "sha256-5nWnTQrA1T6t9r8MqIiV4yTNu+IH0of2OX1qteoS+8E="
},
{
"pname": "runtime.native.System.Net.Http",
"version": "4.3.0",
"hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="
},
{
"pname": "runtime.native.System.Security.Cryptography",
"version": "4.0.0",
"hash": "sha256-6Q8eYzC32BbGIiTHoQaE6B3cD81vYQcH5SCswYRSp0w="
},
{
"pname": "runtime.native.System.Security.Cryptography.Apple",
"version": "4.3.0",
@@ -2146,96 +1846,41 @@
"version": "4.3.2",
"hash": "sha256-xqF6LbbtpzNC9n1Ua16PnYgXHU0LvblEROTfK4vIxX8="
},
{
"pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="
},
{
"pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.2",
"hash": "sha256-aJBu6Frcg6webvzVcKNoUP1b462OAqReF2giTSyBzCQ="
},
{
"pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="
},
{
"pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.2",
"hash": "sha256-Mpt7KN2Kq51QYOEVesEjhWcCGTqWckuPf8HlQ110qLY="
},
{
"pname": "runtime.osx-arm64.Microsoft.DotNet.ILCompiler",
"version": "9.0.13",
"hash": "sha256-imtP20skhTnzSGXqCzVt57SqkM0btTet9g1OHm7QGV8="
},
{
"pname": "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost",
"version": "8.0.8",
"hash": "sha256-O59V6pzicz7KWwUy+5qB3nAwSxhRsM9HoCq2uInaaHY="
},
{
"pname": "runtime.osx-x64.Microsoft.DotNet.ILCompiler",
"version": "9.0.13",
"hash": "sha256-Mds6EWafCVVuMp1mKQcreRGajlIMVJSU5qO5zZ4hrTw="
},
{
"pname": "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost",
"version": "8.0.8",
"hash": "sha256-bG/yxRP8uNHjCcZkSOlqSqgWIesuww8irvtSsC8jIfE="
},
{
"pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple",
"version": "4.3.0",
"hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="
},
{
"pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="
},
{
"pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.2",
"hash": "sha256-JvMltmfVC53mCZtKDHE69G3RT6Id28hnskntP9MMP9U="
},
{
"pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="
},
{
"pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.2",
"hash": "sha256-QfFxWTVRNBhN4Dm1XRbCf+soNQpy81PsZed3x6op/bI="
},
{
"pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="
},
{
"pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.2",
"hash": "sha256-EaJHVc9aDZ6F7ltM2JwlIuiJvqM67CKRq682iVSo+pU="
},
{
"pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="
},
{
"pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.2",
"hash": "sha256-PHR0+6rIjJswn89eoiWYY1DuU8u6xRJLrtjykAMuFmA="
},
{
"pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="
},
{
"pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.2",
@@ -2246,11 +1891,6 @@
"version": "4.3.0",
"hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="
},
{
"pname": "runtime.unix.System.Console",
"version": "4.3.1",
"hash": "sha256-dxyn/1Px4FKLZ2QMUrkFpW619Y1lhPeTiGLWYM6IbpY="
},
{
"pname": "runtime.unix.System.Diagnostics.Debug",
"version": "4.3.0",
@@ -2266,11 +1906,6 @@
"version": "4.3.0",
"hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0="
},
{
"pname": "runtime.unix.System.Net.Sockets",
"version": "4.3.0",
"hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4="
},
{
"pname": "runtime.unix.System.Private.Uri",
"version": "4.3.0",
@@ -2291,16 +1926,6 @@
"version": "1.2.0.556",
"hash": "sha256-aVop7a9r+X2RsZETgngBm3qQPEIiPBWgHzicGSTEymc="
},
{
"pname": "Suave",
"version": "1.1.3",
"hash": "sha256-z730a3DmRHKn9kYkd49Zk4/9Qk+/1GpZNuiCk+18hqg="
},
{
"pname": "SuaveServerWrapper",
"version": "0.0.3",
"hash": "sha256-3+lml7VSoYlbUMSxCoAetoGOPIKZVy+T0Xu8HFNI924="
},
{
"pname": "System.AppContext",
"version": "4.1.0",
@@ -2311,11 +1936,6 @@
"version": "4.3.0",
"hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="
},
{
"pname": "System.Buffers",
"version": "4.0.0",
"hash": "sha256-+YUymoyS0O+xVyF2+LiAdZlMww8nofPN4ja9ylYqRo8="
},
{
"pname": "System.Buffers",
"version": "4.3.0",
@@ -2326,11 +1946,6 @@
"version": "4.5.0",
"hash": "sha256-THw2znu+KibfJRfD7cE3nRYHsm7Fyn5pjOOZVonFjvs="
},
{
"pname": "System.ClientModel",
"version": "1.0.0",
"hash": "sha256-yHb72M/Z8LeSZea9TKw2eD0SdYEoCNwVw6Z3695SC2Y="
},
{
"pname": "System.ClientModel",
"version": "1.1.0",
@@ -2376,22 +1991,6 @@
"version": "5.0.0",
"hash": "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8="
},
{
"pname": "System.Collections.NonGeneric",
"version": "4.3.0",
"hash": "sha256-8/yZmD4jjvq7m68SPkJZLBQ79jOTOyT5lyzX4SCYAx8="
},
{
"pname": "System.Collections.Specialized",
"version": "4.3.0",
"hash": "sha256-QNg0JJNx+zXMQ26MJRPzH7THdtqjrNtGLUgaR1SdvOk="
},
{
"pname": "System.CommandLine",
"version": "2.0.0-beta5.25306.101",
"hash": "sha256-Gn1MRpeHkduwDPtoZmQoIItMWwRKFDkFtFGyH2+AtpE=",
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/2.0.0-beta5.25306.101/system.commandline.2.0.0-beta5.25306.101.nupkg"
},
{
"pname": "System.ComponentModel",
"version": "4.0.1",
@@ -2412,31 +2011,6 @@
"version": "4.5.0",
"hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="
},
{
"pname": "System.ComponentModel.EventBasedAsync",
"version": "4.0.11",
"hash": "sha256-kAOQ9dEg+yDh5h56qSf36OTLJYRIcKftIcOqxfuJJR8="
},
{
"pname": "System.ComponentModel.Primitives",
"version": "4.3.0",
"hash": "sha256-IOMJleuIBppmP4ECB3uftbdcgL7CCd56+oAD/Sqrbus="
},
{
"pname": "System.ComponentModel.TypeConverter",
"version": "4.1.0",
"hash": "sha256-HmzGTU2NVj8qUn1xCGxifOQ/e/HZCVvgIECzcJPaDJ0="
},
{
"pname": "System.ComponentModel.TypeConverter",
"version": "4.3.0",
"hash": "sha256-PSDiPYt8PgTdTUBz+GH6lHCaM1YgfObneHnZsc8Fz54="
},
{
"pname": "System.Configuration.ConfigurationManager",
"version": "4.4.0",
"hash": "sha256-+8wGYllXnIxRzy9dLhZFB88GoPj8ivYXS0KUfcivT8I="
},
{
"pname": "System.Configuration.ConfigurationManager",
"version": "4.5.0",
@@ -2472,11 +2046,6 @@
"version": "4.3.0",
"hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="
},
{
"pname": "System.Diagnostics.DiagnosticSource",
"version": "4.0.0",
"hash": "sha256-dYh9UoFesuGcHY+ewsI+z2WnNy+bwHPsHQ3t85cbzNg="
},
{
"pname": "System.Diagnostics.DiagnosticSource",
"version": "4.3.0",
@@ -2527,16 +2096,6 @@
"version": "6.0.0",
"hash": "sha256-tmAXwujLlc+F/SIVJvJYnSuUjCQ4ylytHTHV4Ly5EN8="
},
{
"pname": "System.Diagnostics.Process",
"version": "4.1.0",
"hash": "sha256-OgW6ogQ+oYADYS0PHmwXdhrOKQJpqXlwzSvmfjTLNBg="
},
{
"pname": "System.Diagnostics.TextWriterTraceListener",
"version": "4.0.0",
"hash": "sha256-GmInHGlq5ZTnT7qsxpKnXid11hcRXVBhA1N1zyePL/Y="
},
{
"pname": "System.Diagnostics.Tools",
"version": "4.0.1",
@@ -2547,11 +2106,6 @@
"version": "4.3.0",
"hash": "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="
},
{
"pname": "System.Diagnostics.TraceSource",
"version": "4.0.0",
"hash": "sha256-cCjdPU7ow91HGf1hBIOLJMQGO6pNmF+N+5/Z38XJh9U="
},
{
"pname": "System.Diagnostics.TraceSource",
"version": "4.3.0",
@@ -2617,11 +2171,6 @@
"version": "4.3.0",
"hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="
},
{
"pname": "System.Globalization.Extensions",
"version": "4.0.1",
"hash": "sha256-zLtkPryJwqTGcJqMC6zoMMvMrT+aAL5GoumjmMtqUEI="
},
{
"pname": "System.Globalization.Extensions",
"version": "4.3.0",
@@ -2742,11 +2291,6 @@
"version": "4.3.0",
"hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="
},
{
"pname": "System.Linq.Queryable",
"version": "4.3.0",
"hash": "sha256-EioRexhnpSoIa96Un0syFO9CP6l1jNaXYhp5LlnaLW4="
},
{
"pname": "System.Memory",
"version": "4.5.1",
@@ -2842,11 +2386,6 @@
"version": "4.3.0",
"hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="
},
{
"pname": "System.Private.DataContractSerialization",
"version": "4.1.1",
"hash": "sha256-OaE+ZcEfkpIkbdMOMAMiJa9vgiVP25FGuFrf+N/mafY="
},
{
"pname": "System.Private.Uri",
"version": "4.3.0",
@@ -2927,11 +2466,6 @@
"version": "4.3.0",
"hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="
},
{
"pname": "System.Reflection.Metadata",
"version": "1.3.0",
"hash": "sha256-a/RQr++mSsziWaOTknicfIQX/zJrwPFExfhK6PM0tfg="
},
{
"pname": "System.Reflection.Metadata",
"version": "1.6.0",
@@ -3042,11 +2576,6 @@
"version": "4.3.0",
"hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="
},
{
"pname": "System.Runtime.Loader",
"version": "4.0.0",
"hash": "sha256-gE5/ehU3Qq5phhSxGuPmSv1DFVQeiyl1/+YyrO+I7lI="
},
{
"pname": "System.Runtime.Loader",
"version": "4.3.0",
@@ -3062,16 +2591,6 @@
"version": "4.3.0",
"hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="
},
{
"pname": "System.Runtime.Serialization.Json",
"version": "4.0.2",
"hash": "sha256-thmzgYbyxoPYtkDdDwoG7wnVuVhFNwLUE2AsDfRf1yM="
},
{
"pname": "System.Runtime.Serialization.Primitives",
"version": "4.1.1",
"hash": "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA="
},
{
"pname": "System.Runtime.Serialization.Primitives",
"version": "4.3.0",
@@ -3107,11 +2626,6 @@
"version": "4.3.0",
"hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="
},
{
"pname": "System.Security.Cryptography.Cng",
"version": "4.2.0",
"hash": "sha256-7F+m3HnmBsgE4xWF8FeCGlaEgQM3drqA6HEaQr6MEoU="
},
{
"pname": "System.Security.Cryptography.Cng",
"version": "4.3.0",
@@ -3127,11 +2641,6 @@
"version": "5.0.0",
"hash": "sha256-nOJP3vdmQaYA07TI373OvZX6uWshETipvi5KpL7oExo="
},
{
"pname": "System.Security.Cryptography.Csp",
"version": "4.0.0",
"hash": "sha256-WHyR6vVK3zaT4De7jgQFUar1P5fiX9ECwiVkJDFFm7M="
},
{
"pname": "System.Security.Cryptography.Csp",
"version": "4.3.0",
@@ -3147,11 +2656,6 @@
"version": "4.3.0",
"hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="
},
{
"pname": "System.Security.Cryptography.OpenSsl",
"version": "4.0.0",
"hash": "sha256-mLijAozynzjiOMyh2P5BHcfVq3Ovd0T/phG08SIbXZs="
},
{
"pname": "System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
@@ -3387,26 +2891,11 @@
"version": "4.5.4",
"hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="
},
{
"pname": "System.Threading.Thread",
"version": "4.0.0",
"hash": "sha256-7EtSJuKqcW107FYA5Ko9NFXEWUPIzNDtlfKaQV2pvb8="
},
{
"pname": "System.Threading.Thread",
"version": "4.3.0",
"hash": "sha256-pMs6RNFC3nQOGz9EqIcyWmO8YLaqay+q/Qde5hqPXXg="
},
{
"pname": "System.Threading.ThreadPool",
"version": "4.0.10",
"hash": "sha256-/fowWjM/0ZZFC1Rwu0i5N71iRxV2JOd3jQV2Jn0wuTk="
},
{
"pname": "System.Threading.ThreadPool",
"version": "4.3.0",
"hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg="
},
{
"pname": "System.Threading.Timer",
"version": "4.0.1",
@@ -3417,11 +2906,6 @@
"version": "4.3.0",
"hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="
},
{
"pname": "System.ValueTuple",
"version": "4.4.0",
"hash": "sha256-LqpI3bSaXqVPqfEdfsWE2qX9tzFV6VPU6x4A/fVzzfM="
},
{
"pname": "System.Windows.Extensions",
"version": "4.7.0",
@@ -3452,101 +2936,21 @@
"version": "4.3.0",
"hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="
},
{
"pname": "System.Xml.XmlDocument",
"version": "4.0.1",
"hash": "sha256-gdoFrPo54v1LjkBF79f8EvtltVVjHz9ZI9kc5ve0GkY="
},
{
"pname": "System.Xml.XmlDocument",
"version": "4.3.0",
"hash": "sha256-kbuV4Y7rVJkfMp2Kgoi8Zvdatm9CZNmlKB3GZgANvy4="
},
{
"pname": "System.Xml.XmlSerializer",
"version": "4.0.11",
"hash": "sha256-v6x4d6W18dijG5cDqQmVHdtWRf6Y4OkdBolT3d5g3wY="
},
{
"pname": "System.Xml.XmlSerializer",
"version": "4.3.0",
"hash": "sha256-IqTGPENWYoI06x2NHFPVtHlLEq9tazbom32bFLom6h4="
},
{
"pname": "System.Xml.XPath",
"version": "4.0.1",
"hash": "sha256-lQCoK2M51SGRuGjfiuIW26Y2goABY2RLE6cZ4816WDo="
},
{
"pname": "System.Xml.XPath.XmlDocument",
"version": "4.0.1",
"hash": "sha256-bK9AfAYrdSipdRbmo8Rk7394ku92UFNe2TEQF5+k/lA="
},
{
"pname": "Validation",
"version": "2.4.15",
"hash": "sha256-UpT+aE6yD48RMwXZZpAaUn71CBaBBZ1tLvzgk/YHxvM="
},
{
"pname": "WindowsAzure.Storage",
"version": "9.3.1",
"hash": "sha256-tNXGq1PYJcGXzlGC+W32dzWxIAt0ZsOWIRbnewX8k/8="
},
{
"pname": "xunit",
"version": "2.4.0",
"hash": "sha256-xRxQfuu87qJYTIeRZf4OdAUTwf8dL8Am6cQgk6tRHrs="
},
{
"pname": "xunit.abstractions",
"version": "2.0.2",
"hash": "sha256-w5APCW7suBdoDOmQqm/8Gq6+Sk88JcTR09zjmj9s17E="
},
{
"pname": "xunit.analyzers",
"version": "0.10.0",
"hash": "sha256-8lRZhogXHYksa9ChnkFXpBnTMlLlYIvu3Av7qQYWwJY="
},
{
"pname": "xunit.assert",
"version": "2.4.0",
"hash": "sha256-WqB8mVJUAsvLdZTOoSLmNhk0DKM2DSZqHFDDzwD9Jt0="
},
{
"pname": "xunit.core",
"version": "2.4.0",
"hash": "sha256-dt59aoFjpqlbcPFGwPrzOSEBSPIn33tLcLraK8xEntE="
},
{
"pname": "xunit.extensibility.core",
"version": "2.2.0",
"hash": "sha256-et3Se7paKJlg8Ha4Xr9+He40M6vblxyOwS2BQxOgLlE="
},
{
"pname": "xunit.extensibility.core",
"version": "2.4.0",
"hash": "sha256-LbuXEcEJjGn3L6FCbC119+MY/QLvfLlGkCeAsCsZqGE="
},
{
"pname": "xunit.extensibility.execution",
"version": "2.2.0",
"hash": "sha256-BCt7rslK7jGH6xFSVTDrE3R3qyHgumC65hpilDwqKpI="
},
{
"pname": "xunit.extensibility.execution",
"version": "2.4.0",
"hash": "sha256-chRJEazwq93yhVONlbtTI1znqYy0gdAoQajPRnhM/i4="
},
{
"pname": "xunit.runner.visualstudio",
"version": "2.4.0",
"hash": "sha256-qjRuSbBkV1qMOM7n8eNDhoP7gdt4zuKyuiyUxldG8uE="
},
{
"pname": "Xunit.SkippableFact",
"version": "1.3.6",
"hash": "sha256-GKcQkNM2bUEO0fWB8wciipNjBQ5AukUub5SkstvnlLw="
},
{
"pname": "YamlDotNet",
"version": "6.0.0",
@@ -30,7 +30,16 @@ buildDotnetModule {
executables = [ "func" ];
nugetDeps = ./deps.json;
dotnet-sdk = dotnetCorePackages.sdk_10_0;
dotnet-sdk = dotnetCorePackages.sdk_10_0 // {
inherit
(dotnetCorePackages.combinePackages [
dotnetCorePackages.sdk_9_0
dotnetCorePackages.sdk_8_0
])
packages
targetPackages
;
};
nativeBuildInputs = [ go ];
linkNuGetPackagesAndSources = true;
+3 -3
View File
@@ -29,18 +29,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "bcachefs-tools";
version = "1.36.1";
version = "1.37.1";
src = fetchFromGitHub {
owner = "koverstreet";
repo = "bcachefs-tools";
tag = "v${finalAttrs.version}";
hash = "sha256-15Z1lHNeXTToDpdVc/YB5ojhoiB5qdgWs47O1aKoyFM=";
hash = "sha256-6w7Ig6wJKmWxkS730CZKFkEqefIQDJI+OJHPPJ3aPEk=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) src;
hash = "sha256-YWsJUSgKNkK9W4Yuolix21bRRFSF01+sivoj7SJo7DY=";
hash = "sha256-mNexPIDeUwJYKsM8Hzeh5opfLk9Wf4bHRlwUZLnLAKo=";
};
postPatch = ''
+2 -2
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "bgpq4";
version = "1.15";
version = "1.16";
src = fetchFromGitHub {
owner = "bgp";
repo = "bgpq4";
tag = finalAttrs.version;
sha256 = "sha256-3mfFj9KoQbDe0gH7Le03N1Yds/bTEmY+OiXNaOtHkpY=";
sha256 = "sha256-6pUwfySR7EWr53V0kj+cHXNFYoUZphhnbTs9TVrZzVk=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule (finalAttrs: {
pname = "buildkite-cli";
version = "3.32.0";
version = "3.32.2";
src = fetchFromGitHub {
owner = "buildkite";
repo = "cli";
tag = "v${finalAttrs.version}";
hash = "sha256-ug7hgHQe+opQwQl3cdyqJR/JVq+pnw2cVe766Fwgqxk=";
hash = "sha256-7jBYi9KGkeB6Pu4VDR8QSTG3U4QFFVih3MUp2Sldpqo=";
};
vendorHash = "sha256-pYdo9jAJldAwGmWup27BDZ9Wd9BpK6ILTXioAGWOERo=";
vendorHash = "sha256-yi77gGlBIGEQQbYVVsQP74IVFuZo5GAPOdgYmaDnBAs=";
ldflags = [
"-s"
+3 -3
View File
@@ -12,19 +12,19 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "bumpp";
version = "10.4.1";
version = "11.0.0";
src = fetchFromGitHub {
owner = "antfu-collective";
repo = "bumpp";
tag = "v${finalAttrs.version}";
hash = "sha256-cYtk7gE2TYgrFUoa2HV56/qTSX/Dojlo+eDwWRGQr1c=";
hash = "sha256-opZYlEQSZo6V+McFy6gFMfchLYuu5oEP4XuqEkd18F0=";
};
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
fetcherVersion = 2;
hash = "sha256-/Yz5Gas3OsqdLAiuZRwGTTcIS/UR1WWms01vU1WxlCo=";
hash = "sha256-rI0DhnncVWd4Wp5pvTnL8IerXbFDwJzkhC4uIe6WJto=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -14,7 +14,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "buteo-syncfw";
version = "0.11.10";
version = "0.11.11";
outputs = [
"out"
@@ -26,12 +26,12 @@ stdenv.mkDerivation (finalAttrs: {
owner = "sailfishos";
repo = "buteo-syncfw";
tag = finalAttrs.version;
hash = "sha256-WZ70dFrQeHO0c9MM3wS8aWMd0DDhTW9Ks4hhw7pPmu8=";
hash = "sha256-t69jUOTCyVWlbEinCesm8YVnYuT+SQ10z+2GXAtAPTA=";
};
postPatch = ''
# Wildcard breaks file installation (tries to run ~ "install source/* target/*")
substituteInPlace doc/doc.pri \
substituteInPlace doc/doc.pro \
--replace-fail 'htmldocs.files = $${PWD}/html/*' 'htmldocs.files = $${PWD}/html' \
--replace-fail '/usr/share/doc' "$doc/share/doc"
+4 -4
View File
@@ -5,7 +5,7 @@
"packages": {
"": {
"dependencies": {
"codebuff": "^1.0.623"
"codebuff": "^1.0.630"
}
},
"node_modules/@isaacs/fs-minipass": {
@@ -30,9 +30,9 @@
}
},
"node_modules/codebuff": {
"version": "1.0.623",
"resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.623.tgz",
"integrity": "sha512-2X9DAYduW0uWmEgXFPnq1fS+/aqsFiW38eHSDy2b0Zs18qx623VBx/Stu39sSWrwj20nH0Gzua1YYXXzxoen9A==",
"version": "1.0.630",
"resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.630.tgz",
"integrity": "sha512-KzPlptopDjOKgsFyii+amJR9iLbbhi4DVDZ++aFyMMz9piEqmnXh4oT6/PlOeWdHqFfMNZ1NURzxPa1QCcDv9A==",
"cpu": [
"x64",
"arm64"
+3 -3
View File
@@ -6,14 +6,14 @@
buildNpmPackage rec {
pname = "codebuff";
version = "1.0.623";
version = "1.0.630";
src = fetchzip {
url = "https://registry.npmjs.org/codebuff/-/codebuff-${version}.tgz";
hash = "sha256-UWYEgtxBIau8a0VN24J+ms4czUj0Dt0PVVq5v5RLfFc=";
hash = "sha256-4MXdEd1/wff6tpBg3ZWvDgK5l4ru4NBW3/Lnsl8a+MU=";
};
npmDepsHash = "sha256-kcbYnpyXHLAaVZkay1254SghxdFy/cuUpyt8hLDSISI=";
npmDepsHash = "sha256-s7+koNYCKeQ8dGEihm/3We8ZD0nhBXyrQ9oEzhohpL4=";
postPatch = ''
cp ${./package-lock.json} package-lock.json
+2 -2
View File
@@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "codespell";
version = "2.4.1";
version = "2.4.2";
pyproject = true;
src = fetchFromGitHub {
owner = "codespell-project";
repo = "codespell";
tag = "v${finalAttrs.version}";
sha256 = "sha256-9hr/QZcBESLukujzNKNjWGG3nXx+wkvQvoUYmYgtXv0=";
sha256 = "sha256-OMnkTXt6ok3ll9ocZMY4jdpYl3PlI2ZZtLuiMYrCRNI=";
};
nativeBuildInputs = with python3.pkgs; [
@@ -10,11 +10,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "copilot-language-server";
version = "1.448.0";
version = "1.453.0";
src = fetchzip {
url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip";
hash = "sha256-0baWiU6fwJFprJG05YpsXFWXj17ff920sL7hCGV83GI=";
hash = "sha256-TOzJhXCogARHgljy6DDG0AbsboAAwwReWEVVlAXzMss=";
stripRoot = false;
};
+2 -2
View File
@@ -11,13 +11,13 @@
buildGoModule (finalAttrs: {
pname = "croc";
version = "10.4.1";
version = "10.4.2";
src = fetchFromGitHub {
owner = "schollz";
repo = "croc";
rev = "v${finalAttrs.version}";
hash = "sha256-BUwb/M4+iXffZt2285fjw2UYBeqA5QVqUgQPy74EOtg=";
hash = "sha256-JZV02QZAS4OhnFdEB/EKm2FL0o4VmNSJIWNBdmIIdrE=";
};
vendorHash = "sha256-/qPBHpCdEu1uBFFwE7uzmCcm4EL8TxUWdjiaFlUSxIU=";
+63
View File
@@ -0,0 +1,63 @@
{
lib,
python3Packages,
fetchFromGitea,
makeWrapper,
libjpeg,
exiftool,
}:
python3Packages.buildPythonApplication (finalAttrs: {
pname = "cropgui";
version = "0.9";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "jepler";
repo = "cropgui";
tag = "v${finalAttrs.version}";
hash = "sha256-pmo36mWTwDzqE5osXUsM3YzOAPXewLjfrDHIg6hCYjY=";
};
pyproject = false;
nativeBuildInputs = [
makeWrapper
];
dependencies = with python3Packages; [
pillow
tkinter
];
installPhase = ''
runHook preInstall
mkdir -p $out/${python3Packages.python.sitePackages}
cp *.py $out/${python3Packages.python.sitePackages}
install -Dm755 cropgui.desktop $out/share/applications/cropgui.desktop
install -Dm644 cropgui.png $out/share/icons/hicolor/48x48/apps/cropgui.png
mkdir -p $out/bin
makeWrapper $out/${python3Packages.python.sitePackages}/cropgui.py $out/bin/cropgui \
--prefix PATH : ${
lib.makeBinPath [
libjpeg
exiftool
]
} \
--prefix PYTHONPATH : "$out/${python3Packages.python.sitePackages}:$PYTHONPATH"
runHook postInstall
'';
meta = {
description = "Gtk frontend for lossless cropping of jpeg images";
homepage = "https://codeberg.org/jepler/cropgui";
license = lib.licenses.gpl2Only;
maintainers = [ lib.maintainers.dwoffinden ];
mainProgram = "cropgui";
platforms = lib.platforms.all;
};
})
+2 -2
View File
@@ -14,11 +14,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "crowdin-cli";
version = "4.14.0";
version = "4.14.1";
src = fetchurl {
url = "https://github.com/crowdin/crowdin-cli/releases/download/${finalAttrs.version}/crowdin-cli.zip";
hash = "sha256-rNtCCnssMQgiTU4BrH8uUHjOuTyvrHqlKKFclhRrnZE=";
hash = "sha256-zlouZc7DtMYTHiDOLSCtawEKTMOKgqJe01gieRxeiFI=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -9,16 +9,16 @@
buildGo126Module (finalAttrs: {
pname = "crush";
version = "0.47.2";
version = "0.49.0";
src = fetchFromGitHub {
owner = "charmbracelet";
repo = "crush";
tag = "v${finalAttrs.version}";
hash = "sha256-Lmp2DYrlzxVnll9x1jcnw/QgYjhA9RHpciQZ7mAUK5Y=";
hash = "sha256-/1Z5S28yJCxjpQwM5hLTmgKU7OxAcxjmBROktQSstTE=";
};
vendorHash = "sha256-pBZdmQRnPfvhz66+DGQx/ZMMiYeKBfWThybw4RXsjno=";
vendorHash = "sha256-xakV5Alm3EwDk5VkSINxJM1C3uF492QzA+BQkqZ6qB4=";
ldflags = [
"-s"
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule (finalAttrs: {
pname = "dasel";
version = "3.3.0";
version = "3.3.1";
src = fetchFromGitHub {
owner = "TomWright";
repo = "dasel";
rev = "v${finalAttrs.version}";
hash = "sha256-3gLOAca5C4HfLqmF+1c1fDytA58JNml+18FYsWUhIQ0=";
hash = "sha256-h6AIu1Yavqezpl6yeMwdZ168SV7Rz19Mr7GtNeyDzpk=";
};
vendorHash = "sha256-hHxEE0xNSP4wnT5B13BAxUPpdIWs8v7KF1MuISfaYBE=";
+2 -2
View File
@@ -15,13 +15,13 @@
buildGoModule (finalAttrs: {
pname = "dcp";
version = "0.22.8";
version = "0.22.9";
src = fetchFromGitHub {
owner = "microsoft";
repo = "dcp";
tag = "v${finalAttrs.version}";
hash = "sha256-fhRTJYtkvPaPw73VZYvm8/GMhUqvnlBoazQziWXrH2U=";
hash = "sha256-DCrGMWoHmjV774dBAaqDR/B1SDZ8LVMm1GkZOOyWtP0=";
};
vendorHash = "sha256-MRsd0+ySmZ8FlX6RBfW1LSYc1RcTMYu0Ji+0uFEWH3M=";
@@ -0,0 +1,31 @@
diff --git a/cli-plugins/manager/manager_unix.go b/cli-plugins/manager/manager_unix.go
index f546dc3849..5e3ae08dbc 100644
--- a/cli-plugins/manager/manager_unix.go
+++ b/cli-plugins/manager/manager_unix.go
@@ -2,6 +2,11 @@
package manager
+import (
+ "os"
+ "path/filepath"
+)
+
// defaultSystemPluginDirs are the platform-specific locations to search
// for plugins in order of preference.
//
@@ -12,9 +17,8 @@
// 3. Platform-specific defaultSystemPluginDirs (as defined below).
//
// [ConfigFile.CLIPluginsExtraDirs]: https://pkg.go.dev/github.com/docker/cli@v26.1.4+incompatible/cli/config/configfile#ConfigFile.CLIPluginsExtraDirs
-var defaultSystemPluginDirs = []string{
- "/usr/local/lib/docker/cli-plugins",
- "/usr/local/libexec/docker/cli-plugins",
- "/usr/lib/docker/cli-plugins",
- "/usr/libexec/docker/cli-plugins",
+var defaultSystemPluginDirs []string
+
+func init() {
+ defaultSystemPluginDirs = filepath.SplitList(os.Getenv("DOCKER_CLI_PLUGIN_DIRS"))
}
+22 -1
View File
@@ -2,12 +2,22 @@
lib,
stdenv,
buildGoModule,
docker-buildx,
fetchFromGitHub,
installShellFiles,
makeBinaryWrapper,
versionCheckHook,
writableTmpDirAsHomeHook,
}:
let
dockerCliPlugins = [
docker-buildx
];
dockerCliPluginsDirs = lib.strings.concatStringsSep ":" (
map (p: "${p}/libexec/docker/cli-plugins") dockerCliPlugins
);
in
buildGoModule (finalAttrs: {
pname = "ddev";
version = "1.25.1";
@@ -19,7 +29,12 @@ buildGoModule (finalAttrs: {
hash = "sha256-kHGGUFX/xlmQsYxKPxSuRJHk2na9gU1Kd2jhNclAp5s=";
};
postPatch = ''
(cd vendor/github.com/docker/cli && patch ${./cli-system-plugin-dir-from-env.patch})
'';
nativeBuildInputs = [
makeBinaryWrapper
installShellFiles
];
@@ -34,7 +49,13 @@ buildGoModule (finalAttrs: {
# Tests need docker.
doCheck = false;
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
postInstall = ''
# make buildx available, it is a docker plugin which docker-compose uses and thus DDEV requires
# https://github.com/NixOS/nixpkgs/blob/43fc054052db6ca5df042dcbe823740aa6c9a7c2/pkgs/applications/virtualization/docker/default.nix#L339
wrapProgram $out/bin/ddev \
--prefix DOCKER_CLI_PLUGIN_DIRS : "${dockerCliPluginsDirs}"
''
+ lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
# DDEV will try to create $HOME/.ddev, so we set $HOME to a temporary
# directory.
export HOME=$(mktemp -d)
+3
View File
@@ -0,0 +1,3 @@
{
"dependencies": {}
}
+35
View File
@@ -0,0 +1,35 @@
{
lib,
buildDubPackage,
fetchFromGitHub,
}:
buildDubPackage (finalAttrs: {
pname = "ddhx";
version = "0.9.1";
src = fetchFromGitHub {
owner = "dd86k";
repo = "ddhx";
tag = "v${finalAttrs.version}";
hash = "sha256-AFhxrYncqVnHfro4sUgCT1ZBeL3CUwcwhnGXVuFQ9ak=";
};
dubLock = ./dub-lock.json;
installPhase = ''
runHook preInstall
install -Dm755 ddhx -t $out/bin
runHook postInstall
'';
doCheck = true;
meta = {
description = "Console text-mode hex editor, inspired by GNU nano and vim";
homepage = "https://github.com/dd86k/ddhx";
changelog = "https://github.com/dd86k/ddhx/releases/tag/v${finalAttrs.version}";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.ryand56 ];
platforms = lib.platforms.unix;
};
})
+3 -3
View File
@@ -27,15 +27,15 @@ assert lib.assertMsg (lib.elem true [
rustPlatform.buildRustPackage rec {
pname = "diesel-cli";
version = "2.3.6";
version = "2.3.7";
src = fetchCrate {
inherit version;
crateName = "diesel_cli";
hash = "sha256-CNcZd/wIUg4fKnCeT0O7k6Svldg+1RY0xGmp+Y+UFA8=";
hash = "sha256-E/g2xOB8rdu1Wa8bEI2dzAgHmS+36Q0oVm3v25tTzYE=";
};
cargoHash = "sha256-Yrf9vAVMLoWJpnKaM87gvQUPX2nw3USnU9/l1kYJpaY=";
cargoHash = "sha256-ndQpILbt4f4YFEV+KfwQ5Pr2QM+7RkmwzKYPLR4fQfo=";
nativeBuildInputs = [
installShellFiles
+2 -2
View File
@@ -17,13 +17,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "dosage";
version = "2.1.3";
version = "2.1.4";
src = fetchFromGitHub {
owner = "diegopvlk";
repo = "Dosage";
tag = "v${finalAttrs.version}";
hash = "sha256-nQbW2UUzd/Nz9NNjwQfbmbE/ywHSmadUmGJ/BDy/IuY=";
hash = "sha256-fp+BXT/HpoceFogn8oeRVEKGCqOVLTc8lca2epn3D78=";
};
# https://github.com/NixOS/nixpkgs/issues/318830
+2 -2
View File
@@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "doublecmd";
version = "1.2.1";
version = "1.2.3";
src = fetchFromGitHub {
owner = "doublecmd";
repo = "doublecmd";
tag = "v${finalAttrs.version}";
hash = "sha256-/R13Fwn3019uy+UUtih/CLiXHpFBSKKKKVYdOp29eXs=";
hash = "sha256-tnPNq6Ms5hzu5FLVg7QCzSMfRbfZ/HRPfitJI6zP8+8=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -20,7 +20,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "dpkg";
version = "1.23.5";
version = "1.23.7";
src = fetchgit {
url = "https://git.launchpad.net/ubuntu/+source/dpkg";
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
rm -rf .git
popd
'';
hash = "sha256-Ug82hdskTvWSzMZ8l+EdWhWAmt9OhS2pUpwOYa/9FLw=";
hash = "sha256-8Joo/pcizlbtuuiUL8ev6/00ru+lh8/hzEPsO7fm2R0=";
};
configureFlags = [
+3 -3
View File
@@ -12,7 +12,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "dprint";
version = "0.52.0";
version = "0.52.1";
# Prefer repository rather than crate here
# - They have Cargo.lock in the repository
@@ -21,10 +21,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
owner = "dprint";
repo = "dprint";
tag = finalAttrs.version;
hash = "sha256-IVqHaqpoMXM1xHFCyh1lbRjKQbt7ZuX4u9Q9AoWOyWU=";
hash = "sha256-CV0txMWYL9s11pA59D/RCt/s8GZ9LpUqOpEhK0yOhfA=";
};
cargoHash = "sha256-eLIkzAWt/7G73Fr2EXdVTYFd2QXqaYJvMM8SrKowbmU=";
cargoHash = "sha256-ca5e5wWRfMz+qCMbAUlMls8u+txcHgZ0R9dzN+dm1L4=";
nativeBuildInputs = [ installShellFiles ];
@@ -1,33 +0,0 @@
diff --git a/dep/CMakeLists.txt b/dep/CMakeLists.txt
index 633267c66..b5ab0904c 100644
--- a/dep/CMakeLists.txt
+++ b/dep/CMakeLists.txt
@@ -25,9 +25,8 @@ add_subdirectory(rcheevos EXCLUDE_FROM_ALL)
disable_compiler_warnings_for_target(rcheevos)
add_subdirectory(rapidyaml EXCLUDE_FROM_ALL)
disable_compiler_warnings_for_target(rapidyaml)
-add_subdirectory(cubeb EXCLUDE_FROM_ALL)
-disable_compiler_warnings_for_target(cubeb)
-disable_compiler_warnings_for_target(speex)
+find_package(cubeb REQUIRED GLOBAL)
+add_library(cubeb ALIAS cubeb::cubeb)
if(ENABLE_OPENGL)
add_subdirectory(glad EXCLUDE_FROM_ALL)
diff --git a/src/util/cubeb_audio_stream.cpp b/src/util/cubeb_audio_stream.cpp
index 52c7299c9..e20b52426 100644
--- a/src/util/cubeb_audio_stream.cpp
+++ b/src/util/cubeb_audio_stream.cpp
@@ -262,9 +262,9 @@ std::vector<std::pair<std::string, std::string>> AudioStream::GetCubebDriverName
std::vector<std::pair<std::string, std::string>> names;
names.emplace_back(std::string(), TRANSLATE_STR("AudioStream", "Default"));
- const char** cubeb_names = cubeb_get_backend_names();
- for (u32 i = 0; cubeb_names[i] != nullptr; i++)
- names.emplace_back(cubeb_names[i], cubeb_names[i]);
+ cubeb_backend_names backends = cubeb_get_backend_names();
+ for (u32 i = 0; i < backends.count; i++)
+ names.emplace_back(backends.names[i], backends.names[i]);
return names;
}
@@ -1,20 +0,0 @@
diff --git a/src/scmversion/gen_scmversion.sh b/src/scmversion/gen_scmversion.sh
index 0f8fa4239..2cc91a4a8 100755
--- a/src/scmversion/gen_scmversion.sh
+++ b/src/scmversion/gen_scmversion.sh
@@ -10,11 +10,11 @@ else
fi
-HASH=$(git rev-parse HEAD)
-BRANCH=$(git rev-parse --abbrev-ref HEAD | tr -d '\r\n')
-TAG=$(git describe --dirty | tr -d '\r\n')
+HASH="@gitHash@"
+BRANCH="@gitBranch@"
+TAG="@gitTag@"
VERSION=$(echo "${TAG}" | sed -E 's/-g[0-9a-f]+//')
-DATE=$(git log -1 --date=iso8601-strict --format=%cd)
+DATE="@gitDate@"
cd $CURDIR
-340
View File
@@ -1,340 +0,0 @@
{
lib,
llvmPackages,
stdenvNoCC,
fetchFromGitHub,
cmake,
pkg-config,
ninja,
extra-cmake-modules,
wayland-scanner,
qt6,
sdl3,
zstd,
libwebp,
zlib,
libpng,
libjpeg,
freetype,
plutosvg,
cpuinfo,
soundtouch,
rapidjson,
libzip,
curl,
libx11,
wayland,
shaderc,
spirv-cross,
udev,
libbacktrace,
ffmpeg-headless,
cubeb,
fetchurl,
zip,
unzip,
}:
let
passthru = {
updateScript = ./update.sh;
};
meta = {
description = "Fast PlayStation 1 emulator for x86-64/AArch32/AArch64/RV64";
longDescription = ''
DISCLAIMER: This is an **unofficial** package, do not report any
issues to duckstation developers. Instead, please report them to
<https://github.com/NixOS/nixpkgs> or use the officially
supported platform build at <https://duckstation.org> or other
upstream-approved distribution mechanism not listed here.
'';
homepage = "https://duckstation.org";
license = lib.licenses.cc-by-nc-nd-40;
maintainers = [ ];
};
pkgSources = lib.importJSON ./sources.json;
linuxDrv = llvmPackages.stdenv.mkDerivation (finalAttrs: {
pname = "duckstation";
version = "0.1-10413";
src = fetchFromGitHub {
owner = "stenzek";
repo = "duckstation";
tag = "v${finalAttrs.version}";
deepClone = true;
hash = "sha256-ytJ0vaXXbbgSmZ42gQPlQY7p30hz7hx/+09TSvCKyEg=";
postFetch = ''
cd $out
mkdir -p .nixpkgs-auxfiles/
git rev-parse HEAD > .nixpkgs-auxfiles/git_hash
git rev-parse --abbrev-ref HEAD | tr -d '\r\n' > .nixpkgs-auxfiles/git_branch
git describe | tr -d '\r\n' > .nixpkgs-auxfiles/git_tag
git log -1 --date=iso8601-strict --format=%cd > .nixpkgs-auxfiles/git_date
rm -rf .git
'';
};
patches = [
./cubeb-remove-vendor.patch
./git-version-info.patch
];
postPatch =
# Fixes compilation error with nixpkgs libapng
''
substituteInPlace src/util/animated_image.cpp \
--replace-fail "png_write_frame_head(png_ptr, info_ptr," \
"png_write_frame_head(png_ptr, info_ptr, 0,"
''
# Fills in git-info obtained in the `postFetch` step for version
# information in the UI
+ ''
gitHash=$(cat .nixpkgs-auxfiles/git_hash) \
gitBranch=$(cat .nixpkgs-auxfiles/git_branch) \
gitTag=$(cat .nixpkgs-auxfiles/git_tag) \
gitDate=$(cat .nixpkgs-auxfiles/git_date) \
substituteAllInPlace src/scmversion/gen_scmversion.sh
'';
vendorDiscordRPC = llvmPackages.stdenv.mkDerivation {
pname = "discord-rpc-duckstation";
inherit (finalAttrs) version;
src = fetchFromGitHub {
owner = "stenzek";
repo = "discord-rpc";
inherit (pkgSources.discord_rpc) rev hash;
};
nativeBuildInputs = [ cmake ];
buildInputs = [ rapidjson ];
meta = {
license = lib.licenses.mit;
platforms = lib.platforms.linux;
};
};
vendorShaderc = shaderc.overrideAttrs (oldAttrs: {
pname = "shaderc-duckstation";
inherit (finalAttrs) version;
src = fetchFromGitHub {
owner = "stenzek";
repo = "shaderc";
inherit (pkgSources.shaderc) rev hash;
};
patches = (oldAttrs.patches or [ ]);
cmakeFlags = (oldAttrs.cmakeFlags or [ ]) ++ [
(lib.cmakeBool "SHADERC_SKIP_EXAMPLES" true)
(lib.cmakeBool "SHADERC_SKIP_TESTS" true)
];
outputs = [
"out"
"lib"
"dev"
];
postFixup = null;
});
soundtouch = llvmPackages.stdenv.mkDerivation {
inherit (soundtouch)
pname
version
src
meta
;
nativeBuildInputs = [ cmake ];
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-fail "\''${prefix}/''${CMAKE_INSTALL_LIBDIR}" \
"''${CMAKE_INSTALL_FULL_LIBDIR}"
'';
cmakeFlags = [
(lib.cmakeBool "SOUNDTOUCH_DLL" true)
];
};
chtdb = stdenvNoCC.mkDerivation {
pname = "chtdb-duckstation";
version = "0-unstable-${pkgSources.chtdb.date}";
src = fetchFromGitHub {
owner = "duckstation";
repo = "chtdb";
inherit (pkgSources.chtdb) rev hash;
};
nativeBuildInputs = [
zip
];
buildPhase = ''
runHook preBuild
pushd cheats
zip -r cheats.zip *.cht
popd
pushd patches
zip -r patches.zip *.cht
popd
runHook postBuild
'';
installPhase = ''
runHook preInstall
install -Dm644 cheats/cheats.zip -t $out/lib/duckstation
install -Dm644 patches/patches.zip -t $out/lib/duckstation
install -Dm644 LICENSE -t $out/share/doc/duckstation
install -Dm644 README.md -t $out/share/doc/duckstation
runHook postInstall
'';
meta = {
description = "Collection of cheats and patches for PSX games";
longDescription = ''
Collection of cheats and patches for PSX games, primarily intended for
use with the DuckStation emulator, but can also be used by other
emulators that support GameShark codes.
Patches show in the UI in a separate section to cheats, and are
intended for modifications to the game that do not provide any
"advantage" to the player, including:
- Improving performance.
- Fixing game-breaking bugs.
- Unlocking the frame rate (e.g. "60 FPS patches").
- Widescreen rendering where the built-in widescreen
rendering rendering is insufficient.
'';
license = lib.licenses.mit;
inherit (meta) maintainers;
platforms = lib.platforms.all;
};
};
preConfigure = ''
cp ${finalAttrs.chtdb}/lib/duckstation/cheats.zip data/resources
cp ${finalAttrs.chtdb}/lib/duckstation/patches.zip data/resources
'';
nativeBuildInputs = [
cmake
pkg-config
ninja
extra-cmake-modules
wayland-scanner
qt6.wrapQtAppsHook
qt6.qttools
];
buildInputs = [
sdl3
zstd
libwebp
zlib
libpng
libjpeg
freetype
plutosvg
cpuinfo
libzip
curl
libx11
wayland
spirv-cross
qt6.qtbase
udev
libbacktrace
ffmpeg-headless
cubeb
]
++ [
finalAttrs.vendorDiscordRPC
finalAttrs.vendorShaderc
finalAttrs.soundtouch
];
installPhase = ''
runHook preInstall
mkdir -p $out/{lib,bin,share/{applications,icons/hicolor/512x512/apps}}
cp -r bin $out/lib/duckstation
ln -s $out/lib/duckstation/duckstation-qt $out/bin/duckstation-qt
pushd ..
install -Dm644 scripts/packaging/org.duckstation.DuckStation.desktop \
-t $out/share/applications
install -Dm644 scripts/packaging/org.duckstation.DuckStation.png \
-t $out/share/icons/hicolor/512x512/apps
install -Dm644 LICENSE -t $out/share/doc/duckstation
install -Dm644 README.* -t $out/share/doc/duckstation
install -Dm644 CONTRIBUTORS.md -t $out/share/doc/duckstation
popd
runHook postInstall
'';
qtWrapperArgs = [
"--prefix LD_LIBRARY_PATH : ${
(lib.makeLibraryPath [
ffmpeg-headless
finalAttrs.vendorShaderc
])
}"
];
inherit passthru;
meta = meta // {
mainProgram = "duckstation-qt";
platforms = lib.platforms.linux;
};
});
darwinDrv = stdenvNoCC.mkDerivation (finalAttrs: {
pname = "duckstation";
version = pkgSources.duckstation.version;
src = fetchurl {
url = "https://github.com/stenzek/duckstation/releases/download/v${finalAttrs.version}/duckstation-mac-release.zip";
hash = pkgSources.duckstation.hash_darwin;
};
nativeBuildInputs = [ unzip ];
dontPatch = true;
dontConfigure = true;
dontBuild = true;
sourceRoot = ".";
installPhase = ''
runHook preInstall
mkdir -p $out/Applications
cp -r DuckStation.app $out/Applications/DuckStation.app
runHook postInstall
'';
inherit passthru;
meta = meta // {
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
platforms = lib.platforms.darwin;
};
});
in
if stdenvNoCC.hostPlatform.isLinux then
linuxDrv
else if stdenvNoCC.hostPlatform.isDarwin then
darwinDrv
else
throw "duckstation is not supported on ${stdenvNoCC.hostPlatform.system}."
-19
View File
@@ -1,19 +0,0 @@
{
"duckstation": {
"version": "0.1-10413",
"hash_darwin": "sha256-TGXLpbTFkrFQ42LpRx0TKBsbdIRuYtseR+v3W/t9M10="
},
"discord_rpc": {
"rev": "cc59d26d1d628fbd6527aac0ac1d6301f4978b92",
"hash": "sha256-8xXcx5w36eiJqtWm6qQfhEHgchVJbhP/jR94eMNNjHU="
},
"shaderc": {
"rev": "85cd26cc38e3e8b5e3c649f4551900ee330d6552",
"hash": "sha256-7PVrpS69pI5mi4aM1eNTAzZCMq6vuVl3mhTrc4U942w="
},
"chtdb": {
"date": "2025-12-31",
"rev": "696e985e027d8d43a84c65bd349802dfe0944674",
"hash": "sha256-4t0x0YYp7rURBqVWyMZpnOATpIYoILQagyMASaSWKWM="
}
}
-75
View File
@@ -1,75 +0,0 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p coreutils nix nix-update curl jq
# shellcheck shell=bash
set -euo pipefail
location="$(dirname "${BASH_SOURCE[0]}")"
echo "checking for new tagged release (github:stenzek/duckstation)..."
old_version=$(nix --extra-experimental-features nix-command eval --raw -f . duckstation.src.tag)
new_version=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/stenzek/duckstation/tags?per_page=1" | jq -r '.[0].name')
if [[ $old_version == "$new_version" ]]; then
echo "'duckstation' is up-to-date ($old_version == $new_version)"
exit 0
fi
echo "Updating duckstation from $old_version -> $new_version"
nix-update --src-only --version "$new_version" duckstation
duckstation_darwin_hash=$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/stenzek/duckstation/releases/download/${new_version}/duckstation-mac-release.zip")")
echo "Vendor library update..."
duckstation_storepath=$(nix --extra-experimental-features "nix-command flakes" flake prefetch github:stenzek/duckstation/"$new_version" --json | jq -r '.storePath')
pinned_versions=$duckstation_storepath/scripts/deps/versions
echo "Using pinned discord_rpc..."
discord_rpc_rev=$(grep "DISCORD_RPC_COMMIT=" "$pinned_versions" | sed 's|.*=||g')
discord_rpc_hash=$(nix --extra-experimental-features "nix-command flakes" \
flake prefetch github:stenzek/discord-rpc/"$discord_rpc_rev" --json |
jq -r '.hash')
echo "Using pinned shaderc..."
shaderc_rev=$(grep "SHADERC_COMMIT=" "$pinned_versions" | sed 's|.*=||g')
shaderc_hash=$(nix --extra-experimental-features "nix-command flakes" flake prefetch github:stenzek/shaderc/"$shaderc_rev" --json | jq -r '.hash')
echo "Fetching latest chtdb commit..."
chtdb_json=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/duckstation/chtdb/commits?per_page=1")
chtdb_rev=$(echo "$chtdb_json" | jq -r '.[0].sha')
chtdb_date=$(echo "$chtdb_json" | jq -r '.[0].commit.author.date')
chtdb_hash=$(nix --extra-experimental-features "nix-command flakes" \
flake prefetch github:duckstation/chtdb/"$chtdb_rev" --json |
jq -r '.hash')
echo "Regenerating '""$location""/sources.json'"
JSON=$(
jq --null-input \
--arg new_version "${new_version:1}" \
--arg duckstation_darwin_hash "$duckstation_darwin_hash" \
--arg discord_rpc_rev "$discord_rpc_rev" \
--arg discord_rpc_hash "$discord_rpc_hash" \
--arg shaderc_rev "$shaderc_rev" \
--arg shaderc_hash "$shaderc_hash" \
--arg chtdb_rev "$chtdb_rev" \
--arg chtdb_date "${chtdb_date::10}" \
--arg chtdb_hash "$chtdb_hash" \
'{ "duckstation": {
"version": $new_version,
"hash_darwin": $duckstation_darwin_hash
},
"discord_rpc": {
"rev": $discord_rpc_rev,
"hash": $discord_rpc_hash
},
"shaderc": {
"rev": $shaderc_rev,
"hash": $shaderc_hash
},
"chtdb": {
"date": $chtdb_date,
"rev": $chtdb_rev,
"hash": $chtdb_hash
}
}'
)
echo "$JSON" | jq >"$location"/sources.json
@@ -0,0 +1,70 @@
commit 5bf22927f9e83dc3043e09370bb54815085a00ba
Author: complexlogic <complexlogic@users.noreply.github.com>
Date: Tue Aug 12 07:19:29 2025 -0700
Replace deprecated FFmpeg functions
diff --git a/src/config.hpp b/src/config.hpp
index ea9723c..1f6cc30 100644
--- a/src/config.hpp
+++ b/src/config.hpp
@@ -133,7 +133,11 @@ struct Config {
};
FDK fdk;
LAVC lavc;
+#if LIBAVCODEC_VERSION_MAJOR >= 62
+ int profile = AV_PROFILE_AAC_LOW;
+#else
int profile = FF_PROFILE_AAC_LOW;
+#endif
};
struct OGG {
int quality = VORBIS_DEFAULT_QUALITY;
diff --git a/src/transcode.cpp b/src/transcode.cpp
index 1ea286c..a0d6292 100644
--- a/src/transcode.cpp
+++ b/src/transcode.cpp
@@ -171,7 +171,16 @@ bool Transcoder::OutputFile::open(Codec out_codec, const InputFile &in_file, con
const auto &preset = config.opus.get_preset();
codec_ctx->bit_rate = determine_bitrate(preset.bit_rate, codec_ctx->ch_layout.nb_channels);
}
+#if LIBAVCODEC_VERSION_MAJOR >= 62
+ AVSampleFormat *fmts = nullptr;
+ if ((avcodec_get_supported_config(codec_ctx, codec, AV_CODEC_CONFIG_SAMPLE_FORMAT, 0, const_cast<const void**>(reinterpret_cast<void**>(&fmts)), nullptr) < 0) || !fmts) {
+ transcoder->logger.error("Could not find a valid sample format for the encoder");
+ return false;
+ }
+ codec_ctx->sample_fmt = fmts[0];
+#else
codec_ctx->sample_fmt = codec->sample_fmts[0];
+#endif
stream->time_base.den = codec_ctx->sample_rate;
stream->time_base.num = 1;
diff --git a/src/util.cpp b/src/util.cpp
index 6a52903..fa69d3a 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -158,13 +158,19 @@ int determine_sample_rate(Codec codec, const AVCodec *avcodec, int in_rate)
{
if (codec == Codec::MP3)
return std::min(48000, in_rate);
- if (!avcodec->supported_samplerates)
+ int *supported_samplerates = nullptr;
+#if LIBAVCODEC_VERSION_MAJOR >= 62
+ if ((avcodec_get_supported_config(nullptr, avcodec, AV_CODEC_CONFIG_SAMPLE_RATE, 0, const_cast<const void**>(reinterpret_cast<void**>(&supported_samplerates)), nullptr) < 0) || !supported_samplerates)
+#else
+ supported_samplerates = avcodec->supported_samplerates;
+ if (!supported_samplerates)
+#endif
return in_rate;
- const int *rate = avcodec->supported_samplerates;
+ const int *rate = supported_samplerates;
while (*(rate + 1))
rate++;
- while (rate > avcodec->supported_samplerates && (*rate - in_rate < 0))
+ while (rate > supported_samplerates && (*rate - in_rate < 0))
rate--;
return *rate;
}
@@ -27,6 +27,9 @@ stdenv.mkDerivation (finalAttrs: {
./0001-fix-project-name.patch
./0003-fix-darwin-app.patch
./0004-force-qt6.patch
# This has been committed upstream, but hasn't been released
# https://github.com/complexlogic/EasyAudioSync/commit/5bf22927f9e83dc3043e09370bb54815085a00ba
./0005-fix-ffmpeg-dep-functions.patch
];
nativeBuildInputs = [
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule (finalAttrs: {
pname = "easyjson";
version = "0.9.1";
version = "0.9.2";
src = fetchFromGitHub {
owner = "mailru";
repo = "easyjson";
rev = "v${finalAttrs.version}";
hash = "sha256-aKufvebodIy0UtecpjZ9+5MOUTWKFIqFI3SYgVPWdhQ=";
hash = "sha256-6QfPxh3Kx9d2a93LsIehgjwkSDMGR8VuSzk58mblvTo=";
};
vendorHash = "sha256-BsksTYmfPQezbWfIWX0NhuMbH4VvktrEx06C2Nb/FYE=";
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "easyrsa";
version = "3.2.5";
version = "3.2.6";
src = fetchFromGitHub {
owner = "OpenVPN";
repo = "easy-rsa";
rev = "v${finalAttrs.version}";
hash = "sha256-GD4KL8CqQ8U0ISrLm8zlnfi1AuYK0AZLiLuufEhZ7B0=";
hash = "sha256-xzCaUR97kS5pbUCTyV9i4lF59nudPJqnI7T2VkReJko=";
};
nativeBuildInputs = [ makeWrapper ];
+2 -2
View File
@@ -7,13 +7,13 @@
}:
llvmPackages.stdenv.mkDerivation rec {
pname = "enzyme";
version = "0.0.250";
version = "0.0.251";
src = fetchFromGitHub {
owner = "EnzymeAD";
repo = "Enzyme";
rev = "v${version}";
hash = "sha256-wyvYVI/HmCtBwIb1mIYJ/p2YQTH8fleP3xPUZsMeb1U=";
hash = "sha256-vUpBwl1HxMHVywJeoKp9YAWcNo8GSaq7ZjjcMfq9XNs=";
};
postPatch = ''
+2 -2
View File
@@ -14,11 +14,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "fasmg";
version = "l2fx";
version = "l45p";
src = fetchzip {
url = "https://flatassembler.net/fasmg.${finalAttrs.version}.zip";
sha256 = "sha256-np7HhVp1SaII25nPPJGtBB4325K/1S3rKqOudsBNeCk=";
sha256 = "sha256-0/P20DiRZbqZHoxWiBPs6wXqpbvRroisyF0dCdmd+j8=";
stripRoot = false;
};
@@ -6,11 +6,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "fcitx5-pinyin-moegirl";
version = "20260209";
version = "20260315";
src = fetchurl {
url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict";
hash = "sha256-ZpuAcS6KgVRL8ru+U///Zi7jiXLGIbSx6dPF0KWLvwQ=";
hash = "sha256-YnN1ArHyikV0kADquH2kwpk7cpiXKcL6YwUxVJXlQKM=";
};
dontUnpack = true;
+2 -2
View File
@@ -16,13 +16,13 @@
}:
let
pname = "feishin";
version = "1.8.0";
version = "1.9.0";
src = fetchFromGitHub {
owner = "jeffvli";
repo = "feishin";
tag = "v${version}";
hash = "sha256-sd6j3gPtNFN1hMiOMIiTICNH8mYJvO9FSXPqUFotis8=";
hash = "sha256-LcSe7aEtTDs4JIk50zI0IFgN4ZCSJ6NClfk02uO2Sg8=";
};
electron = electron_39;
+5 -3
View File
@@ -10,13 +10,13 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "ferron";
version = "2.5.5";
version = "2.6.0";
src = fetchFromGitHub {
owner = "ferronweb";
repo = "ferron";
tag = finalAttrs.version;
hash = "sha256-ljAt3ntKY0OR56QVWb1UQ/Id1OJaoM7CwkkAdNVs2sI=";
hash = "sha256-pKZ/oWmPzVvnGXTyTQ3VcgISH3hSReR+RdIvD4tzPso=";
};
# ../../ is cargoDepsCopy, and obviously does not contain monoio's README.md
@@ -25,7 +25,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
--replace-fail '#![doc = include_str!("../../README.md")]' ""
'';
cargoHash = "sha256-/ffeFawpcHA/wfrKY+Ub0EHeMMJb8+W4lhlVMAgICNQ=";
strictDeps = true;
cargoHash = "sha256-FimBeq21JhCSSkkSmSO3i7UEqOzJY2r36GXJFcorRT0=";
nativeBuildInputs = [
pkg-config
@@ -6,13 +6,13 @@
stdenv.mkDerivation {
pname = "finalmouse-udev-rules";
version = "0-unstable-2025-08-15";
version = "0-unstable-2026-01-27";
src = fetchFromGitHub {
owner = "teamfinalmouse";
repo = "xpanel-linux-permissions";
rev = "6b200ec39f1fa31edf6648f5ec3d5738c3770530";
hash = "sha256-Bo8XBvrUlZe0eVQlNQGb0xuTb+wecipsHwLdZpK0dUQ=";
rev = "49ba1bf19e7d1f05306baaf72e4514c1f12f139a";
hash = "sha256-+tStBzGrPop0zKNf0qIp2PCrVRy2CcFpIrvgft9YkbE=";
};
dontUnpack = true;
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
installPhase = ''
runHook preInstall
install -Dpm644 $src/99-finalmouse.rules $out/lib/udev/rules.d/70-finalmouse.rules
install -Dpm644 $src/70-finalmouse.rules $out/lib/udev/rules.d/70-finalmouse.rules
runHook postInstall
'';
+7 -7
View File
@@ -13,14 +13,14 @@
let
# These files can be found in Stockfish/src/evaluate.h
nnueBigFile = "nn-7e1657811c6d.nnue";
nnueBigHash = "sha256-fhZXgRxtckbnYk49wbxfUwnmzqctY+yJM706ewrUv6s=";
nnueBigFile = "nn-9a0cc2a62c52.nnue";
nnueBigHash = "sha256-mgzCpixSClN6rTrG6QiowJiqkAidyny8h0zCGXYYvyM=";
nnueBig = fetchurl {
url = "https://tests.stockfishchess.org/api/nn/${nnueBigFile}";
hash = nnueBigHash;
};
nnueSmallFile = "nn-37f18f62d772.nnue";
nnueSmallHash = "sha256-N/GPYtdy8xB+HWqso4mMEww8hvKrY+ZVX7vKIGNaiZ0=";
nnueSmallFile = "nn-47fc8b7fff06.nnue";
nnueSmallHash = "sha256-R/yLf/8GfSQEdJO4TkKrhVwPzrUFjAFsafjuXE7kvWk=";
nnueSmall = fetchurl {
url = "https://tests.stockfishchess.org/api/nn/${nnueSmallFile}";
hash = nnueSmallHash;
@@ -28,13 +28,13 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "fishnet";
version = "2.13.1";
version = "2.13.2";
src = fetchFromGitHub {
owner = "lichess-org";
repo = "fishnet";
tag = "v${finalAttrs.version}";
hash = "sha256-59hAohEw6TQU8rKbYx9LdZKWaE5HNOWiYMouTqj4Hjo=";
hash = "sha256-0ArTovfr9znjudo53W5hnnSZlzfEnAd7E+7DXTqtN6w=";
fetchSubmodules = true;
};
@@ -45,7 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
cp -v '${nnueSmall}' 'Fairy-Stockfish/src/${nnueSmallFile}'
'';
cargoHash = "sha256-lI+1HVR8xQwAgH3CB1Y9JQmfw0taoLBTEz14zFxeiCg=";
cargoHash = "sha256-mkioBmawYR5GvR0WSlaicGyXV4EVVVQuai5UF5+Thk8=";
nativeInstallCheckInputs = [
versionCheckHook
+2 -2
View File
@@ -6,11 +6,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "fleng";
version = "20";
version = "23";
src = fetchurl {
url = "http://www.call-with-current-continuation.org/fleng/fleng-${finalAttrs.version}.tgz";
hash = "sha256-kkouDNbdVGE7vskmu8kISA/RHIGed5vLY/ch4qgew3g=";
hash = "sha256-I8ksy3UAah/LTvtNrzjhw5vNUM55ba80ivo4S/r5yHg=";
};
doCheck = true;
+3 -3
View File
@@ -13,16 +13,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "forgejo-cli";
version = "0.4.0";
version = "0.4.1";
src = fetchFromCodeberg {
owner = "forgejo-contrib";
repo = "forgejo-cli";
tag = "v${finalAttrs.version}";
hash = "sha256-EJr/7me2wiOBSFw0VFSxyqnQKy3kpOMGJmxD7wxmWPc=";
hash = "sha256-tWb5h0i3Z8qSHqFL7FofwljMdXgV1Z6x8ojut9pm6Yg=";
};
cargoHash = "sha256-DpQt76o3ZnIJwHR1DQ/mn9f8XiWHKVB4h3NNbvCIMZ8=";
cargoHash = "sha256-7gCzU7U8kIxWnwLksXIUkgfFWWjZ/0QiaHnCD+H8sGQ=";
nativeBuildInputs = [
pkg-config
+2 -2
View File
@@ -11,13 +11,13 @@
}:
buildGoModule (finalAttrs: {
pname = "foxglove-cli";
version = "1.0.29";
version = "1.0.30";
src = fetchFromGitHub {
owner = "foxglove";
repo = "foxglove-cli";
tag = "v${finalAttrs.version}";
hash = "sha256-VPL6WdolcdymPWgsyBaISGDT8tkAJa6lH073D5dZI3Y=";
hash = "sha256-1PfCiCayRJYian+KY6A3WB68o+m+QAufPUx9X4uVqvc=";
};
vendorHash = "sha256-nRd9d3LJIrWoO+CQdbWLs249rOYmzfIf4u6x5dBDA2Y=";
@@ -7,16 +7,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "framework-tool-tui";
version = "0.8.0";
version = "0.8.2";
src = fetchFromGitHub {
owner = "grouzen";
repo = "framework-tool-tui";
tag = "v${finalAttrs.version}";
hash = "sha256-hTNSpjY0WkyXZpDGEM1eKQLFt/bhB5l/PSGd6bbDPAo=";
hash = "sha256-aB1VO6BCIGd3tWNWBytpvH6yr9+T6tw8I3P+ZYrNDQo=";
};
cargoHash = "sha256-SkZpYFu9yJX2qTeTNoCEFJP1jQNqfK7DQj3JlBCqDmo=";
cargoHash = "sha256-rl0TQERv7ykog8Eu9wj30oLEg9lqtVCVEFSAbeL1Zek=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ udev ];
+3 -3
View File
@@ -14,16 +14,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "g3proxy";
version = "1.12.2";
version = "1.12.3";
src = fetchFromGitHub {
owner = "bytedance";
repo = "g3";
tag = "g3proxy-v${finalAttrs.version}";
hash = "sha256-zh++wptu1hukQ+Bm5AWhjrLLyLuAb4owfJwDztfKnwY=";
hash = "sha256-oVjHJPLNWV2bSJcm7La1z0M93kooYBZ+lSayYQ4aUxg=";
};
cargoHash = "sha256-JNRH2IFUwzHarZZLxmYgyWr5lO1UX8H38EbmGoXebKo=";
cargoHash = "sha256-zHnvrSI3NLyL7eP5PjB0xvLC7SjG/4UifR3OlqwwVIg=";
cargoBuildFlags = [
"-p"
@@ -30,7 +30,7 @@ buildDotnetModule rec {
projectFile = [ "GalaxyBudsClient/GalaxyBudsClient.csproj" ];
nugetDeps = ./deps.json;
dotnet-sdk = dotnetCorePackages.sdk_10_0;
dotnet-sdk = dotnetCorePackages.sdk_10_0_1xx;
dotnet-runtime = dotnetCorePackages.runtime_10_0;
dotnetFlags =
lib.optionals stdenv.hostPlatform.isx86_64 [ "-p:Runtimeidentifier=linux-x64" ]
+2 -2
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ggml";
version = "0.9.7";
version = "0.9.8";
src = fetchFromGitHub {
owner = "ggml-org";
repo = "ggml";
tag = "v${finalAttrs.version}";
hash = "sha256-xTNDenY+1Tf7Nqr/EnXtYejpqU/guemySKR2WFvY9d0=";
hash = "sha256-XYBlyIALMNEZ54KiKqxczOCUnUckSqPUJ+xQYCJAMpE=";
};
# The cmake package does not handle absolute CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_INCLUDEDIR
+3 -3
View File
@@ -16,16 +16,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "gleam";
version = "1.14.0";
version = "1.15.0";
src = fetchFromGitHub {
owner = "gleam-lang";
repo = "gleam";
tag = "v${finalAttrs.version}";
hash = "sha256-KAk5tz7Dlq6cxNv3CTd8lOx7lxuK5do6aSajp0NFBw0=";
hash = "sha256-y4D4e2zpa3WxUcO0XtuiY8KP+Y1LkNHKK675ZqbOHDU=";
};
cargoHash = "sha256-v7+D8mlvJbEjJZinLYHum93PuHOWBVzJKno19qPbZWs=";
cargoHash = "sha256-e0MwqNJHiKoPaWxI38codA3BcYp3j1kcnrvFzPc8roE=";
nativeBuildInputs = [
pkg-config
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "glrnvim";
version = "1.5.0";
version = "1.6.0";
src = fetchFromGitHub {
owner = "beeender";
repo = "glrnvim";
rev = "v${finalAttrs.version}";
hash = "sha256-fyJ3k1CBrxL6It8x9jNumzCuhXug6eB/fuvPUQYEc4A=";
hash = "sha256-gfcSii45EH6+3nwoUqZv47EPh3ISQE7SeHJWeTXOQz8=";
};
cargoHash = "sha256-xDa2aMWx09dEbRDops2HwYSl/KMA7CeFqS2bnxX/8w8=";
cargoHash = "sha256-8sKY5uqWap01klJlZ3CnLAqRFeRSbt7K7jRL8XPDBQ4=";
postInstall = ''
install -Dm644 glrnvim.desktop -t $out/share/applications
+6 -6
View File
@@ -9,26 +9,26 @@
buildGoModule (finalAttrs: {
pname = "gnmic";
version = "0.44.1";
version = "0.45.0";
src = fetchFromGitHub {
owner = "openconfig";
repo = "gnmic";
tag = "v${finalAttrs.version}";
hash = "sha256-aAVjc5U0/fd9hOKCyVMopInkX4geJvuy48nHecKKzUQ=";
hash = "sha256-O8Vf6aiSqljSGOpWfgXCgeE7j6jDz7wXuPaDD9OliMA=";
};
vendorHash = "sha256-V6tnsCszkruLnAOCCysOYmPioHNQpdsQu0GZUf+36SE=";
vendorHash = "sha256-HU+SvdjVOixsUot2rV8NNQCc+X1o4Moyr7B2BOBStYY=";
ldflags = [
"-s"
"-w"
"-X"
"github.com/openconfig/gnmic/pkg/app.version=${finalAttrs.version}"
"github.com/openconfig/gnmic/pkg/version.Version=${finalAttrs.version}"
"-X"
"github.com/openconfig/gnmic/pkg/app.commit=${finalAttrs.src.rev}"
"github.com/openconfig/gnmic/pkg/version.Commit=${finalAttrs.src.rev}"
"-X"
"github.com/openconfig/gnmic/pkg/app.date=1970-01-01T00:00:00Z"
"github.com/openconfig/gnmic/pkg/version.Date=1970-01-01T00:00:00Z"
];
subPackages = [ "." ];
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule (finalAttrs: {
pname = "go-swagger";
version = "0.33.1";
version = "0.33.2";
src = fetchFromGitHub {
owner = "go-swagger";
repo = "go-swagger";
tag = "v${finalAttrs.version}";
hash = "sha256-CVfGKkqneNgSJZOptQrywCioSZwJP0XGspVM3S45Q/k=";
hash = "sha256-8BMO7rItteXSc0qdfjrgYN/Zfm2hIzTvI2SHY3nxyX4=";
};
vendorHash = "sha256-x3fTIXmI5NnOKph1D84MHzf1Kod+WLYn1JtnWLr4x+U=";
vendorHash = "sha256-3eebNmeYz207chEej/2jcjgqq/zcckm1KwuWHA8O6cw=";
doCheck = false;
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule (finalAttrs: {
pname = "goeland";
version = "0.21.0";
version = "0.22.1";
src = fetchFromGitHub {
owner = "slurdge";
repo = "goeland";
rev = "v${finalAttrs.version}";
sha256 = "sha256-Yw9FRI4TdfqCLdZCTA+y1y8TaD0flp1sP1aKYvd8PGM=";
sha256 = "sha256-7npQ04o2GvbOJt1zS7W+VFs38OnNG8VS7Qs7jM79yBg=";
};
vendorHash = "sha256-FfdHOYrpVilter80arOtwn+qJV56gIh6Ml64ekPs+DE=";
vendorHash = "sha256-OLgE9PU1/swoHZZG82zAEB1XygZjpK0wrqoGG/4Akvw=";
ldflags = [
"-s"
+6 -6
View File
@@ -1,7 +1,7 @@
{
lib,
stdenv,
buildGoModule,
buildGo126Module,
fetchFromGitHub,
autoPatchelfHook,
copyDesktopItems,
@@ -18,13 +18,13 @@
let
pname = "gui-for-singbox";
version = "1.19.0";
version = "1.21.0";
src = fetchFromGitHub {
owner = "GUI-for-Cores";
repo = "GUI.for.SingBox";
tag = "v${version}";
hash = "sha256-CY5i5+ObqPVCPiqHLttjxhMOi9fiHp5HWX33fq43txw=";
hash = "sha256-IGsH8QHoj2CvrSEc9eIisxySXQkjPSDBXsCPOXqANVM=";
};
metaCommon = {
@@ -54,7 +54,7 @@ let
;
pnpm = pnpm_10;
fetcherVersion = 2;
hash = "sha256-AHGPAYw/6FRKO2FY1J84NrLcp+bZOclOF6UFY61npFI=";
hash = "sha256-dWqwEnXPT+5N+36szm4AF1ChM9M6UJltct+EtQAofGQ=";
};
buildPhase = ''
@@ -80,7 +80,7 @@ let
});
in
buildGoModule {
buildGo126Module {
inherit pname version src;
patches = [ ./xdg-path-and-restart-patch.patch ];
@@ -91,7 +91,7 @@ buildGoModule {
--subst-var out
'';
vendorHash = "sha256-xQ6TeVoBe8906+/5X1q4e5QHVo+KHymB+yoxM+Obk18=";
vendorHash = "sha256-EeIxt0BzSaZh1F38btUXN9kAvj12nlqEerVgWVGkiuk=";
nativeBuildInputs = [
autoPatchelfHook
@@ -1,27 +1,9 @@
--- a/bridge/bridge.go
+++ b/bridge/bridge.go
@@ -55,9 +55,14 @@ func CreateApp(fs embed.FS) *App {
app := NewApp()
- if Env.OS == "darwin" {
- createMacOSSymlink()
- createMacOSMenus(app)
+ if Env.OS == "linux" || Env.OS == "darwin" {
+ userConfigDir, err := os.UserConfigDir()
+ if err == nil {
+ targetPath := filepath.Join(userConfigDir, Env.AppName)
+ if err := os.MkdirAll(targetPath, 0755); err == nil {
+ Env.BasePath = targetPath
+ }
+ }
}
if Env.OS == "windows" {
@@ -80,7 +85,10 @@ func (a *App) IsStartup() bool {
}
@@ -93,7 +93,10 @@
func (a *App) RestartApp() FlagResult {
log.Printf("RestartApp")
- exePath := Env.BasePath + "/" + Env.AppName
+ exePath, err := os.Executable()
+ if err != nil {
+81 -44
View File
@@ -8,19 +8,20 @@
curl,
eigen,
faust,
fetchpatch2,
fftwSinglePrec,
gettext,
glib,
glib-networking,
glibmm,
adwaita-icon-theme,
gsettings-desktop-schemas,
gperf,
gtk3,
gtkmm3,
hicolor-icon-theme,
intltool,
ladspaH,
libjack2,
liblo,
libsndfile,
lilv,
lrdf,
@@ -28,19 +29,30 @@
pkg-config,
python3,
sassc,
serd,
sord,
sratom,
wafHook,
which,
wrapGAppsHook3,
zita-convolver,
zita-resampler,
optimizationSupport ? false, # Enable support for native CPU extensions
enableFaust ? false, # Transpiles Faust DSP code to C++
enableGperf ? false, # Regenerates gperf files
enableOptimization ? # Enables support for native CPU extensions
if optimizationSupport != null then
lib.warn "`optimizationSupport` is deprecated in guitarix; use `enableOptimization` instead." optimizationSupport
else
false,
enableNSM ? true, # Enables NSM support
enableSse ? stdenv.hostPlatform.isx86, # Enables support for SSE CPU extensions
optimizationSupport ? null,
withAvahi ? true,
withBluez ? stdenv.hostPlatform.isLinux,
withLiblo ? enableNSM,
withZitaConvolver ? true,
withZitaResampler ? true,
}:
let
inherit (lib) optional;
in
assert enableNSM -> withLiblo;
stdenv.mkDerivation (finalAttrs: {
pname = "guitarix";
@@ -49,36 +61,40 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "brummer10";
repo = "guitarix";
rev = "V${finalAttrs.version}";
tag = "V${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-YQqcpdehfC9UE1OowC1/YUw2eWgbLWMbAJ3V5tVmtiU=";
};
sourceRoot = "${finalAttrs.src.name}/trunk";
strictDeps = true;
nativeBuildInputs = [
gettext
hicolor-icon-theme
intltool
pkg-config
python3
sassc
wafHook
wrapGAppsHook3
];
]
++ lib.optionals enableFaust [
faust
which
]
++ lib.optional enableGperf gperf;
buildInputs = [
avahi
bluez
boost
curl
eigen
faust
fftwSinglePrec
gettext
glib
glib-networking.out
glibmm
adwaita-icon-theme
gsettings-desktop-schemas
gtk3
gtkmm3
ladspaH
@@ -87,14 +103,34 @@ stdenv.mkDerivation (finalAttrs: {
lilv
lrdf
lv2
sassc
serd
sord
sratom
zita-convolver
zita-resampler
]
++ lib.optional withAvahi avahi
++ lib.optional withBluez bluez
++ lib.optional withLiblo liblo
++ lib.optional withZitaConvolver zita-convolver
++ lib.optional withZitaResampler zita-resampler;
patchFlags = [ "-p2" ];
patches = [
# Remove the mandatory check for `boost_system` which was removed in boost 1.89
(fetchpatch2 {
name = "make-boost-system-stub-optional.patch";
url = "https://github.com/brummer10/guitarix/compare/v0.47.0..187670358ffc47a0fa09e140586b2e88dfdcf043.patch?full_index=1";
hash = "sha256-9Z0sAM/oTm3ejv9chDbXEpkjNvlX/SN+k48XaJTqdy0=";
includes = [
"trunk/waf"
"*/wscript"
"trunk/waftools/*.py"
];
})
];
# There are many bad shebangs which can fail builds.
# See `https://github.com/brummer10/guitarix/issues/246`.
postPatch = ''
patchShebangs --build tools/**
'';
wafConfigureFlags = [
"--no-font-cache-update"
"--shared-lib"
@@ -102,34 +138,34 @@ stdenv.mkDerivation (finalAttrs: {
"--enable-nls"
"--install-roboto-font"
]
++ optional optimizationSupport "--optimization";
env.NIX_CFLAGS_COMPILE = toString [ "-fpermissive" ];
# Use explicit flags to guarantee correct configuration
++ lib.optional enableFaust "--faust" # Force waf to use the provided faust
++ lib.optional (!enableFaust) "--no-faust"
++ lib.optional (!enableNSM) "--no-nsm"
++ lib.optional enableOptimization "--optimization"
++ lib.optional (!enableSse) "--disable-sse"
++ lib.optional (!withAvahi) "--no-avahi"
++ lib.optional (!withBluez) "--no-bluez"
++ lib.optional (!withZitaConvolver) "--includeconvolver"
++ lib.optional (!withZitaResampler) "--includeresampler";
meta = {
description = "Virtual guitar amplifier for Linux running with JACK";
mainProgram = "guitarix";
longDescription = ''
guitarix is a virtual guitar amplifier for Linux running with
JACK (Jack Audio Connection Kit). It is free as in speech and
free as in beer. Its free sourcecode allows to build it for
other UNIX-like systems also, namely for BSD and for MacOSX.
Guitarix takes the signal from your guitar as any real amp would do: as a
mono-signal from your sound card. Your tone is processed by a main amp and
a rack-section. Both can be routed separately and deliver a processed
stereo-signal via JACK. You may fill the rack with effects from more than
25 built-in modules spanning from a simple noise-gate to brain-slashing
modulation-fx like flanger, phaser or auto-wah. Your signal is processed
with minimum latency. On a properly set-up Linux-system you do not need to
wait for more than 10 milliseconds for your playing to be delivered,
processed by guitarix.
It takes the signal from your guitar as any real amp would do:
as a mono-signal from your sound card. Your tone is processed by
a main amp and a rack-section. Both can be routed separately and
deliver a processed stereo-signal via JACK. You may fill the
rack with effects from more than 25 built-in modules spanning
from a simple noise-gate to brain-slashing modulation-fx like
flanger, phaser or auto-wah. Your signal is processed with
minimum latency. On any properly set-up Linux-system you do not
need to wait for more than 10 milli-seconds for your playing to
be delivered, processed by guitarix.
guitarix offers the range of sounds you would expect from a
full-featured universal guitar-amp. You can get crisp
clean-sounds, nice overdrive, fat distortion and a diversity of
crazy sounds never heard before.
Guitarix offers the range of sounds you would expect from a full-featured
universal guitar-amp. You can get crisp clean-sounds, nice overdrive, fat
distortion and a diversity of crazy sounds never heard before.
'';
homepage = "https://github.com/brummer10/guitarix";
license = lib.licenses.gpl3Plus;
@@ -137,6 +173,7 @@ stdenv.mkDerivation (finalAttrs: {
lord-valen
anderscs
];
# TODO: This potentially also works on darwin and BSD.
platforms = lib.platforms.linux;
};
})
+3 -3
View File
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "gws";
version = "0.6.3";
version = "0.16.0";
src = fetchFromGitHub {
owner = "googleworkspace";
repo = "cli";
tag = "v${finalAttrs.version}";
hash = "sha256-8vRBW7RUwHHAvAiF8WahkRh0pH205UiuJloY0DgFwLM=";
hash = "sha256-yirGdRHIexO9I0KLyU5jnNqWUG7Xw/iQ0F93SkkzNi0=";
};
cargoHash = "sha256-tIJikoRFbUYYlkOjfWoPogoB+yhY80TTtSzEXgSEP8A=";
cargoHash = "sha256-M9uflVP8J7vRPYoBZ9GE/aq7nj6dFJa636HQrvR3nXs=";
nativeBuildInputs = [ pkg-config ];
+20 -9
View File
@@ -3,6 +3,7 @@
stdenv,
fetchFromGitHub,
cmake,
cppcheck,
doxygen,
graphviz,
pkg-config,
@@ -10,7 +11,7 @@
nix-update-script,
}:
let
version = "4.2.0";
version = "5.0.0";
versionPrefix = "gz-cmake${lib.versions.major version}";
in
stdenv.mkDerivation (finalAttrs: {
@@ -21,33 +22,42 @@ stdenv.mkDerivation (finalAttrs: {
owner = "gazebosim";
repo = "gz-cmake";
tag = "${versionPrefix}_${finalAttrs.version}";
hash = "sha256-+bMOcGWfcwPhxR9CBp4iH02CZC4oplCjsTDpPDsDnSs=";
hash = "sha256-XF7oglj9Xr6F8a+6uowrY5a040yl4FZlFfW/Y0BJwOs=";
};
postPatch = ''
patchShebangs examples/test_c_child_requires_c_no_deps.bash
substituteInPlace examples/CMakeLists.txt --replace-fail \
"$""{CMAKE_INSTALL_LIBDIR}" "${if stdenv.hostPlatform.isDarwin then "lib" else "lib64"}"
substituteInPlace examples/CMakeLists.txt \
--replace-fail "$""{CMAKE_INSTALL_LIBDIR}" "${
if stdenv.hostPlatform.isDarwin then "lib" else "lib64"
}"
'';
nativeBuildInputs = [
cmake
cppcheck
doxygen
graphviz
pkg-config
python3
];
doBuildExamples = false;
cmakeFlags = [
(lib.cmakeBool "BUILDSYSTEM_TESTING" finalAttrs.doCheck)
(lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck)
(lib.cmakeBool "BUILD_EXAMPLES" finalAttrs.doBuildExamples)
];
nativeCheckInputs = [ python3 ];
doCheck = true;
# Extract the version by matching the tag's prefix.
passthru.updateScript = nix-update-script {
extraArgs = [ "--version-regex=${versionPrefix}_([\\d\\.]+)" ];
passthru = {
# bulk updater selects wrong tag
skipBulkUpdates = true;
updateScript = nix-update-script {
extraArgs = [ "--version-regex=gz-cmake(.*)" ];
};
};
meta = {
@@ -57,5 +67,6 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.asl20;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ guelakais ];
badPlatforms = lib.platforms.darwin; # hard replicable building error
};
})
+2 -2
View File
@@ -21,13 +21,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "gz-utils";
version = "3.1.1";
version = "4.0.0";
src = fetchFromGitHub {
owner = "gazebosim";
repo = "gz-utils";
tag = "gz-utils${lib.versions.major finalAttrs.version}_${finalAttrs.version}";
hash = "sha256-fYzysdB608jfMb/EbqiGD4hXmPxcaVTUrt9Wx0dBlto=";
hash = "sha256-fZonC/o5CNHdK/R3IgEoo1llehy36MwvXPQCgFnP8Ls=";
};
outputs = [
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule (finalAttrs: {
pname = "helmfile";
version = "1.4.1";
version = "1.4.2";
src = fetchFromGitHub {
owner = "helmfile";
repo = "helmfile";
rev = "v${finalAttrs.version}";
hash = "sha256-GnqpeeBGAQ/ZuL/BuVEo+FJfiTck9V4WO/SS8NcR+vU=";
hash = "sha256-rv7C/2CExlMO6fXaMMMAgSxqKP5iwLyMFI2huHeFVe0=";
};
vendorHash = "sha256-lHDp7feUr6rN4LLGw1cKZfcChsTsnJQ3DtClpAxwrTU=";
vendorHash = "sha256-uHzDxhJynjijm6dXW9fgiLilxUkch/IBmtQpOXTvA9M=";
proxyVendor = true; # darwin/linux hash mismatch
+3 -3
View File
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "hyprviz";
version = "0.8.3";
version = "0.8.4";
src = fetchFromGitHub {
owner = "timasoft";
repo = "hyprviz";
tag = "v${finalAttrs.version}";
hash = "sha256-73KcrKlnmdFNllRe7V3MO2FEn95G/pKtFNwRuIjCkew=";
hash = "sha256-UvFtZzQuUgqxY/pMfFaMEM/5VRJuMjSBOXiViwLB0TE=";
};
cargoHash = "sha256-gkLWqvd/4xVFkluv0Q16PjHUckHmMH9eoNxPU8qN+WE=";
cargoHash = "sha256-QuwxJw77ccUnvHcPNrPD5EwgZ3MJV4VvGb7MtUnYu88=";
nativeBuildInputs = [
pkg-config
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "imapfilter";
version = "2.8.4";
version = "2.8.5";
src = fetchFromGitHub {
owner = "lefcha";
repo = "imapfilter";
rev = "v${finalAttrs.version}";
sha256 = "sha256-ZuyRnN4khdE+z54Ag0b/coiGdUzn/9yT49GpDI4kr8Q=";
sha256 = "sha256-EiYVkEyOrgX2WwWzFyQcuVheYZs1s3CGl01fMwtXBog=";
};
makeFlags = [
"SSLCAFILE=/etc/ssl/certs/ca-bundle.crt"
@@ -6,13 +6,13 @@
}:
buildGoModule (finalAttrs: {
pname = "infrastructure-agent";
version = "1.72.7";
version = "1.72.8";
src = fetchFromGitHub {
owner = "newrelic";
repo = "infrastructure-agent";
rev = finalAttrs.version;
hash = "sha256-XpUgv63q1zukjQq/LhPw3vecV0pMbyhtxUCR6oT+e14=";
hash = "sha256-NnMUFNSKf8Z7bLspIfxZp+MzZe1TUoGlfQCuITEwEfw=";
};
vendorHash = "sha256-H41FxeJLrlaL/KbcBAS1WuMfVn6d+4So3egXb6E46/o=";
-291
View File
@@ -1,291 +0,0 @@
{
fetchFromGitHub,
fetchYarnDeps,
lib,
nodejs,
python312,
stdenv,
yarnBuildHook,
yarnConfigHook,
yarnInstallHook,
}:
let
python3 = python312.override {
self = python3;
packageOverrides = self: super: {
django = super.django_4;
};
};
version = "1.1.10";
src = fetchFromGitHub {
owner = "inventree";
repo = "inventree";
tag = "${version}";
hash = "sha256-TPB/3pFIU+ui4c+CbqIKTyAfJ/Xepm/RIhZeYhTrgI4=";
};
frontend =
let
frontendSource = src + "/src/frontend";
in
stdenv.mkDerivation (finalAttrs: {
pname = "inventree-frontend";
inherit version;
src = frontendSource;
yarnOfflineCache = fetchYarnDeps {
yarnLock = finalAttrs.src + "/yarn.lock";
hash = "sha256-Ijbkx+INZgsvMhkzo8h/FUY75W3UHnKAdUjQRD8kJZw=";
};
nativeBuildInputs = [
nodejs
yarnConfigHook
yarnBuildHook
yarnInstallHook
];
buildPhase = ''
mkdir -p $out
export PATH=$PATH:$TMP/frontend/node_modules/.bin
substituteInPlace $TMP/frontend/vite.config.ts --replace-warn "../../src/backend/InvenTree/web/static/web" "$out/static/web"
npm run extract
npm run compile
npm run build
'';
});
in
python3.pkgs.buildPythonApplication rec {
pname = "inventree";
pyproject = true;
inherit version src;
dependencies =
with python3.pkgs;
[
django
dj-rest-auth
django-allauth
django-cleanup
django-cors-headers
django-crispy-forms
django-dbbackup
django-error-report-2
django-filter
django-flags
django-formtools
django-ical
django-import-export
django-maintenance-mode
django-markdownify
django-money
django-mptt
django-mailbox
django-anymail
django-q2
django-redis
django-sesame
django-sql-utils
django-sslserver
django-stdimage
django-storages
django-structlog
django-taggit
django-oauth-toolkit
django-otp
django-user-sessions
django-weasyprint
standard-imghdr
django-xforwardedfor-middleware
djangorestframework-simplejwt
djangorestframework
drf-spectacular
bleach
cryptography
distutils
dulwich
feedparser
gunicorn
jinja2
pdf2image
pillow
pint
python-barcode
python-dotenv
qrcode
pytz
pyyaml
rapidfuzz
sentry-sdk
structlog
tablib
tinycss2
weasyprint
whitenoise
pypdf
ppf-datamatrix
psycopg2
mysqlclient
requests-mock
opentelemetry-api
opentelemetry-sdk
opentelemetry-exporter-otlp
opentelemetry-instrumentation-django
opentelemetry-instrumentation-requests
opentelemetry-instrumentation-redis
opentelemetry-instrumentation-sqlite3
opentelemetry-instrumentation-system-metrics
opentelemetry-instrumentation-wsgi
]
++ tablib.optional-dependencies.all
++ tablib.optional-dependencies.xls
++ tablib.optional-dependencies.xlsx
++ djangorestframework-simplejwt.optional-dependencies.crypto
++ django-anymail.optional-dependencies.amazon-ses
++ django-allauth.optional-dependencies.socialaccount
++ django-allauth.optional-dependencies.saml
++ django-allauth.optional-dependencies.openid
++ django-allauth.optional-dependencies.mfa;
build-system = [ python3.pkgs.setuptools ];
prePatch =
let
skippedCheckFunctions = [
"test_task_check_for_updates"
"test_download_image"
"test_commit_info"
"test_rates"
"test_download_build_orders"
"test_valid_url"
"test_refresh_endpoint"
"test_download_csv"
"test_download_line_items"
"test_export"
"test_download_xlsx"
"test_download_csv"
"test_export"
"test_part_label_translation"
"test_part_download"
"test_date_filters"
"test_bom_export"
"test_hash"
"test_date"
"test_api_call"
"test_function_errors"
"test_stocktake_exporter"
"test_return"
"test_plugin_install"
"test_full_process"
"test_package_loading"
"test_export"
"test_users_exist"
"test_import_part"
"test_model_names"
];
skippedFuncScripts = builtins.map (funcName: ''
grep -rlZ ${funcName} . | while IFS= read -r -d "" file; do
substituteInPlace "$file" --replace-fail "${funcName}" "skip_${funcName}"
done
'') skippedCheckFunctions;
in
''
${lib.concatStringsSep "\n" skippedFuncScripts}
'';
installPhase =
let
pythonPath = python3.pkgs.makePythonPath dependencies;
in
''
runHook preInstall
# Don't need to bother with a non-maintained library from ages ago
substituteInPlace src/backend/InvenTree/InvenTree/settings.py --replace-fail "django_slowtests.testrunner.DiscoverSlowestTestsRunner" "django.test.runner.DiscoverRunner"
mkdir -p $out/lib/${pname}/src/backend/InvenTree/web/
cp -r src $out/lib/${pname}
ln -s ${frontend}/static $out/lib/${pname}/src/backend/InvenTree/web
# cp -r ${frontend}/static $out/lib/${pname}/src/backend/InvenTree/web
chmod +x $out/lib/${pname}/src/backend/InvenTree/manage.py
makeWrapper $out/lib/${pname}/src/backend/InvenTree/manage.py $out/bin/${pname} \
--prefix PYTHONPATH : "${pythonPath}:$out/lib/${pname}/src/backend/InvenTree"
makeWrapper ${lib.getExe python3.pkgs.gunicorn} $out/bin/gunicorn \
--prefix PYTHONPATH : "${pythonPath}:$out/${python3.sitePackages}":"${pythonPath}:$out/lib/${pname}/src/backend/InvenTree"
runHook postInstall
'';
doCheck = true;
env = {
DJANGO_SETTINGS_MODULE = "InvenTree.settings";
};
checkPhase = ''
runHook preCheck
tmpDir=$(mktemp -d)
mkdir -p $tmpDir/media
mkdir -p $tmpDir/.cache/fontconfig
export HOME=$tmpDir
export INVENTREE_STATIC_ROOT=$tmpDir
export INVENTREE_MEDIA_ROOT=$tmpDir/media
export INVENTREE_BACKUP_DIR=$tmpDir
export INVENTREE_DB_ENGINE=django.db.backends.sqlite3
export INVENTREE_DB_NAME=inventree.db
export INVENTREE_SITE_URL="http://localhost:8000"
export INVENTREE_PLUGINS_ENABLED=true
export INVENTREE_PLUGIN_TESTING=true
export INVENTREE_PLUGIN_TESTING_SETUP=true
pushd src/backend/InvenTree
${python3.interpreter} ./manage.py check
${python3.interpreter} ./manage.py migrate
${python3.interpreter} ./manage.py test --failfast
popd
runHook postCheck
'';
nativeCheckInputs = with python3.pkgs; [
django-test-migrations
pytest-django
pytest-env
pytestCheckHook
invoke
coverage
pytest-cov
pdfminer-six
];
passthru =
let
pythonPath = python3.pkgs.makePythonPath dependencies;
in
{
inherit frontend;
pythonPath = pythonPath;
};
meta = {
description = "Open Source Inventory Management System";
homepage = "https://inventree.org/";
changelog = "https://github.com/paperless-ngx/paperless-ngx/releases/tag/${src.tag}";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
mainProgram = "inventree";
maintainers = with lib.maintainers; [
kurogeek
];
};
}
@@ -41,9 +41,10 @@ python3Packages.buildPythonPackage {
aiohttp
jinja2
pyyaml
prometheus-client
prometheus-client # optional, for prometheus metrics
supervisor
typing-extensions
watchdog # optional, watching changes in files (TLS certs, RPZs)
];
# set up (additional) Lua dependencies
-1
View File
@@ -54,7 +54,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
stestr
oslotest
hacking
coverage
bashate
];
+2 -2
View File
@@ -23,11 +23,11 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "kreya";
version = "1.19.0";
version = "1.19.1";
src = fetchurl {
url = "https://stable-downloads.kreya.app/${finalAttrs.version}/Kreya-linux-x64.tar.gz";
hash = "sha256-JyUdTLW6dYwYTVlyhCph7LDuCF4mdrQTnhcv/qmeuIc=";
hash = "sha256-l1LeQv2QKI57bXwqi9KMCDtuDiuawLLq1ysx6SbmHKI=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule (finalAttrs: {
pname = "lazyworktree";
version = "1.38.1";
version = "1.43.0";
src = fetchFromGitHub {
owner = "chmouel";
repo = "lazyworktree";
tag = "v${finalAttrs.version}";
hash = "sha256-rNTzmvfVAToPzOvP+3wnL+zyQzL2mXQCnRY0cLKuQ6c=";
hash = "sha256-fzYUQY6MbKRM7lSjBlhWx3U2J53EkJqSBeC/+V1Xkmg=";
};
vendorHash = "sha256-Y4TZZ7Fhn1YSxG6YH0l0y0iWxgml93gOwKyTXWkjpqg=";
vendorHash = "sha256-EZY4flrYM3JRY5i1qsjp5vvGW32IvDHeINdYuQJgUuQ=";
nativeBuildInputs = [ installShellFiles ];
+1 -1
View File
@@ -29,7 +29,7 @@ buildDotnetModule rec {
env.AVALONIA_TELEMETRY_OPTOUT = "1";
dotnet-sdk = dotnetCorePackages.sdk_10_0;
dotnet-sdk = dotnetCorePackages.sdk_10_0_1xx;
dotnet-runtime = dotnetCorePackages.runtime_10_0;
+3 -3
View File
@@ -11,14 +11,14 @@
python3Packages.buildPythonApplication {
pname = "lichess-bot";
version = "2026.3.6.3";
version = "2026.3.7.1";
pyproject = false;
src = fetchFromGitHub {
owner = "lichess-bot-devs";
repo = "lichess-bot";
rev = "02ab2363c707cf0f3ff60a6ee914f131c5d05a94";
hash = "sha256-S0ezzzA0Ft0YSp3knuahjwjvXUGPsrAzG2jqPKrWsRA=";
rev = "96a8f74d87a42db8039e847548fec0d9528bb079";
hash = "sha256-dHs+eoGOVCqHhFGEjCLKcDfndr6gIdvRoxLjwWz0j5o=";
};
propagatedBuildInputs = with python3Packages; [

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