Merge master into staging-nixos

This commit is contained in:
nixpkgs-ci[bot]
2026-10-02 18:13:40 +00:00
committed by GitHub
146 changed files with 1823 additions and 877 deletions

View File

@@ -15,7 +15,7 @@ runs:
steps:
# We don't actually need anything in this directory, but we need a small
# sparse checkout, and this directory is small.
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
persist-credentials: false
sparse-checkout: .github/actions

View File

@@ -36,13 +36,16 @@ jobs:
permission-pull-requests: write
permission-workflows: write
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
ref: ${{ github.event.pull_request.head.sha }}
# Avoid materializing full nixpkgs tree
sparse-checkout: .
token: ${{ steps.app-token.outputs.token }}
persist-credentials: true
# The PR is already merged, and its commits are only cherry-picked by
# git, never executed, so checking out fork PR commits is safe here.
allow-unsafe-pr-checkout: true
- name: Log current API rate limits
env:

View File

@@ -42,7 +42,7 @@ jobs:
runs-on: ubuntu-slim
if: github.event_name != 'schedule' || github.repository_owner == 'NixOS'
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
persist-credentials: false
sparse-checkout: |

View File

@@ -47,7 +47,7 @@ jobs:
runs-on: ubuntu-slim
timeout-minutes: 3
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
persist-credentials: false
path: trusted
@@ -101,7 +101,7 @@ jobs:
runs-on: ubuntu-24.04-arm
timeout-minutes: 8
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
persist-credentials: false
path: trusted
@@ -147,7 +147,7 @@ jobs:
runs-on: ubuntu-24.04-arm
timeout-minutes: 8
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
persist-credentials: false
path: trusted

View File

@@ -23,7 +23,7 @@ jobs:
timeout-minutes: 2
if: contains(github.event.comment.body, '@NixOS/nixpkgs-merge-bot merge')
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
persist-credentials: false
sparse-checkout: |

View File

@@ -50,7 +50,7 @@ jobs:
ciPinBumpCommit: ${{ steps.find-pinned-commit.outputs.ciPinBumpCommit }}
ciPinBumpCommitShort: ${{ steps.find-pinned-commit.outputs.ciPinBumpCommitShort }}
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
persist-credentials: false
path: trusted
@@ -58,13 +58,16 @@ jobs:
ci/supportedVersions.nix
- name: Check out the PR at the test merge commit
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
persist-credentials: false
ref: ${{ inputs.mergedSha }}
path: untrusted
sparse-checkout: |
ci/pinned.json
# ci/pinned.json is only read as data by trusted/ci/supportedVersions.nix,
# so checking out the fork PR's merge commit is safe here.
allow-unsafe-pr-checkout: true
- name: Find commit that touched ci/pinned.json
id: find-pinned-commit

View File

@@ -122,7 +122,7 @@ jobs:
runs-on: ubuntu-24.04-arm
timeout-minutes: 8
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
persist-credentials: true # Needed to run git fetch for large PRs.
path: trusted

View File

@@ -25,7 +25,7 @@ jobs:
targetSha: ${{ steps.prepare.outputs.targetSha }}
systems: ${{ steps.prepare.outputs.systems }}
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
persist-credentials: false
sparse-checkout: |

View File

@@ -34,7 +34,7 @@ jobs:
permission-contents: write
permission-issues: write
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
persist-credentials: false

View File

@@ -36,7 +36,7 @@ jobs:
systems: ${{ steps.prepare.outputs.systems }}
touched: ${{ steps.prepare.outputs.touched }}
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
persist-credentials: false
sparse-checkout-cone-mode: true # default, for clarity

View File

@@ -20,7 +20,7 @@ jobs:
runs-on: ubuntu-slim
timeout-minutes: 2
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
persist-credentials: false
sparse-checkout: |

View File

@@ -30,7 +30,7 @@ jobs:
permission-pull-requests: write
- name: Fetch source
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
persist-credentials: false
sparse-checkout: |

View File

@@ -19,7 +19,7 @@ jobs:
push: ${{ steps.files.outputs.push }}
targetSha: ${{ steps.prepare.outputs.targetSha }}
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
persist-credentials: false
sparse-checkout-cone-mode: true # default, for clarity

View File

@@ -11031,6 +11031,12 @@
github = "GZGavinZhao";
githubId = 74938940;
};
h0nIg = {
name = "Hans-Joachim Kliemeck";
email = "git@kliemeck.de";
github = "h0nIg";
githubId = 2757302;
};
h3cth0r = {
name = "Hector Miranda";
email = "hector.miranda@tec.mx";
@@ -20256,6 +20262,11 @@
matrix = "@neoney:matrix.org";
keys = [ { fingerprint = "9E6A 25F2 C1F2 9D76 ED00 1932 1261 173A 01E1 0298"; } ];
};
n3tcat = {
name = "Sophie Cat";
github = "scd31";
githubId = 57571338;
};
n3tshift = {
email = "n3tshift@tilde.pink";
github = "n3tshift";
@@ -24686,6 +24697,12 @@
githubId = 255667;
name = "Linus Karl";
};
reu = {
email = "rnavarro@rnavarro.com.br";
github = "reu";
githubId = 191614;
name = "Rodrigo Navarro";
};
revol-xut = {
email = "revol-xut@protonmail.com";
name = "Tassilo Tanneberger";
@@ -26111,11 +26128,6 @@
githubId = 13556969;
name = "Scandiravian";
};
scd31 = {
name = "scd31";
github = "scd31";
githubId = 57571338;
};
SchahinRohani = {
email = "schahin@rouhanizadeh.de";
github = "SchahinRohani";

View File

@@ -185,4 +185,5 @@ utf8,,,,,,
vicious,,,,,,
vstruct,,,,,,
vusted,,,,,,
warna,,,,,,Freed-Wu
xml2lua,,,,,,teto
1 name rockspec ref server version luaversion maintainers
185 vicious
186 vstruct
187 vusted
188 warna Freed-Wu
189 xml2lua teto

View File

@@ -331,6 +331,8 @@
- `komodo` has been updated to the v2 release line (2.x). See the [upstream v1 → v2 upgrade guide](https://github.com/moghtech/komodo/releases/tag/v2.0.0).
- `services.kanidm` supports declarative entry management via [`services.kanidm.server.entryManagement.migrations`](#opt-services.kanidm.server.entryManagement.migrations) to import `person` and `group` records natively on server startup as a lightweight alternative to `services.kanidm.provision`.
- `temporal` has been updated to the 1.31 release line. Always consult the [upstream upgrade
notes](https://docs.temporal.io/self-hosted-guide/upgrade-server) before upgrading between versions.

View File

@@ -44,11 +44,21 @@ let
cfg = config.services.kanidm;
settingsFormat = pkgs.formats.toml { };
jsonFormat = pkgs.formats.json { };
# Remove null values, so we can document optional values that don't end up in the generated TOML file.
filterConfig = converge (filterAttrsRecursive (_: v: v != null));
serverConfigFile = settingsFormat.generate "server.toml" (filterConfig cfg.server.settings);
clientConfigFile = settingsFormat.generate "kanidm-config.toml" (filterConfig cfg.client.settings);
unixConfigFile = settingsFormat.generate "kanidm-unixd.toml" (filterConfig cfg.unix.settings);
entryManagementDir = pkgs.linkFarm "kanidm-entry-management" (
mapAttrsToList (name: value: {
name = "${name}.json";
path = jsonFormat.generate "${name}.json" value;
}) cfg.server.entryManagement.migrations
);
provisionSecretFiles = filter (x: x != null) (
[
cfg.provision.idmAdminPasswordFile
@@ -293,6 +303,37 @@ in
};
server.enable = mkEnableOption "the Kanidm server";
server.entryManagement.migrations = mkOption {
description = ''
Entry management (migrations) to apply to the Kanidm database.
These are JSON formatted person and group records that are imported to the server on startup.
Keys of this attribute set should follow the pattern `xx-name` (e.g. `00-base`, `99-accounts`),
and values are the JSON representation of the migration.
See [the documentation](https://kanidm.github.io/kanidm/stable/entry_management.html)
for details on the record syntax.
'';
default = { };
type = types.attrsOf jsonFormat.type;
example = {
"00-base" = {
id = "a2b58e97-0aaf-4b04-a4e4-7984616fe1df";
assertions = [
{
state = "present";
id = "0ee875bd-408d-4ff9-85ca-c162f262493d";
class = [
"person"
"account"
];
name = "tobias";
displayname = "Tobias";
}
];
};
};
};
server.settings = mkOption {
type = types.submodule {
freeformType = settingsFormat.type;
@@ -732,6 +773,7 @@ in
services.kanidm = {
unix.settings.version = "2";
server.settings.version = "2";
server.settings.migration_path = entryManagementDir;
};
assertions =
@@ -768,6 +810,10 @@ in
assertion = (cfg.server.enable && cfg.provision.enable) -> unknownEntities == [ ];
message = "${opt} refers to unknown entities: ${toString unknownEntities}";
};
invalidEntryManagementNames = filter (name: builtins.match "[0-9]{2}-.+" name == null) (
attrNames cfg.server.entryManagement.migrations
);
in
[
{
@@ -848,6 +894,14 @@ in
You may want to set `services.kanidm.package = pkgs.kanidm.withSecretProvisioning;`.
'';
}
# Entry Management file name validation
{
assertion = invalidEntryManagementNames == [ ];
message = ''
The keys in <option>services.kanidm.server.entryManagement.migrations</option> must follow the pattern `XX-<name>` where `XX` is a two-digit number (e.g., "00-base", "99-accounts").
Invalid keys found: ${toString invalidEntryManagementNames}
'';
}
# Entity names must be globally unique:
(
let
@@ -858,9 +912,7 @@ in
assertion = cfg.provision.enable -> duplicateNames == { };
message = ''
services.kanidm.provision requires all entity names (group, person, oauth2, ...) to be unique!
${concatLines (
mapAttrsToList (name: xs: " - '${name}' used as: ${toString xs}") duplicateNames
)}'';
${concatLines (mapAttrsToList (name: xs: " - '${name}' used as:${toString xs}") duplicateNames)}'';
}
)
]

View File

@@ -31,6 +31,25 @@ in
package = kanidmPackage;
server = {
enable = true;
entryManagement.migrations = {
"00-base" = {
id = "a2b58e97-0aaf-4b04-a4e4-7984616fe1df";
assertions = [
{
state = "present";
id = "0ee875bd-408d-4ff9-85ca-c162f262493d";
class = [
"person"
"account"
];
name = "migration_user";
displayname = "Migration User";
}
];
};
};
settings = {
origin = "https://${serverDomain}";
domain = serverDomain;
@@ -119,6 +138,10 @@ in
client.send_chars(f"{idm_admin_password}\n")
client.wait_until_tty_matches("1", "Login Success for idm_admin")
with subtest("Test entry management migration"):
output = client.succeed("kanidm person get migration_user")
assert "No matching entries" not in output, "The migration user was not created"
with subtest("Test unixd connection"):
client.wait_for_unit("kanidm-unixd.service")
client.wait_for_file("/run/kanidm-unixd/sock")

View File

@@ -101,15 +101,15 @@ let
};
};
latestVersion = {
version = "2026.2.2.1"; # "Android Studio Rabbit 2 | 2026.2.2 Canary 1"
version = "2026.2.2.3"; # "Android Studio Rabbit 2 | 2026.2.2 Canary 3"
sources = {
x86_64-linux = {
sha256Hash = "sha256-m6E5gAI6hO2M5zf7nDQaQtnHmdimdXZsBYSKOVH4nbQ=";
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.2.2.1/android-studio-rabbit2-canary1-linux.tar.gz";
sha256Hash = "sha256-I1BUkbgkEQjoxzhRBUeZvz+gG4EMxgr4FZKJy7m062E=";
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.2.2.3/android-studio-rabbit2-canary3-linux.tar.gz";
};
aarch64-darwin = {
sha256Hash = "sha256-HfIEtxeeDM5wOBn1lBV0aPP7iYe4Ih+RUC6F2culXao=";
url = "https://edgedl.me.gvt1.com/android/studio/install/2026.2.2.1/android-studio-rabbit2-canary1-mac_arm.dmg";
sha256Hash = "sha256-Z6mDdui46xm3K1Tr1mogfU28VCh6T1AvJn9xVVEKc8E=";
url = "https://edgedl.me.gvt1.com/android/studio/install/2026.2.2.3/android-studio-rabbit2-canary3-mac_arm.dmg";
};
};
};

View File

@@ -21,22 +21,22 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
sources = {
"x86_64-linux" = {
arch = "linux-x64";
hash = "sha256-+1jtHXyURBSDXPBKrcFuE0RTjQil1KWgeAinnxDQQG8=";
hash = "sha256-TY0MaNfh/Iv0K/AYy0frD71US0NFpgk7k2yrClTeXTc=";
};
"aarch64-linux" = {
arch = "linux-arm64";
hash = "sha256-QwAeBSQNB/oT6LIyPTUjboVAm/HDcBcfqP060Xf6xMU=";
hash = "sha256-BGEyoZX6WARlrPevsunwrX5C9YvhTTURuzRi9A/c594=";
};
"aarch64-darwin" = {
arch = "darwin-arm64";
hash = "sha256-Vxn9QOmKzpRVDcpjs9sARCieueiy/6AFHduhXKjueEk=";
hash = "sha256-QTEgBlSjb/Y8eYBl9HQVgZCyeDIXZR5gzEizv/JxVN0=";
};
};
in
{
name = "claude-code";
publisher = "anthropic";
version = "2.1.286";
version = "2.1.287";
}
// sources.${stdenvNoCC.hostPlatform.system}
or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");

View File

@@ -1304,8 +1304,8 @@ let
mktplcRef = {
publisher = "denoland";
name = "vscode-deno";
version = "3.53.0";
hash = "sha256-M+wFee1x/cCgGMFrDaV7OtIhEORHkLHf/Z06/VuZZmg=";
version = "3.53.1";
hash = "sha256-9OGG/ZvqzRzTQ6ERT0fKBkGwx1+zwD2FUWr9Hp1wLK0=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/denoland.vscode-deno/changelog";
@@ -4304,8 +4304,8 @@ let
mktplcRef = {
publisher = "shd101wyy";
name = "markdown-preview-enhanced";
version = "0.8.36";
hash = "sha256-acmubrmOUirHkam1CreoP7p/LR2/6A6kpBku8Den83Y=";
version = "0.8.39";
hash = "sha256-bRFEb6YtLFOTe9K1Y0vyfQDTgYVa6udy2CU2wz4Ht3w=";
};
meta = {
description = "Provides a live preview of markdown using either markdown-it or pandoc";

View File

@@ -17,19 +17,19 @@ let
vsix = stdenv.mkDerivation (finalAttrs: {
name = "vscode-js-debug-${finalAttrs.version}.vsix";
pname = "vscode-js-debug-vsix";
version = "1.117.0";
version = "1.140.0";
src = fetchFromGitHub {
owner = "microsoft";
repo = "vscode-js-debug";
tag = "v${finalAttrs.version}";
hash = "sha256-1Mj7nfX5iVO0hhydCV/VbqN1x77WFEzG6/ahk1kN1fw=";
hash = "sha256-4bYss4fWLGrOsmfKYbaF9zSGl45jmUH73GCuba2IFw0=";
};
npmDeps = fetchNpmDeps {
name = "${finalAttrs.pname}-npm-deps";
inherit (finalAttrs) src;
hash = "sha256-uTtA5XjHfuI2e9IuNAYfDNKZE8c/wa+CWqAsmd/M3Xk=";
hash = "sha256-VoWBedocCL1EyMm7y2f4eOfl3s8SB6LujJQp6wAUJRM=";
};
makeCacheWritable = true;

View File

@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "air-vscode";
publisher = "posit";
version = "0.28.0";
hash = "sha256-/B5Qzbndk4l+PyEWlODfIOkBPSVrh6Qi3gFrNmUjykE=";
version = "0.30.0";
hash = "sha256-RAyXl111qODYMN0CiN/F+i6O3W0MvKdoV8Ap4dDzdsA=";
};
patchPhase = ''
runHook prePatch

View File

@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "claude-dev";
publisher = "saoudrizwan";
version = "4.1.19";
hash = "sha256-Qo02ve7dIzkaotwqy5L1104v5EQpAj/JQUXya0Mm0c4=";
version = "4.1.22";
hash = "sha256-E0tUr5Th5Mxs0HIkph9oc8QMhF2fuh+eaqUQ3W4sU4I=";
};
meta = {

View File

@@ -1,10 +1,10 @@
{
"chromium": {
"version": "154.0.8037.92",
"version": "154.0.8037.97",
"chromedriver": {
"version": "154.0.8037.93",
"hash_darwin": "sha256-98b3h7D4+HHaZ7sLsr8v4Uv0xc3TqJLI2DWd8jchMCY=",
"hash_darwin_aarch64": "sha256-RVAlxmcKbxi7VPYXOwJlup3CLwLE/YPpISWDlaYQdPI="
"version": "154.0.8037.98",
"hash_darwin": "sha256-wFF742FI5Te8Sbi0pf5zSyMgywxNn+wL/zUmZz6afws=",
"hash_darwin_aarch64": "sha256-8xLtpiOei8IGi0RdHYcQQniTvDKlYjipzZ+/vcag40E="
},
"deps": {
"depot_tools": {
@@ -21,8 +21,8 @@
"DEPS": {
"src": {
"url": "https://chromium.googlesource.com/chromium/src.git",
"rev": "334b65d254ccc35df4fca82706d1753227b01039",
"hash": "sha256-UtjuCxGPAHukLFqtwvyW7QRlOah4N1xJ5bHAT1hYUVA=",
"rev": "b510e9d7cd3a2fbd78d0ddc42234103206c5f78d",
"hash": "sha256-AEolOO7VpF2DRA27gidQCmvhjj2Q71lz0qu3YEMO7fQ=",
"recompress": true
},
"src/third_party/clang-format/script": {
@@ -92,8 +92,8 @@
},
"src/third_party/angle": {
"url": "https://chromium.googlesource.com/angle/angle.git",
"rev": "802a8704ca940b633b731493ee192e0661eb8cdd",
"hash": "sha256-HqMu7GkWXTyIj/a4SY6f8x1wS/ficMQYyI/g0zuTlvM="
"rev": "e12217f3e133cb1029b050d893b1806d141483be",
"hash": "sha256-U2jOqL9RgpwA8CLJ6Ev+zw7+rOS+IRGMpcHYCz1v+PI="
},
"src/third_party/angle/third_party/glmark2/src": {
"url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -817,8 +817,8 @@
},
"src/third_party/webrtc": {
"url": "https://webrtc.googlesource.com/src.git",
"rev": "3a8b0c76e6b7bf0e72141047f82eb2c3f4862c8d",
"hash": "sha256-G0R6xmcvBfbd+UghQScDeOvRxB8vbpDA8DxMSvQvkS8="
"rev": "dbaaaf413fe8c1d01c340af1a461c069960f43fc",
"hash": "sha256-BW6ve8ofEfDfeI/D5ZYxhJzctm63ERQ/l7Dk/ZotVmU="
},
"src/third_party/wuffs/src": {
"url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@@ -847,8 +847,8 @@
},
"src/v8": {
"url": "https://chromium.googlesource.com/v8/v8.git",
"rev": "31fac3bef58c3def36b0760e4ddc54ec77099596",
"hash": "sha256-hJfc8TsOIGi9pBXwDcxLoaO6RxczIn9mwYJAQoGBnI0="
"rev": "b3d6849efaf11696198e15b32290e6d6b0d540c1",
"hash": "sha256-Z8rruB23ovlJ6BtuVfJ/OqjqdfLPSrqyaAqZi47V5Ng="
},
"src/agents/shared": {
"url": "https://chromium.googlesource.com/chromium/agents.git",

View File

@@ -8,17 +8,17 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "air-formatter";
version = "0.11.0";
version = "0.12.0";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "posit-dev";
repo = "air";
tag = finalAttrs.version;
hash = "sha256-BWtQLgNFf/kULGvet33k3T1k2oL1hbDn2VPCj0JxrX4=";
hash = "sha256-w7A9fwH2d87KtvsfO4kmcTdsE2/UzFu8IybAeTHvYqM=";
};
cargoHash = "sha256-xcNVioDbejCLrWMaUA06r9GK5KEIPq6w0W7G7290kOU=";
cargoHash = "sha256-vHxBFmXZ5UEs0XPiXYhFcHvM0UFrwKtccTmXDVKEwM4=";
useNextest = true;

View File

@@ -7,11 +7,11 @@
let
pname = "apidog";
version = "2.8.48";
version = "2.8.49";
src = fetchurl {
url = "https://file-assets.apidog.com/download/${version}/Apidog-${version}.AppImage";
hash = "sha256-wBpJ8GuJg0sOjrbf/dRyOes/6SUJig9JA7YU5spHoP4=";
hash = "sha256-FLngkXkwo3oiDNbB0wVJFoJKs60wWCNB5wVjieq3tgQ=";
};
appimageContents = appimageTools.extract {

View File

@@ -8,14 +8,14 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "apkeep";
version = "1.0.0";
version = "1.1.0";
src = fetchCrate {
inherit (finalAttrs) pname version;
hash = "sha256-UFkcncZJlqNa3vvrKGxpF3FSfEB4I16taJcS9RJFdrA=";
hash = "sha256-fc7evdDy6HlAWMS/RIaO4qA2eNsgcW7ol63JIXYllOQ=";
};
cargoHash = "sha256-tB7kOAJ8TzuXfks//v0ghFbezCqxjy//Ow1Xvt4rA8o=";
cargoHash = "sha256-f18BuiZuhIXizdMKZQmTQJOdv0UvcBYwxbeqewg+sQ8=";
prePatch = ''
rm .cargo/config.toml

View File

@@ -0,0 +1,32 @@
From ff6f49f32de68ed0ec9405a1ed73e9e845c77b1c Mon Sep 17 00:00:00 2001
From: Aaron Masover <amasover@gmail.com>
Date: Wed, 19 Aug 2026 23:47:53 -0600
Subject: [PATCH] gnome-shell: exclude directories from gresource depend_files
The find that collects gresource asset dependencies also prints the
three searched directories themselves. Meson 1.12 validates every
depend_files entry as an existing *file* (File.from_source_file uses
os.path.isfile), so configuring with -Dgnome_shell_gresource=true now
fails on the first entry:
common/gnome-shell/meson.build:98:28: ERROR: File .../icons does not exist.
Meson 1.11.2 and earlier did not validate these entries, which is why
the same tree configured fine before. Filter the find to exclude
directories.
---
common/gnome-shell/meson.build | 1 +
1 file changed, 1 insertion(+)
diff --git a/common/gnome-shell/meson.build b/common/gnome-shell/meson.build
index bd71648d0..fa80c0c7f 100644
--- a/common/gnome-shell/meson.build
+++ b/common/gnome-shell/meson.build
@@ -90,6 +90,7 @@ foreach variant : get_option('variants')
meson.current_source_dir() / gnome_shell_ver / 'icons',
meson.current_source_dir() / gnome_shell_ver / 'common-assets',
meson.current_source_dir() / gnome_shell_ver / variant + '-assets',
+ '-not', '-type', 'd',
check : true
).stdout().split()

View File

@@ -25,6 +25,12 @@ stdenv.mkDerivation {
hash = "sha256-vvZvJmsmeYcJT3xVQLg4tmYXEgHprWJls1fbxA3Jxnw=";
};
patches = [
# Fixes `common/gnome-shell/meson.build:98:28: ERROR: File .../icons does not exist.`
# See https://github.com/jnsh/arc-theme/pull/238
./meson_1.12.patch
];
nativeBuildInputs = [
glib # for glib-compile-resources
inkscape

View File

@@ -13,7 +13,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "arti";
version = "2.6.0";
version = "2.7.0";
src = fetchFromGitLab {
domain = "gitlab.torproject.org";
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
owner = "core";
repo = "arti";
tag = "arti-v${finalAttrs.version}";
hash = "sha256-ukGplnZz1O1Djh12COKk8FL/3rLmmWGyl0b816wRWBE=";
hash = "sha256-28s2BnesadPGm1gQDxzIqSgGaUd8ZgoTpKK3WXBRU9Q=";
};
# Working around a bug in cargo that appears with cargo-auditable, see
@@ -29,15 +29,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
postPatch = ''
substituteInPlace crates/arti/Cargo.toml \
--replace-fail '"http"' '"dep:http"' \
--replace-fail '"tokio-util"' '"dep:tokio-util"'
--replace-fail '"tokio-util"' '"dep:tokio-util"' \
--replace-fail '"opentelemetry-appender-tracing",' ""
'';
buildAndTestSubdir = "crates/arti";
cargoHash = "sha256-/7sWTLeVolqliggn1Qw+kxqAeWENHgbCR6hK5Th2z+g=";
cargoHash = "sha256-g+t5X1t0koUzqoHpY8+lncqRobdDuZggXtD3HRk9ryE=";
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
buildInputs = [ sqlite ] ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl ];
# `full` includes all stable and non-conflicting feature flags. the primary
# downsides are increased binary size and memory usage for building, but
# those are acceptable for nixpkgs

View File

@@ -7,7 +7,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "automatic-timezoned";
version = "2.0.159";
version = "2.0.160";
__structuredAttrs = true;
@@ -15,10 +15,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
owner = "maxbrunet";
repo = "automatic-timezoned";
tag = "v${finalAttrs.version}";
hash = "sha256-ZxYiRYIttEk+ypTOiLMl0FGl/AOdoc25pNwE4Voe8YA=";
hash = "sha256-lfP+XgarNGhtbamALFM5T/3U5hF1a+nQUAOuZb4sgUI=";
};
cargoHash = "sha256-4heCkeHIZUUAflnYKaxSn5qnUqqO+XbX94pXHDRDUiY=";
cargoHash = "sha256-Vo5qhfBrgif+z2dPJttl6dKRSTQ0kfiAGu9wZkAOCpw=";
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;

View File

@@ -6,13 +6,13 @@
buildGoModule (finalAttrs: {
pname = "bazel-buildtools";
version = "10.0.1";
version = "10.1.0";
src = fetchFromGitHub {
owner = "bazelbuild";
repo = "buildtools";
rev = "v${finalAttrs.version}";
hash = "sha256-SX/QeVsAn3yqovmjAo6NDFyfetNpRxb/C72zqWwCbaE=";
hash = "sha256-6yWPmjKyZsYZZ73a+yryZl1xAREiPFiBANnZZJ4Qv5o=";
};
vendorHash = "sha256-bUvWtQ0DCdAQRETyPJ6gp4qlaPowlpO5l3GHFaEcH94=";

View File

@@ -0,0 +1,108 @@
{
lib,
stdenvNoCC,
fetchurl,
bun,
llvmPackages,
makeWrapper,
symlinkJoin,
versionCheckHook,
config,
cudaSupport ? config.cudaSupport,
cudaPackages,
addDriverRunpath,
apple-sdk_15,
writeShellScript,
curl,
jq,
nix-update,
}:
let
# bend -o wants one CUDA root with include/ and lib/, as /usr/local/cuda
cuda = symlinkJoin {
name = "bend2-cuda";
paths = with cudaPackages; [
cuda_cudart
cuda_nvrtc.include
cuda_nvrtc.lib
];
};
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "bend2";
version = "2.0.5";
src = fetchurl {
url = "https://bend-lang.com/dl/${finalAttrs.version}.tar.gz";
hash = "sha256-TbcOd84bECfx0OFd7gJZIfp5SptBWt1DUOx8ZKzyd1s=";
};
sourceRoot = ".";
__structuredAttrs = true;
strictDeps = true;
nativeBuildInputs = [ makeWrapper ];
dontBuild = true;
makeWrapperArgs = [
"--add-flags"
"${placeholder "out"}/share/bend2/bend2/main.ts"
"--prefix"
"PATH"
":"
(lib.makeBinPath [ llvmPackages.clang ])
]
++ lib.optionals cudaSupport [
"--set-default"
"CUDA_HOME"
"${cuda}"
"--prefix"
"LIBRARY_PATH"
":"
"${addDriverRunpath.driverLink}/lib"
]
# the Metal lane of `bend -o` uses MTLCompileOptions.mathMode, a macOS 15
# API: the clang wrapper takes its SDK from DEVELOPER_DIR and makes an
# unguarded use past the deployment target an error, so both move to 15
++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [
"--set"
"DEVELOPER_DIR"
"${apple-sdk_15}"
"--set"
"MACOSX_DEPLOYMENT_TARGET"
"15.0"
];
installPhase = ''
runHook preInstall
mkdir -p $out/share/bend2 $out/bin
cp -r bend2 guide $out/share/bend2/
makeWrapper ${lib.getExe bun} $out/bin/bend "''${makeWrapperArgs[@]}"
runHook postInstall
'';
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
# upstream tags no releases; its manifest names the latest one
passthru.updateScript = writeShellScript "update-bend2" ''
set -euo pipefail
version=$(${lib.getExe curl} -fsSL https://bend-lang.com/dl/latest.json | ${lib.getExe jq} -r .ver)
${lib.getExe nix-update} bend2 --version "$version"
'';
meta = {
description = "Dependently typed, affine language that verifies proofs and runs on CPU threads and GPUs";
homepage = "https://bend-lang.com";
license = lib.licenses.asl20;
mainProgram = "bend";
maintainers = with lib.maintainers; [ reu ];
platforms = lib.platforms.linux ++ lib.platforms.darwin;
};
})

View File

@@ -14,13 +14,13 @@
buildNpmPackage (finalAttrs: {
pname = "bitwarden-cli";
version = "2026.9.0";
version = "2026.9.1";
src = fetchFromGitHub {
owner = "bitwarden";
repo = "clients";
tag = "cli-v${finalAttrs.version}";
hash = "sha256-YL1sYO+roK4Jin7IYYCUd9vJALV8bfELKXIAWYen1m8=";
hash = "sha256-Ag3hTOvIRf9CwfzTvhICKV9ols+yd16rvSqC66QRbOs=";
};
postPatch = ''
@@ -31,7 +31,7 @@ buildNpmPackage (finalAttrs: {
nodejs = nodejs_22;
npmDepsFetcherVersion = 2;
npmDepsHash = "sha256-6sFt+415Valu8ZhoHb4maACGY5o3YurTMNn9fqnGVl4=";
npmDepsHash = "sha256-JI5U4Q7zrF7UZXxVtsaJRJK6QAuLQuievd0z1/3GJfE=";
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
perl

View File

@@ -8,16 +8,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cargo-leptos";
version = "0.3.9";
version = "0.3.10";
src = fetchFromGitHub {
owner = "leptos-rs";
repo = "cargo-leptos";
rev = "v${finalAttrs.version}";
hash = "sha256-W2A55uZhuPtQsKSd9Hvf1IXUVhfPiaj2idWCmj30hQs=";
hash = "sha256-izVMc3q4i691B9BuI8ESESHcql3CGd9ebtSs/qG/F88=";
};
cargoHash = "sha256-o9E1sQPtbvTkgpeuZusUmaN7Xv18JTZpmayurhu8+H4=";
cargoHash = "sha256-iFkpIOkj8Ems9C2DjylFwvFLFrUnGachNyld4BLwurU=";
nativeBuildInputs = [ pkg-config ];

View File

@@ -1,62 +1,61 @@
{
"version": "2.1.286",
"version": "2.1.287",
"manifestSignatureEnforcement": "flag",
"commit": "f344a08993bbba4fc1ea9b295245324610f02c58",
"modsCommit": "732e167ee9d71296b4b63d6f529ac1334513826a",
"buildDate": "2026-09-30T15:57:03Z",
"commit": "3c446a1b98aceb99a6cdee0f84a8bea42f4a8937",
"modsCommit": "6160717d8994f236ab381cf534fc1cde5347c12f",
"buildDate": "2026-10-01T16:27:39Z",
"platforms": {
"darwin-arm64": {
"binary": "claude.zst",
"checksum": "b1be27fbd8fe95bef2418c09f60a307f91c8631dc444fe9a828a7ed2520e45b5",
"size": 75060478,
"checksum": "2701dac04e02acbea7d7584fc35e04adddf6f24021d321e3ba7eb95994edcf96",
"size": 75949326,
"bundle": {
"checksum": "f2326db618029608409be774a5f4d5fde8a032d319d6aa58c3043afda393dd96",
"size": 75074255
"checksum": "8939dd3a906fd909614c651595ba3636e5620cb1aafcf99d3d5ecd9b6b86c693",
"size": 75962691
}
},
"darwin-x64": {
"binary": "claude.zst",
"checksum": "e2bbc2a329924533319d0eb4f5a33e2488ce921f60329ab333bca10b0e4c02f2",
"size": 79220957,
"checksum": "e4c6177a49a726d1a65dadf2fb08cdde0232a37a60017668246ab9246fcf11ad",
"size": 80136583,
"bundle": {
"checksum": "fda00b160da41c43716c36fbd4f21729108f898911eea5ede701b10305bca5eb",
"size": 79224277
"checksum": "dc23e02cbacb6762d4033998e76e182459e7a539ea698eebe267207563def62d",
"size": 80141664
}
},
"linux-arm64": {
"binary": "claude.zst",
"checksum": "fb24324439bcca9575083f06af6a351a7f9f25066fcf370372b5e829287ef1ee",
"size": 84176167
"checksum": "f95d466d03381abe9effcbcfe8408704262eb8861af3a1fc20b8e0563c1f770b",
"size": 85057873
},
"linux-x64": {
"binary": "claude.zst",
"checksum": "a14d80443473126e40cbc50eb78899f43e8f4d4336095863f8089a6b9ca02a97",
"size": 84909116
"checksum": "add364007462fe694a95aa68c78bdf7a71b1ddf687f80dda603f58cc80cde574",
"size": 85795355
},
"linux-arm64-musl": {
"binary": "claude.zst",
"checksum": "e86dc4ad41e7e0af1b2cdadcd9b850acb4aed8f141bddce754f29091e59cf250",
"size": 82570865
"checksum": "b277e35a54c5c3f891791276b1b5ca8959ab89c45e2123906f26c3b0c489c80a",
"size": 83460752
},
"linux-x64-musl": {
"binary": "claude.zst",
"checksum": "b79ed7738c8eb72812d89d2d4032fe4196cf19dac067ee8e724d4f892350c710",
"size": 83360753
"checksum": "43f30b92560d69d1942dc7e9e4772a9c24f99cda2d71a1dc46b6033398d47a01",
"size": 84231480
},
"win32-x64": {
"binary": "claude.exe.zst",
"checksum": "635c1867224abd72c010948307b6dd871c64837dada77e67d98ed850408198bf",
"size": 87205724
"checksum": "0d03949c88db791ddee203b61c1cfbd69bf84214facc17dcfcd0c0987f6c27de",
"size": 88089498
},
"win32-arm64": {
"binary": "claude.exe.zst",
"checksum": "f485b6b45317d01eb9c6cb3f62c66520aaa87f3e0f7c729ece129b832c211cbc",
"size": 83529567
"checksum": "bd8a2ec0abb532aea9e4f6a70177193cd7e06e4f4803d63fe75ac15442160dca",
"size": 84412071
}
},
"sdkCompat": {
"testedWrapperVersions": [
"0.3.246",
"0.3.247",
"0.3.248",
"0.3.250",

View File

@@ -7,13 +7,13 @@
buildNpmPackage (finalAttrs: {
pname = "claude-powerline";
version = "1.31.0";
version = "1.32.1";
src = fetchFromGitHub {
owner = "Owloops";
repo = "claude-powerline";
tag = "v${finalAttrs.version}";
hash = "sha256-W1DoOJ6w/9bU3nnrQBwGWeQbVjvuB38kEd67R4Kvufg=";
hash = "sha256-PBlqi48219NuicdWDaYVdqBxc3kwcTfk89WMCRM1Gew=";
};
npmDepsHash = "sha256-D3Z5tb4phZUMPQaXvfYiIWuwaX5YGI8ubgyV7sSJqQk=";

View File

@@ -18,16 +18,16 @@
buildGoModule (finalAttrs: {
pname = "cliamp";
version = "2.2.0";
version = "2.3.0";
src = fetchFromGitHub {
owner = "bjarneo";
repo = "cliamp";
tag = "v${finalAttrs.version}";
hash = "sha256-PC+1uOt/LBGkW+ASNyGrS0e/rB8mcr+ILlcnf3F8esU=";
hash = "sha256-+q3/AfxHtEYH/gzaiimn0gDx98vlytVsJFfYnq04U9Y=";
};
vendorHash = "sha256-d/ENFm9b1DkIir1lz50VVX1pvuQpwPUVlA5XOC7Jj5o=";
vendorHash = "sha256-cythuV9J/Iu+ibRVza8dQ6RHjYKa0hVllc2t6dh3hhs=";
ldflags = [
"-s"

View File

@@ -7,16 +7,16 @@
buildNpmPackage {
pname = "coc-rust-analyzer";
version = "0-unstable-2026-09-19";
version = "0-unstable-2026-10-01";
src = fetchFromGitHub {
owner = "fannheyward";
repo = "coc-rust-analyzer";
rev = "6536aae37263c43d1736f622d371124b7a9fe86d";
hash = "sha256-iY1bvS8mCrldkms0wRvXAcFzzJwGomKqtUBpqV7KJl4=";
rev = "3a898ba171e3cf3558b26f79d6bb2361faf2d9eb";
hash = "sha256-eNd4LbQJUKkyj2qeUGesYFJ1VPNayl8oD57k3Eu7z1Y=";
};
npmDepsHash = "sha256-9xJuiu/LnMIbPRgDog2Xl0DD6Y9O39AzhinrCYguToc=";
npmDepsHash = "sha256-ut9hw6COc/amICmtLuos+Q8VOmi92IGcl8/wPykqVmU=";
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };

View File

@@ -5,13 +5,13 @@
}:
buildDubPackage (finalAttrs: {
pname = "ddhx";
version = "0.12.0";
version = "0.13.0";
src = fetchFromGitHub {
owner = "dd86k";
repo = "ddhx";
tag = "v${finalAttrs.version}";
hash = "sha256-vmWO7NodB5j5ZhzdiB9H3hzXVgW5MCqlGlnp7VKnui0=";
hash = "sha256-WKwDxbim46r+nMwYfOR22SI6E62PwfsIknMkDHkCvIY=";
};
dubLock.dependencies = { };

View File

@@ -1,7 +1,7 @@
{
lib,
copyDesktopItems,
electron_42,
electron_43,
fetchFromGitHub,
deltachat-rpc-server,
makeDesktopItem,
@@ -21,38 +21,38 @@
let
deltachat-rpc-server' = deltachat-rpc-server.overrideAttrs rec {
version = "2.59.0";
version = "2.62.0";
src = fetchFromGitHub {
owner = "chatmail";
repo = "core";
tag = "v${version}";
hash = "sha256-I0CZxuHVBQCbvMfaPUL+W1HU8plL7kKo53bSbUZskNE=";
hash = "sha256-qjbxxcOvHkb8g4IMWXYXmnYhbEx3G5ptiysOvpTcCCI=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
pname = "chatmail-core";
inherit version src;
hash = "sha256-oI/btypttMFLxAe2shYoLbHqwXMhlqzschORHoAQ/Wc=";
hash = "sha256-ceXhO8/k3+dphPQ74S+ZgEZzUWjgqBm6wcePvTqxHrE=";
};
};
electron = electron_42;
electron = electron_43;
in
stdenv.mkDerivation (finalAttrs: {
pname = "deltachat-desktop";
version = "2.59.1";
version = "2.62.0";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-desktop";
tag = "v${finalAttrs.version}";
hash = "sha256-FXm4dMWzaEcKbYlHKCXXV1pPLjBEtQR1IwvZ9SgqK7E=";
hash = "sha256-9n10t0wTraJCFD9S73JTLTj+xMMHaU28e+qrr6GMcqA=";
};
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
pnpm = pnpm_10;
fetcherVersion = 4;
hash = "sha256-mLGMntAXEiHptL7JLpu4eYdTHB0eY3yDX9KMt3PD2JA=";
hash = "sha256-nHOYYGs0iNgzugfD+CnGSean39VvJ92xj77g/AzpU2I=";
};
strictDeps = true;

View File

@@ -1,7 +1,7 @@
diff --git i/distrobuilder/lxc.generator w/distrobuilder/lxc.generator
index f7692af..f617b89 100644
--- i/distrobuilder/lxc.generator
+++ w/distrobuilder/lxc.generator
diff --git a/distrobuilder/lxc.generator b/distrobuilder/lxc.generator
index fc41e6b..a80b181 100644
--- a/distrobuilder/lxc.generator
+++ b/distrobuilder/lxc.generator
@@ -16,16 +16,6 @@ is_lxc_privileged_container() {
grep -qw 4294967295$ /proc/self/uid_map
}
@@ -79,7 +79,7 @@ index f7692af..f617b89 100644
mkdir -p /run/systemd/system/systemd-udev-trigger.service.d
cat <<-EOF > /run/systemd/system/systemd-udev-trigger.service.d/zzz-lxc-override.conf
@@ -143,52 +89,40 @@ fix_systemd_udev_trigger() {
@@ -143,20 +89,6 @@ fix_systemd_udev_trigger() {
EOF
}
@@ -97,20 +97,21 @@ index f7692af..f617b89 100644
- EOF
-}
-
## Main logic
# Exit immediately if not an Incus/LXC container
fix_dbus_apparmor() {
dropin="/etc/dbus-1/system.d/zzz-lxc-disable-apparmor.conf"
@@ -189,33 +121,30 @@ fix_dbus_apparmor() {
is_lxc_container || exit 0
# Determine systemd version
-SYSTEMD=""
-for path in /usr/lib/systemd/systemd /lib/systemd/systemd; do
- [ -x "${path}" ] || continue
+SYSTEMD="$(/run/current-system/sw/lib/systemd/systemd --version | head -n1 | cut -d' ' -f2 | cut -d'~' -f1)"
-
- SYSTEMD="$("${path}" --version | head -n1 | cut -d' ' -f2 | cut -d'~' -f1)"
- break
-done
-
-# Apply systemd overrides
-if [ "${SYSTEMD}" -ge 244 ]; then
- fix_systemd_override_unit system/service
@@ -120,32 +121,31 @@ index f7692af..f617b89 100644
- fix_systemd_override_unit "${service_file}"
- done
-fi
-
-# Workarounds for unprivileged containers.
-if ! is_lxc_privileged_container; then
- fix_ro_paths systemd-networkd.service
- fix_ro_paths systemd-resolved.service
+
+SYSTEMD="$(/run/current-system/sw/lib/systemd/systemd --version | head -n1 | cut -d' ' -f2 | cut -d'~' -f1)"
+# Overriding some systemd features is only needed if security.nesting=false
+# in which case, /dev/.lxc will be missing
+# Adding this conditional back for NixOS as we do not have the reported
+# problems, and the overrides could reduce potential service hardening
+if [ ! -d /dev/.lxc ]; then
+ # Apply systemd overrides
+ if [ "${SYSTEMD}" -ge 244 ]; then
+ fix_systemd_override_unit system/service
+ else
+ # Setup per-unit overrides
+ find /lib/systemd /etc/systemd /run/systemd /usr/lib/systemd -name "*.service" -type f | sed 's#/\(lib\|etc\|run\|usr/lib\)/systemd/##g'| while read -r service_file; do
+ fix_systemd_override_unit "${service_file}"
+ done
+ fi
+
+ # Workarounds for unprivileged containers.
+ if ! is_lxc_privileged_container; then
+ fix_ro_paths systemd-networkd.service
+ fix_ro_paths systemd-resolved.service
+ fi
+ # Apply systemd overrides
+ if [ "${SYSTEMD}" -ge 244 ]; then
+ fix_systemd_override_unit system/service
+ else
+ # Setup per-unit overrides
+ find /lib/systemd /etc/systemd /run/systemd /usr/lib/systemd -name "*.service" -type f | sed 's#/\(lib\|etc\|run\|usr/lib\)/systemd/##g'| while read -r service_file; do
+ fix_systemd_override_unit "${service_file}"
+ done
+ fi
+ # Workarounds for unprivileged containers.
+ if ! is_lxc_privileged_container; then
+ fix_ro_paths systemd-networkd.service
+ fix_ro_paths systemd-resolved.service
+ fi
fi
# Ignore failures on some units.
@@ -154,7 +154,7 @@ index f7692af..f617b89 100644
# Fix issues with /run not being writable.
fix_ro_run systemd-nsresourced.service
@@ -221,11 +155,6 @@ if [ -d /etc/udev ]; then
@@ -255,11 +184,6 @@ if [ -d /etc/udev ]; then
EOF
fi
@@ -166,7 +166,7 @@ index f7692af..f617b89 100644
# Allow masking units created by the lxc system-generator.
for d in /etc/systemd/system /usr/lib/systemd/system /lib/systemd/system; do
if ! [ -d "${d}" ]; then
@@ -247,7 +176,7 @@ if [ "${SYSTEMD}" -ge 258 ]; then
@@ -281,7 +205,7 @@ if [ "${SYSTEMD}" -ge 258 ]; then
cat <<-EOF > /run/systemd/system/console-getty.service.d/override.conf
[Service]
ExecStart=

View File

@@ -35,15 +35,15 @@ let
in
buildGoModule (finalAttrs: {
pname = "distrobuilder";
version = "3.3.1";
version = "3.4.0";
vendorHash = "sha256-7dYfY6u8URJDMADY6yTW2SjOeSiRwqIh7oxUup6BHMg=";
vendorHash = "sha256-ipKwCeUNVgtkQTPOB5lze2SFaktClUr+4+c0uLX5J/w=";
src = fetchFromGitHub {
owner = "lxc";
repo = "distrobuilder";
tag = "v${finalAttrs.version}";
sha256 = "sha256-l9HtpeG4BSN9saDsNaF9uyOJbHGyLN0PwJ728IJfN/s=";
sha256 = "sha256-dcRUUHpaqNCq4eld+anVrGKywJNpZLJYu3WtERlP3Ps=";
};
buildInputs = bins;

View File

@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage {
src = fetchFromGitLab {
domain = "gitlab.scd31.com";
owner = "stephen";
owner = "sophie";
repo = "dotacat";
rev = "f3b7e7816bed6b84123e066c57cf4003d77a85f1";
hash = "sha256-y+u9PO01W+IzBatGHZpgOD7cRKjdeuy4/VX7/V9cu3Q=";
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage {
meta = {
description = "Like lolcat, but fast";
homepage = "https://gitlab.scd31.com/stephen/dotacat";
homepage = "https://gitlab.scd31.com/sophie/dotacat";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ traxys ];
mainProgram = "dotacat";

View File

@@ -1,6 +1,6 @@
{
lib,
buildGoModule,
buildGo127Module,
fetchFromGitHub,
installShellFiles,
git,
@@ -9,18 +9,18 @@
nix-update-script,
}:
buildGoModule (finalAttrs: {
buildGo127Module (finalAttrs: {
pname = "entire";
version = "0.10.6";
version = "0.11.3";
src = fetchFromGitHub {
owner = "entireio";
repo = "cli";
tag = "v${finalAttrs.version}";
hash = "sha256-l2elFxZi01SO6zrRGxKNoU50ELtrX8G4YTMnxbpdBqE=";
hash = "sha256-6zzj9nORZj6xC3lV+rrzDdovu0dtLArOpBIQrk5g1XQ=";
};
vendorHash = "sha256-3LWRfnyT3OgHsu4SA2cGtCJizjDRolZQs75yjBA4tXc=";
vendorHash = "sha256-VvHoCxuDL7l/rXx4IB8grQmJ457qG/LURc+yxT4YIjY=";
subPackages = [ "cmd/entire" ];

View File

@@ -7,11 +7,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "entr";
version = "5.8";
version = "5.9";
src = fetchurl {
url = "https://eradman.com/entrproject/code/entr-${finalAttrs.version}.tar.gz";
hash = "sha256-3Jor3FVrK+kAwdjN9DLeJkkt5a8/+t4ADUv9l/MSK/s=";
hash = "sha256-DvLOfbcoFnhEqRkElEzQfHzMb9MEG4ScrYYSJNEGqEU=";
};
postPatch = ''

View File

@@ -3,13 +3,13 @@ GEM
specs:
CFPropertyList (3.0.8)
abbrev (0.1.2)
addressable (2.8.9)
addressable (2.9.0)
public_suffix (>= 2.0.2, < 8.0)
artifactory (3.0.17)
atomos (0.1.3)
aws-eventstream (1.4.0)
aws-partitions (1.1233.0)
aws-sdk-core (3.244.0)
aws-partitions (1.1292.0)
aws-sdk-core (3.257.0)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.992.0)
aws-sigv4 (~> 1.9)
@@ -17,137 +17,133 @@ GEM
bigdecimal
jmespath (~> 1, >= 1.6.1)
logger
aws-sdk-kms (1.123.0)
aws-sdk-core (~> 3, >= 3.244.0)
rexml (~> 3.4, >= 3.4.2)
aws-sdk-kms (1.132.0)
aws-sdk-core (~> 3, >= 3.256.0)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.218.0)
aws-sdk-core (~> 3, >= 3.244.0)
aws-sdk-s3 (1.233.1)
aws-sdk-core (~> 3, >= 3.256.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.5)
aws-sigv4 (1.12.1)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
base64 (0.2.0)
base64 (0.3.0)
benchmark (0.5.0)
bigdecimal (4.1.0)
bigdecimal (4.1.3)
cgi (0.5.2)
claide (1.1.0)
colored (1.2)
colored2 (3.1.2)
commander (4.6.0)
highline (~> 2.0.0)
csv (3.3.5)
csv (3.3.6)
declarative (0.0.20)
digest-crc (0.7.0)
rake (>= 12.0.0, < 14.0.0)
domain_name (0.6.20240107)
domain_name (0.6.20260921)
dotenv (2.8.1)
emoji_regex (3.2.3)
excon (0.112.0)
faraday (1.10.5)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
faraday-httpclient (~> 1.0)
faraday-multipart (~> 1.0)
faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.0)
faraday-patron (~> 1.0)
faraday-rack (~> 1.0)
faraday-retry (~> 1.0)
ruby2_keywords (>= 0.0.4)
erb (6.0.7)
excon (1.7.2)
logger
faraday (2.14.4)
faraday-net_http (>= 2.0, < 3.5)
json
logger
faraday-cookie_jar (0.0.8)
faraday (>= 0.8.0)
http-cookie (>= 1.0.0)
faraday-em_http (1.0.0)
faraday-em_synchrony (1.0.1)
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
faraday-follow_redirects (0.5.0)
faraday (>= 1, < 3)
faraday-multipart (1.2.0)
multipart-post (~> 2.0)
faraday-net_http (1.0.2)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
faraday-retry (1.0.4)
faraday_middleware (1.2.1)
faraday (~> 1.0)
faraday-net_http (3.4.4)
net-http (~> 0.5)
faraday-retry (2.4.0)
faraday (~> 2.0)
fastimage (2.4.1)
fastlane (2.232.2)
CFPropertyList (>= 2.3, < 4.0.0)
abbrev (~> 0.1.2)
addressable (>= 2.8, < 3.0.0)
fastlane (2.240.1)
CFPropertyList (>= 2.3, < 5.0.0)
abbrev (~> 0.1)
addressable (>= 2.9.0, < 3.0.0)
artifactory (~> 3.0)
aws-sdk-s3 (~> 1.197)
babosa (>= 1.0.3, < 2.0.0)
base64 (~> 0.2.0)
base64 (~> 0.2)
benchmark (>= 0.1.0)
bundler (>= 1.17.3, < 5.0.0)
bundler (>= 2.4.0, < 5.0.0)
cgi (~> 0.4)
colored (~> 1.2)
commander (~> 4.6)
csv (~> 3.3)
dotenv (>= 2.1.1, < 3.0.0)
emoji_regex (>= 0.1, < 4.0)
excon (>= 0.71.0, < 1.0.0)
faraday (~> 1.0)
faraday-cookie_jar (~> 0.0.6)
faraday_middleware (~> 1.0)
excon (>= 0.71.0, < 2.0.0)
faraday (~> 2.7)
faraday-cookie_jar (~> 0.0.8)
faraday-follow_redirects (~> 0.3)
faraday-multipart (~> 1.0)
faraday-retry (~> 2.0)
fastimage (>= 2.1.0, < 3.0.0)
fastlane-sirp (>= 1.0.0)
fastlane-sirp (>= 1.1.0)
gh_inspector (>= 1.1.2, < 2.0.0)
google-apis-androidpublisher_v3 (~> 0.3)
google-apis-androidpublisher_v3 (~> 0.99)
google-apis-playcustomapp_v1 (~> 0.1)
google-cloud-env (>= 1.6.0, <= 2.1.1)
google-cloud-env (>= 1.6.0, < 2.4.0)
google-cloud-storage (~> 1.31)
highline (~> 2.0)
http-cookie (~> 1.0.5)
irb (>= 1.8)
json (< 3.0.0)
jwt (>= 2.1.0, < 3)
jwt (>= 2.10.3, < 4)
logger (>= 1.6, < 2.0)
mini_magick (>= 4.9.4, < 5.0.0)
multi_json (~> 1.12)
multipart-post (>= 2.0.0, < 3.0.0)
mutex_m (~> 0.3.0)
mutex_m (~> 0.3)
naturally (~> 2.2)
nkf (~> 0.2.0)
nkf (~> 0.2)
optparse (>= 0.1.1, < 1.0.0)
ostruct (>= 0.1.0)
plist (>= 3.1.0, < 4.0.0)
rubyzip (>= 2.0.0, < 3.0.0)
security (= 0.1.5)
rubyzip (>= 3.4.0, < 4.0.0)
security (~> 0.3)
simctl (~> 1.6.3)
terminal-notifier (>= 2.0.0, < 3.0.0)
terminal-table (~> 3)
terminal-table (~> 4)
tty-screen (>= 0.6.3, < 1.0.0)
tty-spinner (>= 0.8.0, < 1.0.0)
word_wrap (~> 1.0.0)
xcodeproj (>= 1.13.0, < 2.0.0)
xcpretty (~> 0.4.1)
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
fastlane-sirp (1.0.0)
sysrandom (~> 1.0)
fastlane-sirp (1.1.0)
gh_inspector (1.1.3)
google-apis-androidpublisher_v3 (0.98.0)
google-apis-androidpublisher_v3 (0.109.0)
google-apis-core (>= 0.15.0, < 2.a)
google-apis-core (0.18.0)
addressable (~> 2.5, >= 2.5.1)
googleauth (~> 1.9)
httpclient (>= 2.8.3, < 3.a)
mini_mime (~> 1.0)
mutex_m
google-apis-core (1.2.5)
addressable (~> 2.9)
faraday (~> 2.13)
faraday-follow_redirects (~> 0.3)
googleauth (~> 1.14)
mini_mime (~> 1.1)
multi_json (~> 1.11)
representable (~> 3.0)
retriable (>= 2.0, < 4.a)
google-apis-iamcredentials_v1 (0.26.0)
retriable (>= 3.1, < 5.0)
google-apis-iamcredentials_v1 (0.28.0)
google-apis-core (>= 0.15.0, < 2.a)
google-apis-playcustomapp_v1 (0.17.0)
google-apis-playcustomapp_v1 (0.18.0)
google-apis-core (>= 0.15.0, < 2.a)
google-apis-storage_v1 (0.61.0)
google-apis-storage_v1 (0.68.0)
google-apis-core (>= 0.15.0, < 2.a)
google-cloud-core (1.8.0)
google-cloud-core (1.9.0)
google-cloud-env (>= 1.0, < 3.a)
google-cloud-errors (~> 1.0)
google-cloud-env (2.1.1)
google-cloud-env (2.3.1)
base64 (~> 0.2)
faraday (>= 1.0, < 3.a)
google-cloud-errors (1.6.0)
google-cloud-storage (1.59.0)
google-cloud-errors (1.7.0)
google-cloud-storage (1.62.1)
addressable (~> 2.8)
digest-crc (~> 0.4)
google-apis-core (>= 0.18, < 2)
@@ -156,73 +152,100 @@ GEM
google-cloud-core (~> 1.6)
googleauth (~> 1.9)
mini_mime (~> 1.0)
googleauth (1.11.2)
google-logging-utils (0.2.0)
googleauth (1.17.4)
faraday (>= 1.0, < 3.a)
google-cloud-env (~> 2.1)
jwt (>= 1.4, < 3.0)
multi_json (~> 1.11)
google-cloud-env (~> 2.2)
google-logging-utils (~> 0.1)
jwt (>= 1.4, < 4.0)
os (>= 0.9, < 2.0)
pstore (~> 0.1)
signet (>= 0.16, < 2.a)
highline (2.0.3)
http-cookie (1.0.8)
http-cookie (1.1.6)
domain_name (~> 0.5)
httpclient (2.9.0)
mutex_m
io-console (0.9.4)
irb (1.18.0)
pp (>= 0.6.0)
prism (>= 1.3.0)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
jmespath (1.6.2)
json (2.19.3)
jwt (2.10.2)
json (2.21.2)
jwt (3.3.0)
base64
logger (1.7.0)
mini_magick (4.13.2)
mini_mime (1.1.5)
multi_json (1.19.1)
multi_json (1.21.2)
multipart-post (2.4.1)
mutex_m (0.3.0)
nanaimo (0.4.0)
naturally (2.3.0)
nkf (0.2.0)
net-http (0.9.1)
uri (>= 0.11.1)
nkf (0.3.0)
optparse (0.8.1)
os (1.1.4)
ostruct (0.6.3)
plist (3.7.2)
pp (0.6.4)
prettyprint
prettyprint (0.2.0)
prism (1.9.0)
pstore (0.2.1)
public_suffix (7.0.5)
rake (13.3.1)
representable (3.2.0)
rake (13.4.2)
rbs (4.2.0)
logger
prism (>= 1.6.0)
tsort
rdoc (8.1.0)
erb
prism (>= 1.6.0)
rbs (>= 4.0.0)
tsort
reline (0.7.0)
io-console (~> 0.5)
representable (3.3.1)
declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
retriable (3.4.1)
retriable (4.2.0)
rexml (3.4.4)
rouge (3.28.0)
ruby2_keywords (0.0.5)
rubyzip (2.4.1)
security (0.1.5)
signet (0.21.0)
rubyzip (3.7.0)
security (0.3.0)
signet (0.22.0)
addressable (~> 2.8)
faraday (>= 0.17.5, < 3.a)
jwt (>= 1.5, < 4.0)
multi_json (~> 1.10)
simctl (1.6.10)
CFPropertyList
naturally
sysrandom (1.0.5)
terminal-notifier (2.0.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
terminal-table (4.0.0)
unicode-display_width (>= 1.1.1, < 4)
trailblazer-option (0.1.2)
tsort (0.2.0)
tty-cursor (0.7.1)
tty-screen (0.8.2)
tty-spinner (0.9.3)
tty-cursor (~> 0.7)
uber (0.1.0)
unicode-display_width (2.6.0)
unicode-display_width (3.3.0)
unicode-emoji (~> 4.3)
unicode-emoji (4.3.0)
uri (1.1.1)
word_wrap (1.0.0)
xcodeproj (1.27.0)
xcodeproj (1.28.1)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
base64
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.4.0)
nkf
rexml (>= 3.3.6, < 4.0)
xcpretty (0.4.1)
rouge (~> 3.28.0)

View File

@@ -15,10 +15,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "11ali533wx91fh93xlk88gjqq8w0p7kxw09nlh41hwc9wv5ly5fc";
sha256 = "1by7h2lwziiblizpd5yx87jsq8ppdhzvwf08ga34wzqgcv1nmpvz";
type = "gem";
};
version = "2.8.9";
version = "2.9.0";
};
artifactory = {
groups = [ "default" ];
@@ -55,10 +55,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1hhkcawvn8fr5ys7xy4bhk4glcqyyibwkd3y75cidc9d123393cj";
sha256 = "1f64r0isilrlz0hjssj12b8ls7s0616d2pwp9ki143v4g2wfiyy7";
type = "gem";
};
version = "1.1233.0";
version = "1.1292.0";
};
aws-sdk-core = {
dependencies = [
@@ -69,15 +69,16 @@
"bigdecimal"
"jmespath"
"logger"
"rexml"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1shqk9frm15g1ygiy33krwj34jrphfjc6w63bglxwnqcic3qqi9y";
sha256 = "1iljck5b1s02vagyvgivg9j81nk2wl721qwfd33cws7ngyfd2am9";
type = "gem";
};
version = "3.244.0";
version = "3.257.0";
};
aws-sdk-kms = {
dependencies = [
@@ -88,10 +89,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "080zh4g1lcjl0bz2l0gjm8vmpd60cvi0p658bh235ypqh9zg61fl";
sha256 = "1756vjcbz034aw7mzyqxh13bgsssgz573sc7mk0xbs9vpfbh0jq9";
type = "gem";
};
version = "1.123.0";
version = "1.132.0";
};
aws-sdk-s3 = {
dependencies = [
@@ -103,10 +104,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "134qr73ri1j52y42xib0fpyscd5miwc37zx1ikxavwh747rsawjn";
sha256 = "1s8r5738wic5h77r1a413m9wmklchzikli51jdzawm334r8m1yyd";
type = "gem";
};
version = "1.218.0";
version = "1.233.1";
};
aws-sigv4 = {
dependencies = [ "aws-eventstream" ];
@@ -134,10 +135,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g";
sha256 = "0yx9yn47a8lkfcjmigk79fykxvr80r4m1i35q82sxzynpbm7lcr7";
type = "gem";
};
version = "0.2.0";
version = "0.3.0";
};
benchmark = {
groups = [ "default" ];
@@ -154,10 +155,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1bkcvp4aavdxh1pmgg65sypyjx5l0w5ffylfsk65di1xm9kpgh3d";
sha256 = "0rng45p4vc3f6nac44cnylwch7rj4zsff3icdz6c7garwpjy3sv1";
type = "gem";
};
version = "4.1.0";
version = "4.1.3";
};
CFPropertyList = {
groups = [ "default" ];
@@ -169,6 +170,16 @@
};
version = "3.0.8";
};
cgi = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1fzqwshg1xzbdm97havskfp6wifsgbjii00dzba0y6bih4lk1jk1";
type = "gem";
};
version = "0.5.2";
};
claide = {
groups = [ "default" ];
platforms = [ ];
@@ -215,10 +226,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0gz7r2kazwwwyrwi95hbnhy54kwkfac5swh2gy5p5vw36fn38lbf";
sha256 = "0mj4kq4wwpc7c8ll52q30hsir1jrcd5kq7yb8lyz0rksa1z1x9mb";
type = "gem";
};
version = "3.3.5";
version = "3.3.6";
};
declarative = {
groups = [ "default" ];
@@ -246,10 +257,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0cyr2xm576gqhqicsyqnhanni47408w2pgvrfi8pd13h2li3nsaz";
sha256 = "0vgfimffni6yryk76k7grvixisaikbhc925fs3z07rpsd6gr8ddk";
type = "gem";
};
version = "0.6.20240107";
version = "0.6.20260921";
};
dotenv = {
groups = [ "default" ];
@@ -271,38 +282,41 @@
};
version = "3.2.3";
};
excon = {
erb = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1w7098hnyby5sn2315qy26as6kxlxivxlcrs714amj9g9hxaryfs";
sha256 = "14pfj6zn0p1hxj6s6s0r7d424wap8zl9zxf89nj79y8fbg16vjn5";
type = "gem";
};
version = "0.112.0";
version = "6.0.7";
};
excon = {
dependencies = [ "logger" ];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0sd5i4hra1zf0gfpvbr33qlnfmsx6ayjmicwww6z0d7i41sb2mr5";
type = "gem";
};
version = "1.7.2";
};
faraday = {
dependencies = [
"faraday-em_http"
"faraday-em_synchrony"
"faraday-excon"
"faraday-httpclient"
"faraday-multipart"
"faraday-net_http"
"faraday-net_http_persistent"
"faraday-patron"
"faraday-rack"
"faraday-retry"
"ruby2_keywords"
"json"
"logger"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1vgnx245yp2fg0fr3bixp4lcqhqn7rr35xdm42l2yra5n39g2i5i";
sha256 = "0vmb5wpiz7mf2r6vjvhvfp38rrfvqjzmv7m3max0s6v28j641d4v";
type = "gem";
};
version = "1.10.5";
version = "2.14.4";
};
faraday-cookie_jar = {
dependencies = [
@@ -318,45 +332,16 @@
};
version = "0.0.8";
};
faraday-em_http = {
faraday-follow_redirects = {
dependencies = [ "faraday" ];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs";
sha256 = "1b8hgpci3wjm3rm41bzpasvsc5j253ljyg5rsajl62dkjk497pjw";
type = "gem";
};
version = "1.0.0";
};
faraday-em_synchrony = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0l0pz1wk2mk6p6hbfd86jfad59jyk201y1db379qhc2lrxfy8g5z";
type = "gem";
};
version = "1.0.1";
};
faraday-excon = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh";
type = "gem";
};
version = "1.1.0";
};
faraday-httpclient = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc";
type = "gem";
};
version = "1.0.1";
version = "0.5.0";
};
faraday-multipart = {
dependencies = [ "multipart-post" ];
@@ -370,65 +355,26 @@
version = "1.2.0";
};
faraday-net_http = {
dependencies = [ "net-http" ];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "10n6wikd442mfm15hd6gzm0qb527161w1wwch4h5m4iclkz2x6b3";
sha256 = "125m3qri52vwh5v9dhq0dkqxf8629cxrf99yyc01pva72wasyy0f";
type = "gem";
};
version = "1.0.2";
};
faraday-net_http_persistent = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b";
type = "gem";
};
version = "1.2.0";
};
faraday-patron = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w";
type = "gem";
};
version = "1.0.0";
};
faraday-rack = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g";
type = "gem";
};
version = "1.0.0";
version = "3.4.4";
};
faraday-retry = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1ahnsyy5f0f9qqna8883z4m10b2x19nfbzy2d5ngkavzfwrr4rfw";
type = "gem";
};
version = "1.0.4";
};
faraday_middleware = {
dependencies = [ "faraday" ];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1s990pnapb3vci9c00bklqc7jjix4i2zhxn2zf1lfk46xv47hnyl";
sha256 = "1ghys6d46j8mxkqprnlz1ks1y1w0lsa2vca7ybx2crg5ny7w8ybv";
type = "gem";
};
version = "1.2.1";
version = "2.4.0";
};
fastimage = {
groups = [ "default" ];
@@ -450,6 +396,7 @@
"babosa"
"base64"
"benchmark"
"cgi"
"colored"
"commander"
"csv"
@@ -458,7 +405,9 @@
"excon"
"faraday"
"faraday-cookie_jar"
"faraday_middleware"
"faraday-follow_redirects"
"faraday-multipart"
"faraday-retry"
"fastimage"
"fastlane-sirp"
"gh_inspector"
@@ -467,11 +416,12 @@
"google-cloud-env"
"google-cloud-storage"
"highline"
"http-cookie"
"irb"
"json"
"jwt"
"logger"
"mini_magick"
"multi_json"
"multipart-post"
"mutex_m"
"naturally"
@@ -495,21 +445,20 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "04misa8c6msjjsc1fz11a9drznjfpq9fz1nyk53dbhqg1zv8k1lp";
sha256 = "0p5ajqbbz3j8a8xilsx4nfsch6gm61jxlv21x9s6bby6kv4jnyfg";
type = "gem";
};
version = "2.232.2";
version = "2.240.1";
};
fastlane-sirp = {
dependencies = [ "sysrandom" ];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0hg6ql3g25f96fsmwr9xlxpn8afa7wvjampnrh1fqffhphjqyiv6";
sha256 = "0iyqaidxgrpxcp3ifdx3ygqq32fxfqm4acgvmldqxz9fd3wr9g0h";
type = "gem";
};
version = "1.0.0";
version = "1.1.0";
};
gh_inspector = {
groups = [ "default" ];
@@ -527,18 +476,19 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1jy5r35j4jxq2kv6dqnv7aijyskfr7h6dyjddk0k24cw859bjkq9";
sha256 = "0miai822438w1jqpl1nyqpyyy46dxi8vswyidgl3blm0yj5bpzdl";
type = "gem";
};
version = "0.98.0";
version = "0.109.0";
};
google-apis-core = {
dependencies = [
"addressable"
"faraday"
"faraday-follow_redirects"
"googleauth"
"httpclient"
"mini_mime"
"mutex_m"
"multi_json"
"representable"
"retriable"
];
@@ -546,10 +496,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1vjls3xdzphphay0z3wmv2lw4zxbiv3vbmcy2d4b9spfdy0mgc4n";
sha256 = "0sgzmnhxs13j7zl199ga52kgdl7y7af44phnqfhcc3vscasn45g2";
type = "gem";
};
version = "0.18.0";
version = "1.2.5";
};
google-apis-iamcredentials_v1 = {
dependencies = [ "google-apis-core" ];
@@ -557,10 +507,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "18s8kshls6amld400434xgmgssn2y9fpqnz9ahjxzkfnl480mxrz";
sha256 = "01pibvf55lzxrw2anr5vignij5f6vwjpm9zj99anki9rrkkgz4ha";
type = "gem";
};
version = "0.26.0";
version = "0.28.0";
};
google-apis-playcustomapp_v1 = {
dependencies = [ "google-apis-core" ];
@@ -568,10 +518,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0y2sm5zwm45a3n188nk8w5771ghakd28d04rnjx65y7k0nvr1g6m";
sha256 = "0m52hrblb2lhx2dcfwwx5wnkhpnwbr4f32yrx72rm9g4vswpgcj4";
type = "gem";
};
version = "0.17.0";
version = "0.18.0";
};
google-apis-storage_v1 = {
dependencies = [ "google-apis-core" ];
@@ -579,10 +529,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1s42r7hmf2wl8l0wdc7z07qvmgbdilwjb58q7i9h2slfnncyac5k";
sha256 = "1z2rp66mxzjvyk2va9in2z73bwgck18fzz85ragmdz5lcq27sf23";
type = "gem";
};
version = "0.61.0";
version = "0.68.0";
};
google-cloud-core = {
dependencies = [
@@ -593,31 +543,34 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1kw10897ardky1chwwsb8milygzcdi8qlqlhcnqwmkw9y75yswp5";
sha256 = "1942nv131809aw3vrcz75zdbbpvi8z7c3p3fzgp8v3j8a6gl0mdb";
type = "gem";
};
version = "1.8.0";
version = "1.9.0";
};
google-cloud-env = {
dependencies = [ "faraday" ];
dependencies = [
"base64"
"faraday"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "16b9yjbrzal1cjkdbn29fl06ikjn1dpg1vdsjak1xvhpsp3vhjyg";
sha256 = "1rvqj6n6qhjmjy0lynpmga7ly48s7dk36i6nj4jqrrvvn8gc1ahg";
type = "gem";
};
version = "2.1.1";
version = "2.3.1";
};
google-cloud-errors = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "18fh8xvflhhksibcn1v4gnrn6d3xs284ng1fsfwh9b86sxnlga0x";
sha256 = "1czb8a07zb1v03qgzfknl1npb7b2vsaq9winkxl0iblsv112ys3f";
type = "gem";
};
version = "1.6.0";
version = "1.7.0";
};
google-cloud-storage = {
dependencies = [
@@ -634,28 +587,39 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1fc6n7227l3b0b14c0gbfqjibn3zw1mivfvrnb66apbp3mkabjdq";
sha256 = "0g2dgbpnnfriqn5ryv5z2z5wc9wqi35n8lrk86wb9w9svbmz5nqh";
type = "gem";
};
version = "1.59.0";
version = "1.62.1";
};
google-logging-utils = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0yyzlgy9hx104xhrbl51ana0dl3m5p5989j4lcjsizssxas64m37";
type = "gem";
};
version = "0.2.0";
};
googleauth = {
dependencies = [
"faraday"
"google-cloud-env"
"google-logging-utils"
"jwt"
"multi_json"
"os"
"pstore"
"signet"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "07kk8h5f9q62qf1mk7rycgv6m09rd0k8baffdpb3vsksxnpaqsvy";
sha256 = "1qwszs0c8xiqzb3h0l5acphijmv7r73cn8n997qlh401lv1cmhmc";
type = "gem";
};
version = "1.11.2";
version = "1.17.4";
};
highline = {
groups = [ "default" ];
@@ -673,21 +637,36 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "19hsskzk5zpv14mnf07pq71hfk1fsjwfjcw616pgjjzjbi2f0kxi";
sha256 = "1aga7z4p0dka4zcqw9i05wa4ab1q7h7cgnj328ldqqfycjz84jxs";
type = "gem";
};
version = "1.0.8";
version = "1.1.6";
};
httpclient = {
dependencies = [ "mutex_m" ];
io-console = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1j4qwj1nv66v3n9s4xqf64x2galvjm630bwa5xngicllwic5jr2b";
sha256 = "1cgvhm0d4awr8j42b8v1nl1jfgx45ihv8mylargfi3lj697k00x4";
type = "gem";
};
version = "2.9.0";
version = "0.9.4";
};
irb = {
dependencies = [
"pp"
"prism"
"rdoc"
"reline"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1qs8a9vprg7s8krgq4s0pygr91hclqqyz98ik15p0m1sf2h5956y";
type = "gem";
};
version = "1.18.0";
};
jmespath = {
groups = [ "default" ];
@@ -704,10 +683,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0il6qxkxqql7n7sgrws5bi5a36v51dswqcxb6j6gm8aj62shp6r8";
sha256 = "0shwgjqbj856mb6m9kgkpy08nhym2gdvc2yaprlimfmky9y3n78z";
type = "gem";
};
version = "2.19.3";
version = "2.21.2";
};
jwt = {
dependencies = [ "base64" ];
@@ -715,10 +694,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1x64l31nkqjwfv51s2vsm0yqq4cwzrlnji12wvaq761myx3fxq9i";
sha256 = "0ip59r7z8mjwy1rq0pp53kxhvkjb5d942rpn7hiliha1qgxk9k24";
type = "gem";
};
version = "2.10.2";
version = "3.3.0";
};
logger = {
groups = [ "default" ];
@@ -755,10 +734,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1drisvysgvnjlz49a0qcbs294id6mvj3i8iik5rvym68ybwfzvvs";
sha256 = "13pabgwf4qd5qn4sl7ci15g5ql038n5z0psip9xabnsbypm32m94";
type = "gem";
};
version = "1.19.1";
version = "1.21.2";
};
multipart-post = {
groups = [ "default" ];
@@ -800,15 +779,26 @@
};
version = "2.3.0";
};
net-http = {
dependencies = [ "uri" ];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "15k96fj6qwbaiv6g52l538ass95ds1qwgynqdridz29yqrkhpfi5";
type = "gem";
};
version = "0.9.1";
};
nkf = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "09piyp2pd74klb9wcn0zw4mb5l0k9wzwppxggxi1yi95l2ym3hgv";
sha256 = "15c8b3ipdwagcfpky90w98wnl1s6cla6bxihb6vjgdrqpaz8syim";
type = "gem";
};
version = "0.2.0";
version = "0.3.0";
};
optparse = {
groups = [ "default" ];
@@ -850,6 +840,47 @@
};
version = "3.7.2";
};
pp = {
dependencies = [ "prettyprint" ];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0w5mha75hs8gdj75g8vl0sxpyp8rzvwq8a4jcmi4ah8cf370zjyz";
type = "gem";
};
version = "0.6.4";
};
prettyprint = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "14zicq3plqi217w6xahv7b8f7aj5kpxv1j1w98344ix9h5ay3j9b";
type = "gem";
};
version = "0.2.0";
};
prism = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "11ggfikcs1lv17nhmhqyyp6z8nq5pkfcj6a904047hljkxm0qlvv";
type = "gem";
};
version = "1.9.0";
};
pstore = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "06icf1n6z7snygcq51zdm1zdz20cpkd4qw76s6b9wmv65h7lv403";
type = "gem";
};
version = "0.2.1";
};
public_suffix = {
groups = [ "default" ];
platforms = [ ];
@@ -865,10 +896,52 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "175iisqb211n0qbfyqd8jz2g01q6xj038zjf4q0nm8k6kz88k7lc";
sha256 = "009p524zl0p0kfa65nii8wdmaigkmawv9pbvlcffky7islmmp0nb";
type = "gem";
};
version = "13.3.1";
version = "13.4.2";
};
rbs = {
dependencies = [
"logger"
"prism"
"tsort"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0x067q8cdam4kv5dc09iq2nzca8qm2kdl0dr22gc0ny0vj3bixsi";
type = "gem";
};
version = "4.2.0";
};
rdoc = {
dependencies = [
"erb"
"prism"
"rbs"
"tsort"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "02pn63i2r5z44hcfhxbaag9rvqsyznsliivnn7f3dzaw1a43gz5y";
type = "gem";
};
version = "8.1.0";
};
reline = {
dependencies = [ "io-console" ];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0gaq2lc463ap1srz7y5kh2p4dxazs7vjrpiby58d9yfvan72s0av";
type = "gem";
};
version = "0.7.0";
};
representable = {
dependencies = [
@@ -880,20 +953,20 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1kms3r6w6pnryysnaqqa9fsn0v73zx1ilds9d1c565n3xdzbyafc";
sha256 = "0rpm8368qyizzpy1j144k918n9l6cdh0yfg0xr3q2nczz7pchpwa";
type = "gem";
};
version = "3.2.0";
version = "3.3.1";
};
retriable = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1g634lvyriq8pk87fn0dnz2ib9mma98ks7y0b30j28a9gm5i2gzv";
sha256 = "1p4c1xrwbnhgwa0mj6pg9ii7l3s2bb9lv9nzlgr0471a8xbv5hwh";
type = "gem";
};
version = "3.4.1";
version = "4.2.0";
};
rexml = {
groups = [ "default" ];
@@ -915,51 +988,40 @@
};
version = "3.28.0";
};
ruby2_keywords = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz";
type = "gem";
};
version = "0.0.5";
};
rubyzip = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "05an0wz87vkmqwcwyh5rjiaavydfn5f4q1lixcsqkphzvj7chxw5";
sha256 = "08g1sfv1s8vs9yaz27vjpmgihcycx9nm3wq6j29plabmvaa95hb5";
type = "gem";
};
version = "2.4.1";
version = "3.7.0";
};
security = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1drkm2wgjazwzj09db1szrllkag036bdvc3dr42fh1kpr877m5rs";
sha256 = "1w7c42kh6fkmqis3sh6k20dlji4iwszl8h6faa2nraaqh9qhd7dw";
type = "gem";
};
version = "0.1.5";
version = "0.3.0";
};
signet = {
dependencies = [
"addressable"
"faraday"
"jwt"
"multi_json"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0nydm087m5c3j85gvzvz30w1qb9pl2lzpznw746jha29ybxyj5yn";
sha256 = "1027zvf46y2x00s515a1f5qyvn59cl394glzr3dkbb87rdf4jvdp";
type = "gem";
};
version = "0.21.0";
version = "0.22.0";
};
simctl = {
dependencies = [
@@ -975,16 +1037,6 @@
};
version = "1.6.10";
};
sysrandom = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0x8yryf6migjnkfwr8dxgx1qyzhvajgha60hr5mgfkn65qyarhas";
type = "gem";
};
version = "1.0.5";
};
terminal-notifier = {
groups = [ "default" ];
platforms = [ ];
@@ -1001,10 +1053,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "14dfmfjppmng5hwj7c5ka6qdapawm3h6k9lhn8zj001ybypvclgr";
sha256 = "1lh18gwpksk25sbcjgh94vmfw2rz0lrq61n7lwp1n9gq0cr7j17m";
type = "gem";
};
version = "3.0.2";
version = "4.0.0";
};
trailblazer-option = {
groups = [ "default" ];
@@ -1016,6 +1068,16 @@
};
version = "0.1.2";
};
tsort = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "17q8h020dw73wjmql50lqw5ddsngg67jfw8ncjv476l5ys9sfl4n";
type = "gem";
};
version = "0.2.0";
};
tty-cursor = {
groups = [ "default" ];
platforms = [ ];
@@ -1058,14 +1120,35 @@
version = "0.1.0";
};
unicode-display_width = {
dependencies = [ "unicode-emoji" ];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0nkz7fadlrdbkf37m0x7sw8bnz8r355q3vwcfb9f9md6pds9h9qj";
sha256 = "04xnl0zwpjjvxipd6rdnxkm11pfhbhhi3179yzv51nqi9dmacyjb";
type = "gem";
};
version = "2.6.0";
version = "3.3.0";
};
unicode-emoji = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1kp89lja8ii7l6f0bq5vdxq1p3kxr3a2qmmhdc38qdwh6akjzh0i";
type = "gem";
};
version = "4.3.0";
};
uri = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1ijpbj7mdrq7rhpq2kb51yykhrs2s54wfs6sm9z3icgz4y6sb7rp";
type = "gem";
};
version = "1.1.1";
};
word_wrap = {
groups = [ "default" ];
@@ -1081,19 +1164,21 @@
dependencies = [
"CFPropertyList"
"atomos"
"base64"
"claide"
"colored2"
"nanaimo"
"nkf"
"rexml"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1lslz1kfb8jnd1ilgg02qx0p0y6yiq8wwk84mgg2ghh58lxsgiwc";
sha256 = "1p6dnpjqf50klc4br8121q2qdk01xzb8kb17r8bri7bk007nf4kg";
type = "gem";
};
version = "1.27.0";
version = "1.28.1";
};
xcpretty = {
dependencies = [ "rouge" ];

View File

@@ -16,18 +16,18 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "fish-lsp";
version = "1.1.4";
version = "1.1.5";
src = fetchFromGitHub {
owner = "ndonfris";
repo = "fish-lsp";
tag = "v${finalAttrs.version}";
hash = "sha256-kPGbEi0KCq/BsEq2RkFb5zfARncMIvXHniOUglNYk1s=";
hash = "sha256-1/3guOvzhE98dYaQ+X1vyRkTMyetbdhALKHgVSpbiFs=";
};
yarnOfflineCache = fetchYarnDeps {
yarnLock = finalAttrs.src + "/yarn.lock";
hash = "sha256-WrH56oWTTDG1P/OHC5WjLCkZM3j6HEirAvhF+6Xd76I=";
hash = "sha256-79uKP1wGIAFuCHFtm04XkJTaZxc/WaKFRiTflsPoF0M=";
};
nativeBuildInputs = [

View File

@@ -327,3 +327,25 @@ def remove_paths(paths, graph):
@curry
def reverse(iterator):
return reversed(list(iterator))
@curry
def reorder(keys, graph):
"""Reorder the keys of a dict of graphs, controlling the traversal order
when followed by flatten(). Keys absent from the graph are ignored;
keys present in the graph but not in `keys` are appended at the end in
their original insertion order.
Example: after subcomponent_out the result is {"main": ..., "rest": ...}
and flatten() yields main before rest. Use reorder(["rest", "main"]) to
put rest-layers first without the double-reverse workaround.
Also works for split_paths which returns {"main", "common", "rest"}:
reorder(["rest", "common", "main"]) puts shared deps (common) before the
split-off paths (main).
"""
if not isinstance(graph, dict):
return graph
ordered = {k: graph[k] for k in keys if k in graph}
remainder = {k: v for k, v in graph.items() if k not in ordered}
return {**ordered, **remainder}

View File

@@ -10,7 +10,8 @@ from .lib import (
limit_layers,
pick_keys,
references_graph_to_igraph,
reference_graph_node_keys_to_keep
reference_graph_node_keys_to_keep,
reorder
)
if __name__ == "__main__":
@@ -197,3 +198,45 @@ class TestLib(unittest.TestCase, th.CustomAssertions):
)
self.assertGraphEqual(graph, result_list[0])
class TestReorder(unittest.TestCase):
def test_reorder_two_keys_swaps_main_and_rest(self):
g1 = directed_graph([], ["A"])
g2 = directed_graph([], ["B"])
d = {"main": g1, "rest": g2}
result = reorder(["rest", "main"], d)
self.assertEqual(list(result.keys()), ["rest", "main"])
self.assertIs(result["rest"], g2)
self.assertIs(result["main"], g1)
def test_reorder_three_keys_split_paths_order(self):
g_main = directed_graph([], ["A"])
g_common = directed_graph([], ["B"])
g_rest = directed_graph([], ["C"])
d = {"main": g_main, "common": g_common, "rest": g_rest}
result = reorder(["rest", "common", "main"], d)
self.assertEqual(list(result.keys()), ["rest", "common", "main"])
def test_reorder_missing_keys_are_ignored(self):
g1 = directed_graph([], ["A"])
g2 = directed_graph([], ["B"])
d = {"main": g1, "rest": g2}
# "common" is not in dict — should be silently skipped
result = reorder(["rest", "common", "main"], d)
self.assertEqual(list(result.keys()), ["rest", "main"])
def test_reorder_extra_keys_appended_in_original_order(self):
g1 = directed_graph([], ["A"])
g2 = directed_graph([], ["B"])
g3 = directed_graph([], ["C"])
g4 = directed_graph([], ["D"])
d = {"main": g1, "rest": g2, "extra1": g3, "extra2": g4}
result = reorder(["rest", "main"], d)
self.assertEqual(list(result.keys()), ["rest", "main", "extra1", "extra2"])
def test_reorder_non_dict_passthrough(self):
graphs = [directed_graph([], ["A"]), directed_graph([], ["B"])]
result = reorder(["rest", "main"], graphs)
self.assertIs(result, graphs)

View File

@@ -20,7 +20,8 @@ funcs = tlz.merge(
"split_every",
"limit_layers",
"remove_paths",
"reverse"
"reverse",
"reorder"
],
lib
),

View File

@@ -151,3 +151,62 @@ class Test(
([], ["A", "B"])
]
)
def test_reorder_rest_before_main(self):
# Verify that ["reorder" ["rest" "main"]] puts the rest-graph layers
# before the main (split-off) layers, equivalent to the double-reverse
# workaround but expressed directly.
#
# Graph: Root -> A -> B -> D
# -> C
# Split off B and its deps; rest should come first.
graph = directed_graph(
[
("Root", "A"),
("A", "B"),
("A", "C"),
("B", "D"),
]
)
# Without reorder: main (B+D) comes before rest (Root, A, C)
result_without = list(pipe(
[
["subcomponent_out", ["B"]],
["flatten"],
],
graph
))
# main graph contains B and D
main_names = set(result_without[0].vs["name"])
self.assertIn("B", main_names)
# With reorder: rest (Root, A, C) comes before main (B+D)
result_with = list(pipe(
[
["subcomponent_out", ["B"]],
["reorder", ["rest", "main"]],
["flatten"],
],
graph
))
rest_names = set(result_with[0].vs["name"])
self.assertIn("A", rest_names)
self.assertNotIn("B", rest_names)
def test_reorder_three_keys_split_paths(self):
# split_paths returns {"main", "common", "rest"} — verify reorder
# can express "rest, common, main" ordering for stable shared layers first.
graph = make_test_graph()
result = list(pipe(
[
["split_paths", ["B"]],
["reorder", ["rest", "common", "main"]],
["flatten"],
["limit_layers", 3],
],
graph
))
# rest should be first: contains Root1, A, C (no B or its exclusive deps)
first_names = set(result[0].vs["name"])
self.assertNotIn("B", first_names)

View File

@@ -10,11 +10,11 @@
stdenv.mkDerivation {
pname = "flirc";
version = "3.27.15";
version = "3.27.19";
src = fetchurl {
url = "https://web.archive.org/web/20240626115121/http://apt.flirc.tv/arch/x86_64/flirc.latest.x86_64.tar.gz";
hash = "sha256-8bUsOsp5obJJdZU9QHfJnZKNAXJwi0nrHkSeDTE1Xa4=";
url = "https://web.archive.org/web/20260826023719if_/http://apt.flirc.tv/arch/x86_64/flirc.latest.x86_64.tar.gz";
hash = "sha256-oQCplncTkcpxnclyh0wqe2veoWEtIeSnEeDgN8Qi9fY=";
};
nativeBuildInputs = [

View File

@@ -9,10 +9,10 @@
}:
let
version = "2.9.5";
srcHash = "sha256-XHK9GkKyLLogtvahcf+hOvfyk2Bxp6kpWN977gOOkHM=";
vendorHash = "sha256-NRt/exSNjgBdFtj6ZsPk0ounwQGKZ4Ndpx8FsupdVNo=";
manifestsHash = "sha256-CncxZ/ADsKlLbCHI5kxcUT/WHlv3hYCfFFoqDIuqvMY=";
version = "2.9.6";
srcHash = "sha256-McTgHU54fp1UDOE+VBJdX87ZaxYXP7uISD/fhz7AhCw=";
vendorHash = "sha256-riIU2ZsUgoNKtDQrzns+T9STZbq89GuOvBh0GG7o1KU=";
manifestsHash = "sha256-S67U39zCqSokMgsG2yUsQUCrqp9Pmd3kdVeEmRcp0E0=";
manifests = fetchzip {
url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";

View File

@@ -8,20 +8,20 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "gdscript-formatter";
version = "0.26.2";
version = "0.27.0";
src = fetchFromGitHub {
owner = "GDQuest";
repo = "GDScript-formatter";
tag = finalAttrs.version;
hash = "sha256-9x9ign+Y4K0M+VRDpT+mjpzwx3KZIXI/UIpW4JBSDY8=";
hash = "sha256-lr17ZX142o5aOIB+HRjM/MnB8P2QwLVV3vCM6QsQ+bU=";
# Needed due to .gitattributes being used for the Godot addon and export-ignoring all files
deepClone = true;
# Avoid hash differences due to differences in .git
leaveDotGit = false;
};
cargoHash = "sha256-0bnGxlPfjNTZXRk2uLn1efHT8j+CBDWs9Ad6wrGiZ+g=";
cargoHash = "sha256-5cDR4NJ/uBbwN/MD2MUthwKCVjGHZGp2y5D00Qf8xgc=";
cargoBuildFlags = [
"--bin=gdscript-formatter"

View File

@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "genact";
version = "1.5.1";
version = "1.6.0";
src = fetchFromGitHub {
owner = "svenstaro";
repo = "genact";
rev = "v${finalAttrs.version}";
sha256 = "sha256-D1uecxrRR49EUa2fHm/ieQ4Gp0m5p0ncj5YiINwlvN8=";
sha256 = "sha256-hz+DZCoZzi4ZtGUQfQJ5f6sGqgbB32bIIdxTE2TeWrY=";
};
cargoHash = "sha256-lX/bb6RGcsfgfjhK7SwwcY9R7USSEdG5VLK6v2LOvas=";
cargoHash = "sha256-1Ju44DKNFb2EhDBuwJUUPKBXMNJEHZ3Qrb4yQBXca+I=";
nativeBuildInputs = [ installShellFiles ];

View File

@@ -180,7 +180,7 @@ let
linux = stdenvNoCC.mkDerivation (finalAttrs: {
inherit pname meta;
version = "154.0.8037.92";
version = "154.0.8037.97";
src =
let
@@ -195,8 +195,8 @@ let
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_${debArch}.deb";
hash =
{
amd64 = "sha256-aeP2rApIEfRonKI/H9XMWywBVQiBkos+GWqXExFlxKI=";
arm64 = "sha256-mGYQvLwfWO7t6UkhCGrbs8HfLm08tNo5WxoY5xt963c=";
amd64 = "sha256-pO2+lemwHbbJuX16EyMSHtoYNitWIN8Gq6wbWb7oAFM=";
arm64 = "sha256-6LWJkIrHmguL24t/xWgkonIh1W+5dX1FQQZf5dH7944=";
}
.${debArch};
};
@@ -306,11 +306,11 @@ let
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
inherit pname meta;
version = "154.0.8037.93";
version = "154.0.8037.98";
src = fetchurl {
url = "https://dl.google.com/release2/chrome/adufpe5jsoouz6tduwoz7auvmjhq_154.0.8037.93/GoogleChrome-154.0.8037.93.dmg";
hash = "sha256-qTZ7anig56Qt8DLyQRJ029rKsbQVol/oaLvDMa7Jm7w=";
url = "https://dl.google.com/release2/chrome/oesfoc5zcpr4zxi27ozbzxre4i_154.0.8037.98/GoogleChrome-154.0.8037.98.dmg";
hash = "sha256-f4XN7EJjK0grKvxf6O4EvPcwCCzsEyjABB14hjL1dUI=";
};
dontPatch = true;

View File

@@ -8,11 +8,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "google-java-format";
version = "1.36.1";
version = "1.37.0";
__structuredAttrs = true;
src = fetchurl {
sha256 = "sha256-JbQA8AMInSPMUyDNrxoWyr7hm4qjQ00P8CGz2fQhVLQ=";
sha256 = "sha256-g0sqDDjLd0lTMiqEtco/L0DdMVZlCzzUTTt0Q0WWL3o=";
url = "https://github.com/google/google-java-format/releases/download/v${finalAttrs.version}/google-java-format-${finalAttrs.version}-all-deps.jar";
};

View File

@@ -8,17 +8,17 @@
# Temporary until buildGoModule updates to 1.27
buildGo127Module (finalAttrs: {
pname = "gopodder";
version = "1.2.5";
version = "1.3.0";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "cbrgm";
repo = "gopodder";
tag = "v${finalAttrs.version}";
hash = "sha256-oKaAiVFQqVB7ArqrUqWg8nWkygtqDjRotfyBDe0q4pY=";
hash = "sha256-v9ST59H2g3pYT9xA+q8Z+2p5ROX+T1BArihfaRxMLL0=";
};
vendorHash = "sha256-MHgh84kzztPLETf3O24lNcfVuOKntKYidczqG8qEyzE=";
vendorHash = "sha256-I/T/+UJpDiPqH8yd1J61NYcrybRQC4E2M6yLio0ficU=";
dontPatchELF = true;

View File

@@ -6,10 +6,10 @@
}:
let
pname = "hydralauncher";
version = "4.1.4";
version = "4.1.5";
src = fetchurl {
url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage";
hash = "sha256-3OrrOdHD1/AvGWVFVvJK9dGNl90YRG6w3j+LcEFfpps=";
hash = "sha256-OkJyHiUDRrvyyF/6onGnGJSjQX2qPjRlPtUo685tDQ8=";
};
appimageContents = appimageTools.extract { inherit pname src version; };

View File

@@ -15,6 +15,8 @@
testedTargets ?
if stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32 then
[ "neon-i32x4" ]
else if stdenv.hostPlatform.isRiscV64 then
[ "rvv-x4" ]
else
[ "sse2-i32x4" ],
}:
@@ -58,6 +60,11 @@ stdenv.mkDerivation (finalAttrs: {
inherit testedTargets;
# run_tests.py does not know riscv64 hosts and defaults to x86 targets
patches = lib.optionals stdenv.hostPlatform.isRiscV64 [
./run-tests-riscv64.patch
];
doCheck = true;
# the compiler enforces -Werror, and -fno-strict-overflow makes it mad.
@@ -87,12 +94,13 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeFeature "CLANGPP_EXECUTABLE" "${llvmPackages.clang}/bin/clang++")
(lib.cmakeBool "ISPC_INCLUDE_EXAMPLES" false)
(lib.cmakeBool "ISPC_INCLUDE_UTILS" false)
(lib.cmakeFeature "ARM_ENABLED=" (
(lib.cmakeFeature "ARM_ENABLED" (
if stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32 then "TRUE" else "FALSE"
))
(lib.cmakeFeature "X86_ENABLED=" (
(lib.cmakeFeature "X86_ENABLED" (
if stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isx86_32 then "TRUE" else "FALSE"
))
(lib.cmakeFeature "RISCV_ENABLED" (if stdenv.hostPlatform.isRiscV64 then "TRUE" else "FALSE"))
];
meta = {

View File

@@ -0,0 +1,12 @@
--- a/scripts/run_tests.py
+++ b/scripts/run_tests.py
@@ -1368,6 +1368,9 @@
elif platform.machine() == "ppc64le":
default_target = "generic-i32x4"
default_arch = "ppc64le"
+elif platform.machine() == "riscv64":
+ default_target = "rvv-x4"
+ default_arch = "riscv64"
elif "86" in platform.machine() or platform.machine() == "AMD64":
# Some variant of x86: x86_64, i386, i486, i586, i686
# Windows reports platform as AMD64

View File

@@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "jefferson";
version = "0.4.7";
version = "0.4.8";
pyproject = true;
src = fetchFromGitHub {
owner = "onekey-sec";
repo = "jefferson";
tag = "v${finalAttrs.version}";
hash = "sha256-dIb6ZmjGxDwUO0L6Uy2SlgioY8NCnTO7IGveRraw0LI=";
hash = "sha256-/YZ3JvXtnjwGipZ3WlJbeUdn4cDhVoHETsrkIHHADM8=";
};
nativeBuildInputs = with python3.pkgs; [

View File

@@ -13,7 +13,7 @@
flutter344.buildFlutterApplication (finalAttrs: {
pname = "kelivo";
version = "1.2.3";
version = "1.3.0";
strictDeps = true;
__structuredAttrs = true;
@@ -22,7 +22,7 @@ flutter344.buildFlutterApplication (finalAttrs: {
owner = "Chevey339";
repo = "kelivo";
tag = "v${finalAttrs.version}";
hash = "sha256-wTlHFJizR4aNm/TJbewKZPKwe01PYOGkXkM/Qsax71o=";
hash = "sha256-sQZPgIS6ZPnG1KLIgKCKJzWFnhpvURb+ZQcdsMvNXOk=";
};
pubspecLock = lib.importJSON ./pubspec.lock.json;

View File

@@ -4,21 +4,21 @@
"dependency": "transitive",
"description": {
"name": "_fe_analyzer_shared",
"sha256": "1b0e6a07425a3e460666e88bf1c949ccc7bb0116ad562ce94a1eca60fe820725",
"sha256": "fdcd9f70f9eb80df3bc5ed0fa67280df2595fd481948df8a9ab082e6a40ad04b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "103.0.0"
"version": "108.0.0"
},
"analyzer": {
"dependency": "transitive",
"description": {
"name": "analyzer",
"sha256": "61c04d0c1bfed555c681ea079519933f071a5a026578ff73c4ff0df2d3462e5e",
"sha256": "a51c769bff3b6dfbe9d60199b8606d808290702a296bef0c26a4ca391d414e46",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "13.3.0"
"version": "14.4.0"
},
"animations": {
"dependency": "direct main",
@@ -44,11 +44,11 @@
"dependency": "direct main",
"description": {
"name": "archive",
"sha256": "be169cf6ac481e052c4538715d88841d567150dfe1df38aaec76461a4e7b39f2",
"sha256": "6c5bcd986e06b94e3c40244af471750840a3d2341d1f9763a1100a14add517b4",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.1.0"
"version": "4.3.0"
},
"args": {
"dependency": "transitive",
@@ -214,61 +214,61 @@
"dependency": "transitive",
"description": {
"name": "build",
"sha256": "b94f5da9ed3d081fd4ecc426c260998b5f4f4eb2f6d89b7e5472edef0b2b2a1b",
"sha256": "8a5c5761af8e31748bba3c82f68925ace40f3225c3eea25be9beb57eca7cd7a8",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.0.10"
"version": "4.0.11"
},
"build_config": {
"dependency": "transitive",
"description": {
"name": "build_config",
"sha256": "94eaf6708fe64408c632ef2689ca3777b112f9421306ccf4f8c84d7c5c9f83f8",
"sha256": "d466ed2dc9c6cd1d169948879b84ee061eb5e22c64a7c6089879c6296d272a8d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.3.2"
"version": "1.3.3"
},
"build_daemon": {
"dependency": "transitive",
"description": {
"name": "build_daemon",
"sha256": "79e05eaf15a48d7230b053a4363b8eaac0cc234bbd0134c3229455481f55cbc6",
"sha256": "e1d40ef3f7934986d5da2271b1ba07794921ce263e44d622fb6c406d76589e33",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.1.5"
"version": "4.1.6"
},
"build_runner": {
"dependency": "direct dev",
"description": {
"name": "build_runner",
"sha256": "90363d438bd9f84a4d5bbb83352251f57d2d9d771bc95a44e6a33fe25fa52774",
"sha256": "894c243f6bc32015fec466ce30a6925bd537a77a426ee5bf481120477eb3de67",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.16.0"
"version": "2.16.1"
},
"built_collection": {
"dependency": "transitive",
"description": {
"name": "built_collection",
"sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100",
"sha256": "44922ecebd8e3d0cef743dadd3b54df4e87e2a4c52a29465a1872aa9e192caa8",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "5.1.1"
"version": "5.1.2"
},
"built_value": {
"dependency": "transitive",
"description": {
"name": "built_value",
"sha256": "31b24be6615ec7fcf70b3aa5a7469fe35826485e639a16dd7eb83ba30e4cc6a8",
"sha256": "f87ea98192116f7093cb214551ce1929caae0681fdba282b3d8b4462adee7bb7",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "8.12.7"
"version": "8.13.0"
},
"characters": {
"dependency": "transitive",
@@ -314,11 +314,11 @@
"dependency": "transitive",
"description": {
"name": "clock",
"sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b",
"sha256": "e51d50bca3217c9a9fa2b41a30e4a38971133f5f9ec7a3d57bae095007f1d28e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.2"
"version": "1.1.3"
},
"code_assets": {
"dependency": "transitive",
@@ -350,15 +350,25 @@
"source": "hosted",
"version": "3.1.2"
},
"convertlib": {
"dependency": "transitive",
"description": {
"name": "convertlib",
"sha256": "5874961a2c30a76b65363550897f58d6980deec67320bbfa8021b45cb2797c9c",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.6.1"
},
"cross_file": {
"dependency": "transitive",
"description": {
"name": "cross_file",
"sha256": "92c9c43c383bfa1c32079d3bc492d55d6d4318044b7b47edaff8971cbb555c51",
"sha256": "f141ea4f277af142a0356955707f6556f37b03947d39d55585981a06ca437bd6",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.3.5+4"
"version": "0.3.5+5"
},
"crypto": {
"dependency": "direct main",
@@ -394,11 +404,11 @@
"dependency": "direct main",
"description": {
"name": "cupertino_http",
"sha256": "3c8c69cc1b94b9c7570d9454bf1e11fa7010b248547a0760843adc71f0c08fbe",
"sha256": "d57188b07349a373bec9a78997a80c00e1de08dab0fe454b3f86c84661ac457c",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.0.2"
"version": "3.1.0"
},
"cupertino_icons": {
"dependency": "direct main",
@@ -414,11 +424,11 @@
"dependency": "transitive",
"description": {
"name": "dart_style",
"sha256": "3f88fc9c96c568d631356507355a2d1e983ee000c9ac008bdcb39b5bf53ce777",
"sha256": "82ade9fc4273f29ed673e33166944465225b4f7fc5d4aaef48605cc751c18fc1",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.1.12"
"version": "3.1.13"
},
"dbus": {
"dependency": "transitive",
@@ -460,6 +470,16 @@
"source": "hosted",
"version": "7.0.3"
},
"diffutil_dart": {
"dependency": "direct main",
"description": {
"name": "diffutil_dart",
"sha256": "794bf169096770b6ba60da12c6480116dfefa891c19fc4518ec80ad516f69bb9",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "5.0.0"
},
"dio": {
"dependency": "direct main",
"description": {
@@ -474,11 +494,11 @@
"dependency": "transitive",
"description": {
"name": "dio_web_adapter",
"sha256": "0786d0b7295a373de356fc0af4f6f1d0ab2844ed31b19dfc5e7556b70e24212c",
"sha256": "3a1b2cd7be71086f38504956e3ebcd2837288d231ff454bafa78021244102bfc",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.2.1"
"version": "2.2.2"
},
"downsize": {
"dependency": "direct main",
@@ -493,21 +513,21 @@
"dependency": "direct main",
"description": {
"name": "drift",
"sha256": "3a3f1f6f905037d7426e4c445854139fd6a3d592135f7c96d7931682b73d16f4",
"sha256": "a21a6a7a9e6a0bcabdf47a9af4247c556d38dc9bfe9f05c4fdf72a488bb57eab",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.34.3"
"version": "2.35.1"
},
"drift_dev": {
"dependency": "direct dev",
"description": {
"name": "drift_dev",
"sha256": "735aad3c34215805c66bd518c8812fa4f83b5534b2c13c4092c970c04a7e9983",
"sha256": "e0d16aaa21f3408cbe2dd4bfc56c36cea43e53a537e6613b91380c0924b3bd30",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.34.5"
"version": "2.35.1"
},
"dynamic_color": {
"dependency": "direct main",
@@ -529,8 +549,18 @@
"source": "hosted",
"version": "1.5.1"
},
"fake_async": {
"equatable": {
"dependency": "transitive",
"description": {
"name": "equatable",
"sha256": "3bce007a596ff8b3119c45d68aaef631272537c03d30e5d4534dd24bf4c5eaa2",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.0"
},
"fake_async": {
"dependency": "direct dev",
"description": {
"name": "fake_async",
"sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44",
@@ -573,21 +603,21 @@
"dependency": "transitive",
"description": {
"name": "file_selector_linux",
"sha256": "2567f398e06ac72dcf2e98a0c95df2a9edd03c2c2e0cacd4780f20cdf56263a0",
"sha256": "da76400e7872ce7637ffdce12749ec24169c25f6195c28372208e65a24bcd2ab",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.9.4"
"version": "0.9.4+1"
},
"file_selector_macos": {
"dependency": "transitive",
"description": {
"name": "file_selector_macos",
"sha256": "5e0bbe9c312416f1787a68259ea1505b52f258c587f12920422671807c4d618a",
"sha256": "d57c62362766b5e7ae739448650b66c6aab7a68ba7ecc65e04018652645ae0f4",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.9.5"
"version": "0.9.5+1"
},
"file_selector_platform_interface": {
"dependency": "transitive",
@@ -603,11 +633,11 @@
"dependency": "transitive",
"description": {
"name": "file_selector_windows",
"sha256": "62197474ae75893a62df75939c777763d39c2bc5f73ce5b88497208bc269abfd",
"sha256": "fbefc5fb92c6d3cbe8d284a2cd971b593bb07d2cd6da8557b81a862250b4acec",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.9.3+5"
"version": "0.9.3+6"
},
"fixnum": {
"dependency": "transitive",
@@ -635,16 +665,6 @@
"source": "hosted",
"version": "4.5.2"
},
"flutter_background": {
"dependency": "direct main",
"description": {
"name": "flutter_background",
"sha256": "ee47be26beddc59875158a93eeaaad0c0b5f3b21afbdad3de73a2903be824f0e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.3.1"
},
"flutter_driver": {
"dependency": "transitive",
"description": "flutter",
@@ -720,11 +740,10 @@
"flutter_math_fork": {
"dependency": "direct main",
"description": {
"name": "flutter_math_fork",
"sha256": "6d5f2f1aa57ae539ffb0a04bb39d2da67af74601d685a161aff7ce5bda5fa407",
"url": "https://pub.dev"
"path": "dependencies/flutter_math_fork",
"relative": true
},
"source": "hosted",
"source": "path",
"version": "0.7.4"
},
"flutter_native_splash": {
@@ -805,14 +824,14 @@
"version": "0.0.0"
},
"glob": {
"dependency": "transitive",
"dependency": "direct main",
"description": {
"name": "glob",
"sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de",
"sha256": "218aeb56050c714f62a3182775320dfa04602b55074873e24e31bbd39bda96fb",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.3"
"version": "2.2.0"
},
"gpt_markdown": {
"dependency": "direct main",
@@ -843,6 +862,16 @@
"source": "hosted",
"version": "0.6.5"
},
"hashlib": {
"dependency": "direct main",
"description": {
"name": "hashlib",
"sha256": "b998d270c41c782d4e75e8fd19c8f43b64070f65bfeb528bbf886bb253cbb35b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.2"
},
"highlight": {
"dependency": "direct main",
"description": {
@@ -937,11 +966,11 @@
"dependency": "direct main",
"description": {
"name": "html",
"sha256": "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602",
"sha256": "43b67b8f43321ab066817dfac5619596c98bb1b61624e77203bb4351785f9699",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.15.6"
"version": "0.15.7"
},
"html2md": {
"dependency": "direct main",
@@ -997,11 +1026,11 @@
"dependency": "direct main",
"description": {
"name": "image",
"sha256": "1976370a4df3091bb0f72409c187ad1f9132a818bc6b95ca59c0bae1c75c688e",
"sha256": "a1e7f4951e538a568e14b856702afc9ae1d2f4b202daced8d22c1b9cd211ce89",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.9.2"
"version": "4.10.1"
},
"image_cropper": {
"dependency": "direct main",
@@ -1057,11 +1086,11 @@
"dependency": "transitive",
"description": {
"name": "image_picker_android",
"sha256": "6f3a1995eafb000333174fae92202622033b0ee7fd917a6cd3730295264df84a",
"sha256": "0a55d645a670d6ae11efa948f955ae904afa472f1344fc15a7ddacc20c1e7219",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.8.13+19"
"version": "0.8.13+23"
},
"image_picker_for_web": {
"dependency": "transitive",
@@ -1077,11 +1106,11 @@
"dependency": "transitive",
"description": {
"name": "image_picker_ios",
"sha256": "b9c4a438a9ff4f60808c9cf0039b93a42bb6c2211ef6ebb647394b2b3fa84588",
"sha256": "815921d05ef87d64dc64e9f7f855967614a9a67086d0c60fa27d47a1cd9a8896",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.8.13+6"
"version": "0.8.13+9"
},
"image_picker_linux": {
"dependency": "transitive",
@@ -1143,11 +1172,11 @@
"dependency": "transitive",
"description": {
"name": "io",
"sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b",
"sha256": "2635216ca6a737e60de577ffa1a48a0bec76ca8a62917cfc1bb88c14c570646f",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.0.5"
"version": "1.1.0"
},
"irondash_engine_context": {
"dependency": "transitive",
@@ -1173,21 +1202,21 @@
"dependency": "transitive",
"description": {
"name": "jni",
"sha256": "f038e58b4dc2c9037f50e233175086337e0b305e356d28211bf55f21c504cbd3",
"sha256": "6b9ca0602fef0230e83149afbe3f9f8227e94f2bbe84a1da4f14d699742f402d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.0.3"
"version": "1.1.0"
},
"jni_flutter": {
"dependency": "transitive",
"description": {
"name": "jni_flutter",
"sha256": "7b717011ea40d04fd47c2731d3d1d36eb99eba3435c2753d62489e8c3c9991d5",
"sha256": "c399ad579bfba12eb20c924f7a23160a42902f3023a871e1cad40a8a679656a4",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.0.2"
"version": "1.0.4"
},
"jni_util": {
"dependency": "transitive",
@@ -1273,11 +1302,11 @@
"dependency": "direct main",
"description": {
"name": "lucide_icons_flutter",
"sha256": "6e2eb4a11137851be84a57e936fc864d565709ec0ae854b786b15397d1b66276",
"sha256": "41329b0493e799d481a59e704f5d950d0382414596c57ccf4bb620faec345c97",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.1.17"
"version": "3.1.21"
},
"matcher": {
"dependency": "transitive",
@@ -1342,21 +1371,21 @@
"dependency": "transitive",
"description": {
"name": "mime",
"sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6",
"sha256": "bd47de35f07e27267e69c8c8b22edf9473bfee170a60d60fcc93730c5144b7f6",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.0"
"version": "2.1.0"
},
"mobile_scanner": {
"dependency": "direct main",
"description": {
"name": "mobile_scanner",
"sha256": "ce3f059ebd6dbfab7292bba0e893e354b46730636820d3c9ef69005ce2d55bce",
"sha256": "5a51ea79f0cf8293f616a5d08baae185b59b5e6bb24df01f2a63037ade0bade0",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "7.4.0"
"version": "7.4.2"
},
"native_toolchain_c": {
"dependency": "transitive",
@@ -1402,11 +1431,11 @@
"dependency": "transitive",
"description": {
"name": "package_config",
"sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc",
"sha256": "ffcf4cf3d6c0b74ac43708d9f56625506e8a68aa935abe9d267a7330f320eb5d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.2.0"
"version": "3.0.0"
},
"package_info_plus": {
"dependency": "direct main",
@@ -1532,11 +1561,11 @@
"dependency": "transitive",
"description": {
"name": "permission_handler_apple",
"sha256": "f49cb15a064ea9d974fc7fbb302099353b7b170d07284e86e264561579e5bcf8",
"sha256": "066bbbc60031b63b916a3871e7bb4b6a8c5e7cec8146dafec53d1da304eff0a5",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "9.6.1"
"version": "9.6.2"
},
"permission_handler_html": {
"dependency": "transitive",
@@ -1552,11 +1581,11 @@
"dependency": "transitive",
"description": {
"name": "permission_handler_platform_interface",
"sha256": "a5c8a97ecf5616112a5b16d4b8e9ec0e5ae90ef63ac69c0d7b8ae240be760b23",
"sha256": "ed86a61c190258fdd65de395ea0632822e3415c1faec38eae0c31b479c28a531",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.4.0"
"version": "4.4.1"
},
"permission_handler_windows": {
"dependency": "direct overridden",
@@ -1591,11 +1620,11 @@
"dependency": "transitive",
"description": {
"name": "platform",
"sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984",
"sha256": "a36d119c13416516a7b5913fbe8af8531e11633d784c550b2125f76c758524ec",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.1.6"
"version": "3.2.0"
},
"plugin_platform_interface": {
"dependency": "transitive",
@@ -1621,11 +1650,11 @@
"dependency": "transitive",
"description": {
"name": "pool",
"sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d",
"sha256": "4177f68c237ea2128d1bee66ac17b2ce05ba3dbaafcbdd54c5d40a39d0b6b11c",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.5.2"
"version": "1.5.3"
},
"posix": {
"dependency": "transitive",
@@ -1651,11 +1680,11 @@
"dependency": "transitive",
"description": {
"name": "process",
"sha256": "c6248e4526673988586e8c00bb22a49210c258dc91df5227d5da9748ecf79744",
"sha256": "4242ba3508d37e01808bdf71ad1d5bb93a8d671bf2e7450e6b1b353fb0808891",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "5.0.5"
"version": "5.0.6"
},
"provider": {
"dependency": "direct main",
@@ -1671,21 +1700,21 @@
"dependency": "transitive",
"description": {
"name": "pub_semver",
"sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585",
"sha256": "261236774e8b1d69cfc6b9eabbc96c40f25e7a2d6b171f3385d4f65d5734fb24",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.2.0"
"version": "2.2.1"
},
"pubspec_parse": {
"dependency": "transitive",
"description": {
"name": "pubspec_parse",
"sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082",
"sha256": "c38b81cbf34450b67e0265d73433569d12e34782e30ed769c9cc99c9d5f2e796",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.5.0"
"version": "1.6.0"
},
"qr": {
"dependency": "transitive",
@@ -1731,11 +1760,11 @@
"dependency": "transitive",
"description": {
"name": "record_android",
"sha256": "28f1108626a190e249b01ffa9f639070e31e5157474b64a5ae380bf36aec9559",
"sha256": "f5080279259c4ad769590f1c165762eaa4e414178adc2e2fab137103228e07ac",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.2"
"version": "2.2.0"
},
"record_ios": {
"dependency": "transitive",
@@ -1751,11 +1780,11 @@
"dependency": "transitive",
"description": {
"name": "record_linux",
"sha256": "b7484fdaf1f6d291543b9cf615e78096662b02df68d7a4728b13f352bde58d27",
"sha256": "766b3ebad3a318a42e06a5924f7eaf4d7e792f9b152d1d749f5b12c2a64bcef5",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.1"
"version": "2.1.2"
},
"record_macos": {
"dependency": "transitive",
@@ -1791,21 +1820,21 @@
"dependency": "transitive",
"description": {
"name": "record_web",
"sha256": "f53d3da48de3618a331868aec73261d5a75eddd9c09409afd9ec6d66b25db532",
"sha256": "7f6950be87abacb05cf77eb6ca200b60f2c2a6af5d50236b5f4baf53f92e755e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.2"
"version": "2.1.3"
},
"record_windows": {
"dependency": "transitive",
"description": {
"name": "record_windows",
"sha256": "e6884f91be4370f122111aca3c04291ae5fe6d8fd045f87afa967635a02dbbac",
"sha256": "8195489a47b5e8246985d6213ff65aae1b14e32a0ca45dc5f680e8d503296e1b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.2.3"
"version": "2.3.0"
},
"reel_text": {
"dependency": "direct main",
@@ -1831,11 +1860,11 @@
"dependency": "direct main",
"description": {
"name": "restart_app",
"sha256": "3ea6b790dd88d7d927ed4792f3c6dd68e2fdffcbb1bf4df6d19313702e2d6387",
"sha256": "b7ab4ec8e35ac5a716939bb3aee10c56d24e8b5c4798682b7aacb523f67c9367",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.9.1"
"version": "1.10.1"
},
"screen_retriever": {
"dependency": "direct main",
@@ -1931,21 +1960,21 @@
"dependency": "transitive",
"description": {
"name": "shared_preferences_android",
"sha256": "0634e64bd719f89c012f392938e173521f535d3ecaf66558fa94a056d22b5cc7",
"sha256": "1e12aafe408aa50da80edfd679a2a6bf63ba7ab37c7fa98286da459a757b3399",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.27"
"version": "2.4.28"
},
"shared_preferences_foundation": {
"dependency": "transitive",
"description": {
"name": "shared_preferences_foundation",
"sha256": "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f",
"sha256": "2ec3934efa51e46117f23031cc141b8fc878e8525b94ec1ea4f7f586cf1b47ea",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.5.6"
"version": "2.5.7"
},
"shared_preferences_linux": {
"dependency": "transitive",
@@ -2097,11 +2126,11 @@
"dependency": "transitive",
"description": {
"name": "source_gen",
"sha256": "a603f1fb984a7391ae5978d1b92bfaaa08b350dca5c825256f925818f7943bf5",
"sha256": "11b6047da8e4eb6c643ccac3d0fda3f9c9e11651695f7da24a85ade8aff15a44",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.2.4"
"version": "4.3.0"
},
"source_span": {
"dependency": "transitive",
@@ -2117,21 +2146,21 @@
"dependency": "direct main",
"description": {
"name": "speech_to_text",
"sha256": "75587f7400f485fdf166beacd471549d98fe5d58e634f708916bb65dec05d6a4",
"sha256": "f2fabd017b5cb07f4e06d496b2d4b957e39534bc848f92b1e6acac80a10f4967",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "7.4.0"
"version": "7.5.0"
},
"speech_to_text_platform_interface": {
"dependency": "transitive",
"description": {
"name": "speech_to_text_platform_interface",
"sha256": "a7e16e02853853ed7534ac2bde9a1c4f39c8879970a7974ac6ff832d4bdaa4b0",
"sha256": "7e447356be3074c471223c9d179ef3f822475350b67ca923ec71ab3bf2ede214",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.0"
"version": "2.5.0"
},
"speech_to_text_windows": {
"dependency": "transitive",
@@ -2147,11 +2176,11 @@
"dependency": "direct main",
"description": {
"name": "sqlite3",
"sha256": "4c7fe79840389aaeaf05fd093f795b631b5a98e2bd28d54e555c100f4a9c7a1c",
"sha256": "cc62d72dbf16bb1f6ae8954b238016de1473e53df060ed0c332eed0a41dd1848",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.5.2"
"version": "3.7.0"
},
"sqlparser": {
"dependency": "transitive",
@@ -2167,11 +2196,11 @@
"dependency": "transitive",
"description": {
"name": "stack_trace",
"sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1",
"sha256": "277654b3034d17ac6f9f1cb5595db011b1d5d41e8806866db28e0abaa101c490",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.12.1"
"version": "1.12.2"
},
"stream_channel": {
"dependency": "transitive",
@@ -2187,11 +2216,11 @@
"dependency": "transitive",
"description": {
"name": "stream_transform",
"sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871",
"sha256": "a00e5f18bffc764f923e7dec1038527f7fe7a1791361a7117f0358193f13d53a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.1"
"version": "2.1.2"
},
"string_scanner": {
"dependency": "transitive",
@@ -2277,11 +2306,11 @@
"dependency": "transitive",
"description": {
"name": "synchronized",
"sha256": "3a7b5d17422dd0f8d5c6c14feaa5a1c65638b9455f871a96f08437562c046931",
"sha256": "397b146f97613b83d84bdccb439bc8d0f3aebb6c1d14a9641e6f24201c490b2d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.4.1+2"
"version": "3.4.2"
},
"system_fonts": {
"dependency": "direct main",
@@ -2303,6 +2332,15 @@
"source": "hosted",
"version": "1.2.2"
},
"terminal_view": {
"dependency": "direct main",
"description": {
"path": "dependencies/terminal_view",
"relative": true
},
"source": "path",
"version": "0.2.1"
},
"test_api": {
"dependency": "transitive",
"description": {
@@ -2396,41 +2434,41 @@
"dependency": "transitive",
"description": {
"name": "url_launcher_android",
"sha256": "b413d49b73867ac08dd2f9890efd3cc11f2a0e577618d50843440a1fb3776c32",
"sha256": "611e87fb320b70d1dd721dc46af89c98aceccea9b31fde49e084591414e0c610",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.3.32"
"version": "6.3.33"
},
"url_launcher_ios": {
"dependency": "transitive",
"description": {
"name": "url_launcher_ios",
"sha256": "580fe5dfb51671ae38191d316e027f6b76272b026370708c2d898799750a02b0",
"sha256": "8faa1aab294f1ab4040b43660c887b0418d5fa4f0cffef76a484e6aa1092eb4a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.4.1"
"version": "6.4.2"
},
"url_launcher_linux": {
"dependency": "transitive",
"description": {
"name": "url_launcher_linux",
"sha256": "d5e14138b3bc193a0f63c10a53c94b91d399df0512b1f29b94a043db7482384a",
"sha256": "10f86fef4c2c43563fa6c211ff9cf757adf4d3ab762c56bd430664a947d70cd0",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.2.2"
"version": "3.2.3"
},
"url_launcher_macos": {
"dependency": "transitive",
"description": {
"name": "url_launcher_macos",
"sha256": "368adf46f71ad3c21b8f06614adb38346f193f3a59ba8fe9a2fd74133070ba18",
"sha256": "5e835a3b869c2d70325349c81c5a45c28e20791265b67b2669da6b08c5cd5201",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.2.5"
"version": "3.2.6"
},
"url_launcher_platform_interface": {
"dependency": "transitive",
@@ -2456,11 +2494,11 @@
"dependency": "transitive",
"description": {
"name": "url_launcher_windows",
"sha256": "712c70ab1b99744ff066053cbe3e80c73332b38d46e5e945c98689b2e66fc15f",
"sha256": "6c5ad3f22cd4c38e089b81963b3cd7bb83b111b2df5dce008bb066162f42e429",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.1.5"
"version": "3.1.6"
},
"uuid": {
"dependency": "direct main",
@@ -2506,11 +2544,11 @@
"dependency": "transitive",
"description": {
"name": "vector_math",
"sha256": "f36f9f3be64c6198714492bb455c11056e33e2f85d9a0b676a48301e44fdcf47",
"sha256": "92b9910f66ed1057fd4da7b040ae7c74cafacf885bdc81be496928d5049b032d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.2"
"version": "2.4.3"
},
"vm_service": {
"dependency": "transitive",
@@ -2522,6 +2560,26 @@
"source": "hosted",
"version": "15.3.0"
},
"wakelock_plus": {
"dependency": "direct main",
"description": {
"name": "wakelock_plus",
"sha256": "61713aa82b7f85c21c9f4cd0a148abd75f38a74ec645fcb1e446f882c82fd09b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.3.3"
},
"wakelock_plus_platform_interface": {
"dependency": "transitive",
"description": {
"name": "wakelock_plus_platform_interface",
"sha256": "764c25504562abc8ac3406f5d175f126b276e6ba916c7c2675690b73368ca384",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.7.0"
},
"watcher": {
"dependency": "transitive",
"description": {
@@ -2566,11 +2624,11 @@
"dependency": "transitive",
"description": {
"name": "webdriver",
"sha256": "2f3a14ca026957870cfd9c635b83507e0e51d8091568e90129fbf805aba7cade",
"sha256": "28b82ec894fed45dd71c23ba62d1af973ed97dd59a4f5790a4d38b0b13e5657e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.1.0"
"version": "3.2.0"
},
"webview_flutter": {
"dependency": "direct main",
@@ -2586,11 +2644,11 @@
"dependency": "transitive",
"description": {
"name": "webview_flutter_android",
"sha256": "b98656fa4461f8cc05c48a778b4d4883e60ec63e1778348f363f9bb9a477745d",
"sha256": "4de8b3d1ff4ebe1bdb42e68a5e4f809194a3cb0117a8f495f590004f00da3964",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.14.0"
"version": "4.14.1"
},
"webview_flutter_platform_interface": {
"dependency": "transitive",
@@ -2606,11 +2664,11 @@
"dependency": "direct main",
"description": {
"name": "webview_flutter_wkwebview",
"sha256": "c879dd64b87c452aa84381b244d5469da57ba7e8cca6884c7b1e0d406372c12d",
"sha256": "0f784be1b080e5b918ef7c2c070c1f4616899fd23f1d001feb74b4978f92bdbc",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.26.0"
"version": "3.26.2"
},
"webview_windows": {
"dependency": "direct main",
@@ -2686,15 +2744,35 @@
"dependency": "transitive",
"description": {
"name": "yaml",
"sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce",
"sha256": "f67cdd8e07d3c6329146aaef1ba043542b3134c12489f553ca9a7435d1068aea",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.1.3"
"version": "3.1.4"
},
"yaml_edit": {
"dependency": "transitive",
"description": {
"name": "yaml_edit",
"sha256": "07c9e63ba42519745182b88ca12264a7ba2484d8239958778dfe4d44fe760488",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.2.4"
},
"zmodem": {
"dependency": "transitive",
"description": {
"name": "zmodem",
"sha256": "3b7e5b29f3a7d8aee472029b05165a68438eff2f3f7766edf13daba1e297adbf",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.0.6"
}
},
"sdks": {
"dart": ">=3.12.1 <4.0.0",
"flutter": ">=3.44.1"
"flutter": ">=3.44.9"
}
}

View File

@@ -52,21 +52,21 @@
with python3Packages;
buildPythonApplication rec {
pname = "kitty";
version = "0.49.1";
version = "0.49.2";
pyproject = false;
src = fetchFromGitHub {
owner = "kovidgoyal";
repo = "kitty";
tag = "v${version}";
hash = "sha256-YVjTfJnsNEBjcHWQCq2nJBFPvLg7RqQcyWjgR4ijUqc=";
hash = "sha256-FstfBzwdh1z7Qy9zWDY7L7mpd5bxnypgqEzqeLe16fY=";
};
goModules =
(buildGo126Module {
pname = "kitty-go-modules";
inherit src version;
vendorHash = "sha256-urQMf5lGYPgS65VjGw0pi/ZM6CETtGWfi/kvVDAkIoc=";
vendorHash = "sha256-iSPPwwu9jllnIxkQeOlJFdDL4xLUGRP2RMW9DPRY6FQ=";
}).goModules;
buildInputs = [

View File

@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "stella";
version = "0-unstable-2026-09-20";
version = "0-unstable-2026-09-25";
src = fetchFromGitHub {
owner = "stella-emu";
repo = "stella";
rev = "e86e1f6f421b1101e6f1dfdec1545ebe7cbba3ec";
hash = "sha256-oHTMnTF26yMsbvwQcazBwCn5AUz6n1uqRUVb/v8zaNY=";
rev = "36db8267e443a1ddfe4fabc0a3d42ec2b2332cb4";
hash = "sha256-g3x/ViAbvYMOmkLX1yVM8McfssBZZUou0KIl0dmzHX0=";
};
makefile = "Makefile";

View File

@@ -7,11 +7,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "maccy";
version = "2.7.0";
version = "2.7.1";
src = fetchurl {
url = "https://github.com/p0deje/Maccy/releases/download/${finalAttrs.version}/Maccy.app.zip";
hash = "sha256-ni/0OTBZpx3NzSfF0RHeMWcwgK4sGP7ES6ZcGrJkODw=";
hash = "sha256-84iu403gmgx1MWMTA3hdmTi++akhMOIc4QScj1aq0Hc=";
};
dontUnpack = true;

View File

@@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: {
__structuredAttrs = true;
strictDeps = true;
pname = "mango";
version = "0.17.4";
version = "0.17.5";
src = fetchFromGitHub {
owner = "mangowm";
repo = "mango";
tag = finalAttrs.version;
hash = "sha256-aDjYwXuX+TKZya7UCNgv+O/chCYIbATHpAOKl9xaNdk=";
hash = "sha256-azXPZ57eVc5ZpUTjc4ZZwDRb5ZnZ4DQsPmzUS3YHXtk=";
};
nativeBuildInputs = [

View File

@@ -186,11 +186,11 @@ let
linux = stdenvNoCC.mkDerivation (finalAttrs: {
inherit pname meta;
version = "154.0.4258.48";
version = "154.0.4258.53";
src = fetchurl {
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
hash = "sha256-uaC6R/AjO04yZuYWMLJRFAZ/olNh32MYLIiqqKQiuY4=";
hash = "sha256-ZGNZA0r/VK63bnZDaldy82a77+p24HzFy2Ds+xGyJ7k=";
};
# With strictDeps on, some shebangs were not being patched correctly
@@ -296,12 +296,12 @@ let
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
inherit pname meta;
version = "154.0.4258.48";
uuid = "1522ce6b-7a1f-4297-b0c5-b4b4da1e237e";
version = "154.0.4258.53";
uuid = "559421d7-1ab9-4b4d-bbe2-6578175c72ec";
src = fetchurl {
url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/${finalAttrs.uuid}/MicrosoftEdge-${finalAttrs.version}.dmg";
hash = "sha256-ByDzUQVSqmPp+Nc3bp1KV+P0IUOESs+Be/fymxR1o4E=";
hash = "sha256-dbNkGR2E7AJ8j782NCIVhPKAGBQ1q/KxlOwbMhkb55w=";
};
dontPatch = true;

View File

@@ -10,13 +10,13 @@
stdenvNoCC.mkDerivation rec {
pname = "mint-x-icons";
version = "1.7.7";
version = "1.7.8";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "mint-x-icons";
rev = version;
hash = "sha256-rCH+28vMLTbX/Gfi55XD7VFKU9vGadOAKTku2CTYo5c=";
hash = "sha256-bdSco76DYcHraHb12vleNCPs86rTHPCtl+caMhtkJUM=";
};
propagatedBuildInputs = [

View File

@@ -74,14 +74,14 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "mistral-rs";
version = "0.9.3";
version = "0.9.4";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "EricLBuehler";
repo = "mistral.rs";
tag = "v${finalAttrs.version}";
hash = "sha256-uuWwp1f0GCCCml/lkfrs0+ceE98MirQII0YJZJyZ40o=";
hash = "sha256-/40obacG8jIx6BOQ8uUTiT503jRDnHrlrw5PGoEfbEM=";
};
patches = [
@@ -130,7 +130,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
""
'';
cargoHash = "sha256-nHcXQQYu6fzeAWQdUN1uV6e/fO6bvyPtIejb3EIW9T4=";
cargoHash = "sha256-56Z1ea/5x8fE055lvi7kfFQTyNTH49+bnotn0XCRwpU=";
nativeBuildInputs = [
pkg-config
@@ -247,6 +247,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
"--skip=rlimit_nproc_caps_processes"
"--skip=seccomp_blocks_ptrace"
"--skip=unshare_is_denied_inside_child"
# Timing-sensitive (relies on a 30ms sleep), flaky under load
"--skip=isq_executor::tests::executor_waits_for_budget_release"
]
++ lib.optionals hostPlatform.isDarwin [
# system-configuration panics in the sandbox: "Attempted to create a NULL object."
"--skip=search::tests::search_tools_refuse_internal_urls"
];
nativeInstallCheckInputs = [

View File

@@ -12,7 +12,7 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "msedgedriver";
version = "154.0.4258.48";
version = "154.0.4258.53";
src =
let
@@ -28,9 +28,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
url = "https://msedgedriver.microsoft.com/${finalAttrs.version}/edgedriver_${driverArch}.zip";
hash =
{
mac64_m1 = "sha256-qY3DxrmrM1QlOJC+PLX8jDO6Y2OOGoKxtKHOFygQop0=";
mac64 = "sha256-Gwj0C+SLXnHFamG9iKYmBFgUtxzUmomcxuAW5G+O92Y=";
linux64 = "sha256-anRg15o6RDWikhxIZtHGP08qyqsXeBln9SHkdj10ARg=";
mac64_m1 = "sha256-XDgJK+wT95D1zMw8FrJp1EYY57d/F5z0iLzeknU74lY=";
mac64 = "sha256-c2YKaXQ1CESYhcenJnTSbQ13Ezkg3cfCwRvDIdPFras=";
linux64 = "sha256-3qsuF3m5OvULklN1gcIQ0P4IcseOBgc3pftmph0T1tE=";
}
.${driverArch};
stripRoot = false;

View File

@@ -31,16 +31,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "ncspot";
version = "1.4.0";
version = "1.5.0";
src = fetchFromGitHub {
owner = "hrkfdn";
repo = "ncspot";
tag = "v${finalAttrs.version}";
hash = "sha256-YJbdXLqFPYKnluHCR5svAGIkzbKH3xYPOnA2uQCK5q4=";
hash = "sha256-1jCnehWP/5LybXmYkDdyhEu+jYuv2Yz2m3qcxDhbN/0=";
};
cargoHash = "sha256-4RRAFThnp06QFb3U4IjRTRc3B9muyajH592ZNWJrJZY=";
cargoHash = "sha256-GRCKX8nZgW2q6+U4Kw/I37tepSHNaTJjFNS/+fbELnQ=";
nativeBuildInputs = [ pkg-config ] ++ lib.optional withClipboard python3;

View File

@@ -9,11 +9,11 @@
stdenvNoCC.mkDerivation rec {
pname = "net-news-wire";
version = "7.1.3";
version = "7.1.5";
src = fetchurl {
url = "https://github.com/Ranchero-Software/NetNewsWire/releases/download/mac-${version}/NetNewsWire${version}.zip";
hash = "sha256-smbsPnbBGCefEKFyrnQN1v6uGmkUICXESmWTRMayc2c=";
hash = "sha256-9QW6/5iq3VNvaTqUkiXJoUxxVylaN+nUUjtz9Uwl0YM=";
};
sourceRoot = ".";

View File

@@ -39,11 +39,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "netatalk";
version = "4.6.0";
version = "4.6.1";
src = fetchurl {
url = "mirror://sourceforge/netatalk/netatalk/netatalk-${finalAttrs.version}.tar.xz";
hash = "sha256-XVdWxVk134QJjPtaLDqQuIZKRtPBZxqhZEgbztBySt0=";
hash = "sha256-yXQS9/S7u/qSJmT1K51qX3UoK5mlL+BGMTS7R3/qcV4=";
};
nativeBuildInputs = [

View File

@@ -50,6 +50,7 @@
# runtime
gitMinimal,
gsettings-desktop-schemas,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -125,10 +126,12 @@ stdenv.mkDerivation (finalAttrs: {
--zsh <($out/bin/noctalia completions zsh)
'';
# plugins are installed by cloning their repos
# plugins are installed by cloning their repos; the icon theme is read and
# color-scheme written through the org.gnome.desktop.interface GSettings schema
postFixup = ''
wrapProgram $out/bin/noctalia \
--suffix PATH : ${lib.makeBinPath [ gitMinimal ]}
--suffix PATH : ${lib.makeBinPath [ gitMinimal ]} \
--suffix XDG_DATA_DIRS : ${glib.getSchemaDataDirPath gsettings-desktop-schemas}
'';
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;

View File

@@ -7,13 +7,13 @@
}:
rustPlatform.buildRustPackage {
pname = "nufmt";
version = "0-unstable-2026-09-20";
version = "0-unstable-2026-09-28";
src = fetchFromGitHub {
owner = "nushell";
repo = "nufmt";
rev = "24023665d1c2661addb22dce384b53d4a839727f";
hash = "sha256-fumCEOV8HRRQooolXc+C37WAXXZy1TJ40Mt6DtVLYE4=";
rev = "f279091abd66c5d20838f1c5601f5be758b122e1";
hash = "sha256-IRSlc9OSUa3ecUbctqum3J/7oGtGcLudo9CqkvTlWg0=";
};
nativeBuildInputs = [

View File

@@ -0,0 +1,63 @@
{
lib,
buildGoModule,
fetchFromGitHub,
installShellFiles,
stdenv,
}:
buildGoModule (finalAttrs: {
__structuredAttrs = true;
pname = "ocm-cli";
version = "0.42.0";
src = fetchFromGitHub {
owner = "open-component-model";
repo = "ocm";
tag = "v${finalAttrs.version}";
hash = "sha256-c0xQB/OhVcRM2nY4M6NQrfIZPuPKoTClMs0sZ64s2iY=";
};
vendorHash = "sha256-zKIuued0MwEkQoOsRC98frEsEsFd+WCiz0fGRvH00lQ=";
subPackages = [
"cmds/ocm"
"cmds/cliplugin"
"cmds/demoplugin"
"cmds/ecrplugin"
"cmds/subcmdplugin"
"cmds/jfrogplugin"
];
nativeBuildInputs = [
installShellFiles
];
ldflags = [
"-s"
"-w"
"-X github.com/open-component-model/ocm/pkg/version.version=${finalAttrs.version}"
];
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd ocm \
--bash <($out/bin/ocm completion bash) \
--zsh <($out/bin/ocm completion zsh) \
--fish <($out/bin/ocm completion fish)
'';
meta = {
description = "Open Component Model (OCM) is an open standard to describe software bills of delivery (SBOD)";
longDescription = ''
OCM is a technology-agnostic and machine-readable format focused on the software artifacts that must be delivered for software products.
The specification is also used to express metadata needed for security, compliance, and certification purpose.
'';
homepage = "https://ocm.software";
changelog = "https://github.com/open-component-model/ocm/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ h0nIg ];
mainProgram = "ocm";
platforms = lib.platforms.unix;
};
})

View File

@@ -12,13 +12,13 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "oxide-rs";
version = "0.17.0+2026060800.0.0";
version = "0.18.0+2026073100.0.0";
src = fetchFromGitHub {
owner = "oxidecomputer";
repo = "oxide.rs";
rev = "v${finalAttrs.version}";
hash = "sha256-La+1rpevJzg+YOh5BVA1oy2CrEpJ+OV+a4c4RWWR3mw=";
hash = "sha256-zFLWqZGICGZSDFFA0Twzhoz0TXGH188OvNFxmHtpVl8=";
};
patches = [
@@ -41,7 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
"--skip=test_cmd_auth_debug_logging"
];
cargoHash = "sha256-h+H8qSqBP2/B/+unZyXSdXJui4Q6KBcJH8tVUu2jlyw=";
cargoHash = "sha256-c1tTTdbj8QFfgT0gco8WAMSGZl0iHly7ykCuAlt5sfc=";
cargoBuildFlags = [
"--package=oxide-cli"

View File

@@ -28,25 +28,25 @@ in
# runs without an external linter, which leaves `jsPlugins` configs inert.
stdenv.mkDerivation (finalAttrs: {
pname = "oxlint";
version = "1.85.0";
version = "1.86.0";
src = fetchFromGitHub {
owner = "oxc-project";
repo = "oxc";
tag = "oxlint_v${finalAttrs.version}";
hash = "sha256-VlIDDUJC+5YDLpfLr92zOm0vjPAL0j6PCiHaukBpsdk=";
hash = "sha256-B/L7rXj9Bjp7RJgLYNRGGyC01jmYle/0c4htmHXcN04=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-iQfRPmpqG8Jbunw1iLYiIhVqCn4H+koGJROcVY5wvA0=";
hash = "sha256-Uz8Lau2kGdIJI2q1JoZ/dgYa+mHO6VdKxP9NAEIzfI0=";
};
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
inherit pnpm;
fetcherVersion = 4;
hash = "sha256-4qJcYXPWnw/WFR1NPm1cGgI3KPpnRhZRE+oUDb2ENpE=";
hash = "sha256-WuoVYuc9q8hUs3H6REYBFFRLfy8fgOdxHZ76diPh0kI=";
};
dontUseCmakeConfigure = true;

View File

@@ -13,7 +13,7 @@
buildNpmPackage (finalAttrs: {
pname = "paseo";
version = "0.10.2";
version = "0.10.3";
__structuredAttrs = true;
strictDeps = true;
@@ -22,12 +22,12 @@ buildNpmPackage (finalAttrs: {
owner = "getpaseo";
repo = "paseo";
tag = "v${finalAttrs.version}";
hash = "sha256-jbiQMZUho0yqi0DFXPeBxFbvldL/GCQ5h8XuHcU7wg4=";
hash = "sha256-yI/H8XPC0lLdmokePJ4qyVxaV+/PsgePzQupumm5LPQ=";
};
nodejs = nodejs_22;
npmDepsHash = "sha256-tT7qrQpJSxXTJMc9KinfnDQoeTdvLt7NWanYANKunqg=";
npmDepsHash = "sha256-uG7EkoQMVLk5CzDEbJbR5aPxeq59x4vjF21JGatxD7k=";
npmRebuildFlags = [ "--ignore-scripts" ];

View File

@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "phpstan";
version = "2.2.14";
version = "2.2.16";
src = fetchFromGitHub {
owner = "phpstan";
repo = "phpstan";
tag = finalAttrs.version;
hash = "sha256-cxDHp8jN0aA0OQuDOpttIzFlp4JmUfKdxBxAPO9y/AM=";
hash = "sha256-tM++queSVxe/K8Qkoh3bpsgMbjqdAKd0fXOyGbUfvXk=";
};
nativeBuildInputs = [

View File

@@ -28,13 +28,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "prismlauncher-unwrapped";
version = "11.1.0";
version = "11.1.1";
src = fetchFromGitHub {
owner = "PrismLauncher";
repo = "PrismLauncher";
tag = finalAttrs.version;
hash = "sha256-bt2ofUj4PXWKNmdACMpXtbVWdNz1aBOUTrPnOsM7NCA=";
hash = "sha256-vSCiCDatoRnA1vpqLDuelC/2cBCKp+fXGT/O0DYjHuk=";
};
postUnpack = ''

View File

@@ -23,13 +23,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "pvz-portable-unwrapped";
version = "0.2.3";
version = "0.2.4";
src = fetchFromGitHub {
owner = "wszqkzqk";
repo = "PvZ-Portable";
tag = finalAttrs.version;
hash = "sha256-crRtEjVuDWp+tWMx6OaeadFA6nPwh1bwR3WguUvXxAw=";
hash = "sha256-nZK/uxHTcxOv6W6D5RgOSPxN2+L5KYAFBNoBNonCh0U=";
};
nativeBuildInputs = [

View File

@@ -12,13 +12,13 @@ in
renode.overrideAttrs (
finalAttrs: old: {
pname = "renode-unstable";
version = "1.17.0-unstable-2026-09-23";
version = "1.17.0-unstable-2026-10-02";
src = fetchFromGitHub {
owner = "renode";
repo = "renode";
rev = "c69f1a823e565d8f713ad669e48cc1e2ae7a2680";
hash = "sha256-la+xH6a0sJPIPdqGQwPAH9TyW/NAo/CU3B0lyTrmlL0=";
rev = "b039ed10ea66198afd6f68f2ec5a041e76e5e1dc";
hash = "sha256-ico2g1YOPfM0wdKosUf1ul+u8JBA+N8qFHij57cmS34=";
fetchSubmodules = true;
};

View File

@@ -2,6 +2,7 @@
lib,
stdenv,
python3Packages,
qt6,
fetchFromGitHub,
fetchzip,
makeBinaryWrapper,
@@ -12,18 +13,17 @@
replaceVars,
todds,
steam,
}:
let
pname = "rimsort";
version = "1.0.76";
version = "1.14.1";
src = fetchFromGitHub {
owner = "RimSort";
repo = "RimSort";
tag = "v${version}";
hash = "sha256-EO1j4GPRQSB+QEF4tB87x4nCUKpdWU9aGlDFghwxar0=";
hash = "sha256-zS5RbJRk7tk9/3EI+Q2FfAOMOMuL8fYp/IPjTy882Mk=";
fetchSubmodules = true;
};
@@ -51,6 +51,8 @@ let
in
stdenv.mkDerivation (finalAttrs: {
__structuredAttrs = true;
inherit pname;
inherit version;
inherit src;
@@ -75,11 +77,14 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
makeBinaryWrapper
copyDesktopItems
qt6.wrapQtAppsHook
];
buildInputs = [
todds
steamfiles
qt6.qtbase
qt6.qtwayland
]
++ builtins.attrValues {
inherit (python3Packages)
@@ -106,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
watchdog
xmltodict
zstandard
steamworkspy
steamworks
;
};
@@ -132,20 +137,30 @@ stdenv.mkDerivation (finalAttrs: {
'';
disabledTestPaths = [
# requires network (clones GitHub: Community-Rules-Database, Steam-Workshop-Database)
# Requires network access (clones GitHub: Community-Rules-Database, Steam-Workshop-Database)
"tests/models/metadata/test_metadata_factory.py"
# Requires network access.
"tests/utils/test_privatebin.py"
];
disabledTests = [
# Works with hard-coded executable paths.
"test_execute_calls_runner_when_binary_exists"
"test_execute_shows_error_when_binary_missing"
"test_download_mods_sets_console_log_path"
];
pytestFlags = [ "--doctest-modules" ];
desktopItems = [
(makeDesktopItem {
name = "RimSort";
name = "io.github.rimsort.RimSort";
desktopName = "RimSort";
exec = "rimsort";
icon = "rimsort";
comment = "RimWorld Mod Manager";
categories = [ "Game" ];
startupWMClass = "io.github.rimsort.RimSort";
})
];
@@ -157,17 +172,20 @@ stdenv.mkDerivation (finalAttrs: {
mkdir -p $out/bin
install -D ./themes/default-icons/AppIcon_a.png $out/share/icons/hicolor/512x512/apps/rimsort.png
runHook postInstall
'';
postFixup = ''
makeBinaryWrapper \
${python3Packages.python.interpreter} \
$out/bin/rimsort \
--add-flags "-m app" \
--chdir $out/lib/rimsort \
--prefix PYTHONPATH : "$PYTHONPATH" \
--set RIMSORT_DISABLE_UPDATER 1
install -D ./themes/default-icons/AppIcon_a.png $out/share/icons/hicolor/512x512/apps/rimsort.png
runHook postInstall
--set RIMSORT_DISABLE_UPDATER 1 \
"''${qtWrapperArgs[@]}"
'';
passthru.updateScript = nix-update-script {
@@ -186,7 +204,9 @@ stdenv.mkDerivation (finalAttrs: {
# For libsteam_api.so
valveSDK
];
maintainers = with lib.maintainers; [ weirdrock ];
maintainers = with lib.maintainers; [
adda
];
mainProgram = "rimsort";
# steamworksSrc is x86_64-linux only
platforms = [ "x86_64-linux" ];

View File

@@ -1,9 +1,19 @@
From fa9420a311df176c887c6eb667068c16ffcd1eb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Chocholat=C3=BD?= <chocholaty.david@protonmail.com>
Date: Fri, 5 Jun 2026 10:02:54 +0200
Subject: [PATCH] fix(steam-run): Run the game and SteamCMD through Nix-resolved steam-run
---
app/utils/generic.py | 3 +++
app/utils/steam/steamcmd/wrapper.py | 4 ++--
app/windows/runner_panel.py | 20 +++++++++++++++-----
3 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/app/utils/generic.py b/app/utils/generic.py
index f23aa5c..9ff4a04 100644
index 379d7da..1bba282 100644
--- a/app/utils/generic.py
+++ b/app/utils/generic.py
@@ -299,7 +299,10 @@ def launch_game_process(game_install_path: Path, args: list[str]) -> None:
logger.info(
@@ -346,6 +346,9 @@ def launch_game_process(game_install_path: Path, run_args: str = "") -> None:
f"Launching the game with subprocess.Popen(): `{executable_path}` "
f"with env_vars: {list(env_vars.keys())}, wrappers: {wrapper_commands}, args: {game_args}"
)
@@ -14,17 +24,76 @@ index f23aa5c..9ff4a04 100644
executable_path,
game_args,
diff --git a/app/utils/steam/steamcmd/wrapper.py b/app/utils/steam/steamcmd/wrapper.py
index 398e0fd..79bb162 100644
index 83d9b26..8039efa 100644
--- a/app/utils/steam/steamcmd/wrapper.py
+++ b/app/utils/steam/steamcmd/wrapper.py
@@ -317,8 +317,8 @@ class SteamcmdInterface:
script_output.write("\n".join(script))
runner.message(f"Compiled & using script: {script_path}")
runner.execute(
- self.steamcmd,
- [f'+runscript "{script_path}"'],
+ "@steam-run@/bin/steam-run",
+ [self.steamcmd, f'+runscript "{script_path}"'],
len(publishedfileids),
)
else:
@@ -404,8 +404,8 @@ class SteamcmdInterface:
runner.message(f"Compiled & using script: {script_path}")
runner._steamcmd_console_log_path = str(self.console_log_path)
runner.execute(
- self.steamcmd,
- [f'+runscript "{script_path}"'],
+ "@steam-run@/bin/steam-run",
+ [self.steamcmd, f'+runscript "{script_path}"'],
total,
environment=runner._steamcmd_environment,
)
diff --git a/app/windows/runner_panel.py b/app/windows/runner_panel.py
index 6a40435..6cf2ee0 100644
--- a/app/windows/runner_panel.py
+++ b/app/windows/runner_panel.py
@@ -338,6 +338,10 @@ class RunnerPanel(QWidget):
self.process_last_args = args
self.process_last_environment = dict(environment) if environment else None
+ # SteamCMD is launched through the Nix steam-run FHS wrapper, so the
+ # SteamCMD executable is the first argument instead of the program.
+ is_steamcmd = "steamcmd" in command or any("steamcmd" in arg for arg in args)
+
# Show control buttons
self.restart_process_button.show()
self.kill_process_button.show()
@@ -356,7 +360,7 @@ class RunnerPanel(QWidget):
if progress_bar is not None:
self.progress_bar.show()
self.progress_bar.setValue(0)
- if progress_bar > 0 and "steamcmd" in command:
+ if progress_bar > 0 and is_steamcmd:
self.progress_bar.setRange(0, progress_bar)
self.progress_bar.setFormat("%v/%m")
@@ -364,7 +368,7 @@ class RunnerPanel(QWidget):
if not self.todds_dry_run_support:
self.message(f"\nExecuting command:\n{command} {' '.join(args)}\n\n")
- if "steamcmd" in command and self._steamcmd_console_log_path:
+ if is_steamcmd and self._steamcmd_console_log_path:
self._start_steamcmd_log_tail()
# Start the process
@@ -526,7 +530,11 @@ class RunnerPanel(QWidget):
return False
if self.process.state() != QProcess.ProcessState.Running:
return False
- return program_name in self.process.program()
+ if program_name in self.process.program():
+ return True
+ # The program may be the Nix steam-run FHS wrapper, which receives the
+ # real executable as its first argument.
+ return any(program_name in argument for argument in self.process.arguments())
def _handle_steamcmd_output(self, line: str) -> bool:
"""
@@ -682,8 +690,10 @@ class RunnerPanel(QWidget):
# Re-wire the finished signal before starting the new process.
self.process = QProcess(self)
- self.process.setProgram(self._steamcmd_executable)
- self.process.setArguments([f'+runscript "{script_path}"'])
+ self.process.setProgram("@steam-run@/bin/steam-run")
+ self.process.setArguments(
+ [self._steamcmd_executable, f'+runscript "{script_path}"']
+ )
self._apply_process_environment(self.process, self._steamcmd_environment)
self.process.setProcessChannelMode(QProcess.ProcessChannelMode.MergedChannels)
self.process.readyReadStandardError.connect(self.handle_output)

View File

@@ -7,7 +7,7 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "rnmon";
version = "0.3.6";
version = "0.4.0";
pyproject = true;
__structuredAttrs = true;
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
owner = "lbatalha";
repo = "rnmon";
tag = finalAttrs.version;
hash = "sha256-Pu7kd9CUoHRWnmzrF9NSeqXxN7CRDFQslS+j3M7iNGQ=";
hash = "sha256-aGveHnv8gmsSyWF25z8RV8mKvdcB4/dGUg2DHtfCRvs=";
};
build-system = [

View File

@@ -20,7 +20,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "rufin";
version = "0.16.0";
version = "0.16.6";
__structuredAttrs = true;
@@ -28,12 +28,12 @@ stdenv.mkDerivation (finalAttrs: {
owner = "screwys";
repo = "Rufin";
tag = "v${finalAttrs.version}";
hash = "sha256-NsB8B24wr1heDeDdeNJFRgAIgXUB4+yJCI6BWYDx7YA=";
hash = "sha256-Anm5iV/cd9Qw/xolZUQD3RpOfjaU9GOPwJY4zmoJ+bA=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-Yc3lcdg/CBriaBI0H/9ZRF4KFlsSuyhdJCsy+A6yxxY=";
hash = "sha256-s+wUcvssyjL1nHTqAmqTgYe2ECxAqJyhZeD4PQg0Lu0=";
};
strictDeps = true;

View File

@@ -0,0 +1,39 @@
{
lib,
rustPlatform,
fetchFromGitHub,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "seednaut";
version = "0.1.1";
src = fetchFromGitHub {
owner = "Baltram";
repo = "seednaut";
tag = "v${finalAttrs.version}";
hash = "sha256-wyMOZQPJPSqLl4tzC5NELoe81aJZSOurifi62v1+jcQ=";
};
cargoHash = "sha256-1GZ7ZoiGKEQGN2AQFcz/YXpcqg3iYLRSzl2GfTmGk8g=";
__structuredAttrs = true;
meta = {
description = "Inspect, verify and extract files from Seedvault Android backups";
longDescription = ''
A command-line and terminal UI utility for Seedvault, the backup
mechanism integrated by Android distributions such as CalyxOS,
GrapheneOS, iodéOS, LineageOS and /e/OS. It works fully offline and
supports the current backup formats (v2 app backup, v0 file backup),
allowing backups to be verified, explored and extracted off-device.
'';
homepage = "https://github.com/Baltram/seednaut";
changelog = "https://github.com/Baltram/seednaut/releases/tag/v${finalAttrs.version}";
license = with lib.licenses; [
mit
asl20
];
mainProgram = "seednaut";
maintainers = with lib.maintainers; [ _6543 ];
};
})

View File

@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "serie";
version = "0.9.1";
version = "0.9.2";
src = fetchFromGitHub {
owner = "lusingander";
repo = "serie";
rev = "v${finalAttrs.version}";
hash = "sha256-mFR/Q1gxoyu82wOfS5qIHV1P6Lia0lqlg1+u/hicG1w=";
hash = "sha256-xHIqyjaC7TrLGRof3uPiKZG67xBJK8zC21l2UG+8Mm0=";
};
cargoHash = "sha256-5V4QnTW92GTDP0jceFt7tnEW06cTr1NyM+XGz0OGN5A=";
cargoHash = "sha256-JjeHDFs8PY+1nqSxTeBAeVaskUSq9AD1jhMQeG/EpSo=";
nativeCheckInputs = [ gitMinimal ];

View File

@@ -151,5 +151,8 @@ buildFHSEnv {
];
platforms = [ "x86_64-linux" ];
mainProgram = "sidequest";
knownVulnerabilities = [
"Uses EOL Electron 29, many known CVEs."
];
};
}

View File

@@ -7,16 +7,16 @@
let
pname = "simplex-chat-desktop";
version = "7.0.2";
version = "7.0.3";
sources = {
"aarch64-linux" = fetchurl {
url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-aarch64.AppImage";
hash = "sha256-VNQaDtd32pFIkSILxuUKFjsfns5SLOqpY0W4bWK7iKs=";
hash = "sha256-jq/aFpDIGhATa14oTYCs/ES56PkZ+kpSLTK4rJ69kV0=";
};
"x86_64-linux" = fetchurl {
url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage";
hash = "sha256-hYf5f1F4u4fvxWsmHAHJhSh5QdTNzfdADptotlsXEcE=";
hash = "sha256-QEIg8W8cA4ebjXQC4x6M5SXcPOemkEY3vUjhmXTyU2o=";
};
};

View File

@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "sonic-server";
version = "1.10.0";
version = "1.10.1";
src = fetchFromGitHub {
owner = "valeriansaliou";
repo = "sonic";
tag = "v${version}";
hash = "sha256-MCcYqA1Yoo9ntLISUpsf+3V9oIdcLVdSapEh8tlDLAE=";
hash = "sha256-2iKB05lmEpNn5glESFOS6yfqSPmOUdECYGewHnKAfz0=";
};
cargoHash = "sha256-+7tZZ6xVzpRIZPvZ8gpqFh/T8QWXGeSIPYuoj2BCjgI=";
cargoHash = "sha256-dD2lJG4Pk53Mgw5k7gkG+lRm0xWLrDODCv5sPGvPHzk=";
nativeBuildInputs = [
rustPlatform.bindgenHook

View File

@@ -40,7 +40,7 @@ stdenv.mkDerivation (
in
{
pname = "t3code-unwrapped";
version = "0.0.42";
version = "0.0.44";
strictDeps = true;
__structuredAttrs = true;
@@ -48,7 +48,7 @@ stdenv.mkDerivation (
owner = "pingdotgg";
repo = "t3code";
tag = "v${finalAttrs.version}";
hash = "sha256-YV86WqqpGQwjeovXB0IoE3f/o4IUC5DDVdBEdT4xzjc=";
hash = "sha256-cSkGa6b+WGbXJ+lbpJ3tfCibtvaj7DwWhn66UGiXlWk=";
};
postPatch = ''
@@ -105,7 +105,7 @@ stdenv.mkDerivation (
;
fetcherVersion = 4;
hash = "sha256-gEY2em9pNTC1EuVX0V3L/Wu1apZ+BKBXxALEcPQ/pwA=";
hash = "sha256-xdS9+PqIDULKIu3+lQRMabA23D0dxCEME96NhFggWPY=";
};
preBuild = ''

View File

@@ -6,13 +6,13 @@
buildGoModule (finalAttrs: {
pname = "taproot-assets";
version = "0.8.4";
version = "0.8.5";
src = fetchFromGitHub {
owner = "lightninglabs";
repo = "taproot-assets";
rev = "v${finalAttrs.version}";
hash = "sha256-eMT6hQx5zzSouusgSmD5IWh93/KakW9PitrwxP3sSj4=";
hash = "sha256-38fuzRJ5USxQ8dnMoF9ktmMyCnwV3fTOs5sU27WqSsk=";
};
vendorHash = "sha256-YpxWfNln7YwpKEINbOVbLf1iHEVCRWXj53tC2DhLI6w=";

View File

@@ -1,12 +1,12 @@
{
"name": "thunderbird-mcp",
"version": "0.7.4",
"version": "0.9.1",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "thunderbird-mcp",
"version": "0.7.4",
"version": "0.9.1",
"license": "MIT",
"bin": {
"thunderbird-mcp": "mcp-bridge.cjs"

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