Merge staging-next into staging
This commit is contained in:
@@ -12,6 +12,9 @@ on:
|
||||
mergedSha:
|
||||
required: true
|
||||
type: string
|
||||
ownersCanFail:
|
||||
required: true
|
||||
type: boolean
|
||||
targetSha:
|
||||
required: true
|
||||
type: string
|
||||
@@ -94,6 +97,7 @@ jobs:
|
||||
# handling untrusted PR input.
|
||||
owners:
|
||||
runs-on: ubuntu-24.04-arm
|
||||
continue-on-error: ${{ inputs.ownersCanFail }}
|
||||
timeout-minutes: 5
|
||||
steps:
|
||||
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
|
||||
|
||||
@@ -26,19 +26,30 @@ jobs:
|
||||
mergedSha: ${{ inputs.mergedSha || github.event.merge_group.head_sha }}
|
||||
targetSha: ${{ inputs.targetSha || github.event.merge_group.base_sha }}
|
||||
|
||||
# This job's only purpose is to serve as a target for the "Required Status Checks" branch ruleset.
|
||||
# This job's only purpose is to create the target for the "Required Status Checks" branch ruleset.
|
||||
# It "needs" all the jobs that should block the Merge Queue.
|
||||
# If they pass, it is skipped — which counts as "success" for purposes of the branch ruleset.
|
||||
# However, if any of them fail, this job will also fail — thus blocking the branch ruleset.
|
||||
no-pr-failures:
|
||||
unlock:
|
||||
if: github.event_name != 'pull_request'
|
||||
# Modify this list to add or remove jobs from required status checks.
|
||||
needs:
|
||||
- lint
|
||||
# WARNING:
|
||||
# Do NOT change the name of this job, otherwise the rule will not catch it anymore.
|
||||
# This would prevent all PRs from passing the merge queue.
|
||||
name: no PR failures
|
||||
if: ${{ failure() }}
|
||||
runs-on: ubuntu-24.04-arm
|
||||
permissions:
|
||||
statuses: write
|
||||
steps:
|
||||
- run: exit 1
|
||||
- uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
|
||||
with:
|
||||
script: |
|
||||
const { serverUrl, repo, runId, payload } = context
|
||||
const target_url =
|
||||
`${serverUrl}/${repo.owner}/${repo.repo}/actions/runs/${runId}`
|
||||
await github.rest.repos.createCommitStatus({
|
||||
...repo,
|
||||
sha: payload.merge_group.head_sha,
|
||||
// WARNING:
|
||||
// Do NOT change the name of this, otherwise the rule will not catch it anymore.
|
||||
// This would prevent all PRs from merging.
|
||||
context: 'no PR failures',
|
||||
state: 'success',
|
||||
target_url,
|
||||
})
|
||||
|
||||
+22
-14
@@ -61,6 +61,7 @@ jobs:
|
||||
headBranch: ${{ needs.prepare.outputs.headBranch }}
|
||||
mergedSha: ${{ needs.prepare.outputs.mergedSha }}
|
||||
targetSha: ${{ needs.prepare.outputs.targetSha }}
|
||||
ownersCanFail: ${{ !contains(fromJSON(needs.prepare.outputs.touched), 'owners') }}
|
||||
|
||||
lint:
|
||||
name: Lint
|
||||
@@ -119,26 +120,33 @@ jobs:
|
||||
baseBranch: ${{ needs.prepare.outputs.baseBranch }}
|
||||
mergedSha: ${{ needs.prepare.outputs.mergedSha }}
|
||||
|
||||
# This job's only purpose is to serve as a target for the "Required Status Checks" branch ruleset.
|
||||
# This job's only purpose is to create the target for the "Required Status Checks" branch ruleset.
|
||||
# It "needs" all the jobs that should block merging a PR.
|
||||
# If they pass, it is skipped — which counts as "success" for purposes of the branch ruleset.
|
||||
# However, if any of them fail, this job will also fail — thus blocking the branch ruleset.
|
||||
no-pr-failures:
|
||||
unlock:
|
||||
if: github.event_name != 'pull_request'
|
||||
# Modify this list to add or remove jobs from required status checks.
|
||||
needs:
|
||||
- check
|
||||
- lint
|
||||
- eval
|
||||
- build
|
||||
# WARNING:
|
||||
# Do NOT change the name of this job, otherwise the rule will not catch it anymore.
|
||||
# This would prevent all PRs from merging.
|
||||
name: no PR failures
|
||||
# A single job is "cancelled" when it hits its timeout. This is not the same
|
||||
# as "skipped", which happens when the `if` condition doesn't apply.
|
||||
# The "cancelled()" function only checks the whole workflow, but not individual
|
||||
# jobs.
|
||||
if: ${{ failure() || contains(needs.*.result, 'cancelled') }}
|
||||
runs-on: ubuntu-24.04-arm
|
||||
permissions:
|
||||
statuses: write
|
||||
steps:
|
||||
- run: exit 1
|
||||
- uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
|
||||
with:
|
||||
script: |
|
||||
const { serverUrl, repo, runId, payload } = context
|
||||
const target_url =
|
||||
`${serverUrl}/${repo.owner}/${repo.repo}/actions/runs/${runId}?pr=${payload.pull_request.number}`
|
||||
await github.rest.repos.createCommitStatus({
|
||||
...repo,
|
||||
sha: payload.pull_request.head.sha,
|
||||
// WARNING:
|
||||
// Do NOT change the name of this, otherwise the rule will not catch it anymore.
|
||||
// This would prevent all PRs from merging.
|
||||
context: 'no PR failures',
|
||||
state: 'success',
|
||||
target_url,
|
||||
})
|
||||
|
||||
@@ -76,6 +76,9 @@ jobs:
|
||||
name: Merge Group
|
||||
needs: [prepare]
|
||||
uses: ./.github/workflows/merge-group.yml
|
||||
# Those are actually only used on the merge_group event, but will throw an error if not set.
|
||||
permissions:
|
||||
statuses: write
|
||||
secrets:
|
||||
CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
|
||||
with:
|
||||
@@ -87,7 +90,7 @@ jobs:
|
||||
name: PR
|
||||
needs: [prepare]
|
||||
uses: ./.github/workflows/pr.yml
|
||||
# Those are not actually used on pull_request, but will throw an error if not set.
|
||||
# Those are actually only used on the pull_request_target event, but will throw an error if not set.
|
||||
permissions:
|
||||
issues: write
|
||||
pull-requests: write
|
||||
@@ -102,7 +105,7 @@ jobs:
|
||||
name: Push
|
||||
needs: [prepare]
|
||||
uses: ./.github/workflows/push.yml
|
||||
# Those are not actually used on push, but will throw an error if not set.
|
||||
# Those are not actually used on the push or pull_request events, but will throw an error if not set.
|
||||
permissions:
|
||||
statuses: write
|
||||
secrets:
|
||||
|
||||
@@ -76,8 +76,10 @@ module.exports = async ({ github, context, core }) => {
|
||||
})
|
||||
).map((file) => file.filename)
|
||||
|
||||
if (files.includes('ci/pinned.json')) core.setOutput('touched', ['pinned'])
|
||||
else core.setOutput('touched', [])
|
||||
const touched = []
|
||||
if (files.includes('ci/pinned.json')) touched.push('pinned')
|
||||
if (files.includes('ci/OWNERS')) touched.push('owners')
|
||||
core.setOutput('touched', touched)
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
@@ -7790,12 +7790,6 @@
|
||||
githubId = 5427394;
|
||||
name = "Ersin Akinci";
|
||||
};
|
||||
ertes = {
|
||||
email = "esz@posteo.de";
|
||||
github = "ertes";
|
||||
githubId = 1855930;
|
||||
name = "Ertugrul Söylemez";
|
||||
};
|
||||
esau79p = {
|
||||
github = "EsAu79p";
|
||||
githubId = 21313906;
|
||||
|
||||
@@ -298,13 +298,20 @@ in
|
||||
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
security.pam.services.sudo = {
|
||||
sshAgentAuth = true;
|
||||
usshAuth = true;
|
||||
};
|
||||
security.pam.services.sudo-i = {
|
||||
sshAgentAuth = true;
|
||||
usshAuth = true;
|
||||
security.pam.services = {
|
||||
su-l = {
|
||||
rootOK = true;
|
||||
forwardXAuth = true;
|
||||
logFailures = true;
|
||||
};
|
||||
sudo = {
|
||||
sshAgentAuth = true;
|
||||
usshAuth = true;
|
||||
};
|
||||
sudo-i = {
|
||||
sshAgentAuth = true;
|
||||
usshAuth = true;
|
||||
};
|
||||
};
|
||||
|
||||
environment.etc.sudoers = {
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
utils,
|
||||
...
|
||||
}:
|
||||
|
||||
@@ -102,12 +101,108 @@ in
|
||||
default = "sqlite://./users.db?mode=rwc";
|
||||
example = "postgres://postgres-user:password@postgres-server/my-database";
|
||||
};
|
||||
|
||||
ldap_user_pass = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
description = ''
|
||||
Password for default admin password.
|
||||
|
||||
Unsecure: Use `ldap_user_pass_file` settings instead.
|
||||
'';
|
||||
};
|
||||
|
||||
ldap_user_pass_file = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
description = ''
|
||||
Path to a file containing the default admin password.
|
||||
|
||||
If you want to update the default admin password through this setting,
|
||||
you must set `force_ldap_user_pass_reset` to `true`.
|
||||
Otherwise changing this setting will have no effect
|
||||
unless this is the very first time LLDAP is started and its database is still empty.
|
||||
'';
|
||||
};
|
||||
|
||||
force_ldap_user_pass_reset = mkOption {
|
||||
type = types.oneOf [
|
||||
types.bool
|
||||
(types.enum [ "always" ])
|
||||
];
|
||||
default = false;
|
||||
description = ''
|
||||
Force reset of the admin password.
|
||||
|
||||
Set this setting to `"always"` to update the admin password when `ldap_user_pass_file` changes.
|
||||
Setting to `"always"` also means any password update in the UI will be overwritten next time the service restarts.
|
||||
|
||||
The difference between `true` and `"always"` is the former is intended for a one time fix
|
||||
while the latter is intended for a declarative workflow. In practice, the result
|
||||
is the same: the password gets reset. The only practical difference is the former
|
||||
outputs a warning message while the latter outputs an info message.
|
||||
'';
|
||||
};
|
||||
|
||||
jwt_secret_file = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
description = ''
|
||||
Path to a file containing the JWT secret.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# TOML does not allow null values, so we use null to omit those fields
|
||||
apply = lib.filterAttrsRecursive (_: v: v != null);
|
||||
};
|
||||
|
||||
silenceForceUserPassResetWarning = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Disable warning when the admin password is set declaratively with the `ldap_user_pass_file` setting
|
||||
but the `force_ldap_user_pass_reset` is set to `false`.
|
||||
|
||||
This can lead to the admin password to drift from the one given declaratively.
|
||||
If that is okay for you and you want to silence the warning, set this option to `true`.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion =
|
||||
(cfg.settings.ldap_user_pass_file or null) != null || (cfg.settings.ldap_user_pass or null) != null;
|
||||
message = "lldap: Default admin user password must be set. Please set the `ldap_user_pass` or better the `ldap_user_pass_file` setting.";
|
||||
}
|
||||
{
|
||||
assertion =
|
||||
(cfg.settings.ldap_user_pass_file or null) == null || (cfg.settings.ldap_user_pass or null) == null;
|
||||
message = "lldap: Both `ldap_user_pass` and `ldap_user_pass_file` settings should not be set at the same time. Set one to `null`.";
|
||||
}
|
||||
];
|
||||
|
||||
warnings =
|
||||
lib.optionals (cfg.settings.ldap_user_pass or null != null) [
|
||||
''
|
||||
lldap: Unsecure `ldap_user_pass` setting is used. Prefer `ldap_user_pass_file` instead.
|
||||
''
|
||||
]
|
||||
++
|
||||
lib.optionals
|
||||
(cfg.settings.force_ldap_user_pass_reset == false && cfg.silenceForceUserPassResetWarning == false)
|
||||
[
|
||||
''
|
||||
lldap: The `force_ldap_user_pass_reset` setting is set to `false` which means
|
||||
the admin password can be changed through the UI and will drift from the one defined in your nix config.
|
||||
It also means changing the setting `ldap_user_pass` or `ldap_user_pass_file` will have no effect on the admin password.
|
||||
Either set `force_ldap_user_pass_reset` to `"always"` or silence this warning by setting the option `services.lldap.silenceForceUserPassResetWarning` to `true`.
|
||||
''
|
||||
];
|
||||
|
||||
systemd.services.lldap = {
|
||||
description = "Lightweight LDAP server (lldap)";
|
||||
wants = [ "network-online.target" ];
|
||||
|
||||
@@ -20,25 +20,17 @@ let
|
||||
|
||||
cfg = config.virtualisation;
|
||||
|
||||
opt = options.virtualisation;
|
||||
|
||||
qemu = cfg.qemu.package;
|
||||
|
||||
hostPkgs = cfg.host.pkgs;
|
||||
|
||||
consoles = lib.concatMapStringsSep " " (c: "console=${c}") cfg.qemu.consoles;
|
||||
|
||||
driveOpts =
|
||||
driveOptions =
|
||||
{ ... }:
|
||||
{
|
||||
|
||||
options = {
|
||||
|
||||
file = mkOption {
|
||||
type = types.str;
|
||||
description = "The file image used for this drive.";
|
||||
};
|
||||
|
||||
driveExtraOpts = mkOption {
|
||||
type = types.attrsOf types.str;
|
||||
default = { };
|
||||
@@ -299,7 +291,9 @@ let
|
||||
|
||||
${lib.pipe cfg.emptyDiskImages [
|
||||
(lib.imap0 (
|
||||
idx: size: ''
|
||||
idx:
|
||||
{ size, ... }:
|
||||
''
|
||||
test -e "empty${builtins.toString idx}.qcow2" || ${qemu}/bin/qemu-img create -f qcow2 "empty${builtins.toString idx}.qcow2" "${builtins.toString size}M"
|
||||
''
|
||||
))
|
||||
@@ -477,7 +471,20 @@ in
|
||||
};
|
||||
|
||||
virtualisation.emptyDiskImages = mkOption {
|
||||
type = types.listOf types.ints.positive;
|
||||
type = types.listOf (
|
||||
types.coercedTo types.ints.positive (size: { inherit size; }) (
|
||||
types.submodule {
|
||||
options.size = mkOption {
|
||||
type = types.ints.positive;
|
||||
description = "The size of the disk in MiB";
|
||||
};
|
||||
options.driveConfig = mkOption {
|
||||
type = lib.types.submodule driveOptions;
|
||||
description = "Drive configuration to pass to {option}`virtualisation.qemu.drives`";
|
||||
};
|
||||
}
|
||||
)
|
||||
);
|
||||
default = [ ];
|
||||
description = ''
|
||||
Additional disk images to provide to the VM. The value is
|
||||
@@ -829,7 +836,18 @@ in
|
||||
};
|
||||
|
||||
drives = mkOption {
|
||||
type = types.listOf (types.submodule driveOpts);
|
||||
type = types.listOf (
|
||||
types.submodule {
|
||||
imports = [ driveOptions ];
|
||||
|
||||
options = {
|
||||
file = mkOption {
|
||||
type = types.str;
|
||||
description = "The file image used for this drive.";
|
||||
};
|
||||
};
|
||||
}
|
||||
);
|
||||
description = "Drives passed to qemu.";
|
||||
};
|
||||
|
||||
@@ -1310,10 +1328,16 @@ in
|
||||
driveExtraOpts.format = "raw";
|
||||
}
|
||||
])
|
||||
(imap0 (idx: _: {
|
||||
file = "$(pwd)/empty${toString idx}.qcow2";
|
||||
driveExtraOpts.werror = "report";
|
||||
}) cfg.emptyDiskImages)
|
||||
(imap0 (
|
||||
idx: imgCfg:
|
||||
lib.mkMerge [
|
||||
{
|
||||
file = "$(pwd)/empty${toString idx}.qcow2";
|
||||
driveExtraOpts.werror = "report";
|
||||
}
|
||||
imgCfg.driveConfig
|
||||
]
|
||||
) cfg.emptyDiskImages)
|
||||
];
|
||||
|
||||
# By default, use mkVMOverride to enable building test VMs (e.g. via
|
||||
|
||||
+13
-9
@@ -5,29 +5,33 @@
|
||||
nodes.machine =
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
boot.initrd.postDeviceCommands = ''
|
||||
${pkgs.btrfs-progs}/bin/mkfs.btrfs -f -L aux1 /dev/vdb
|
||||
${pkgs.btrfs-progs}/bin/mkfs.btrfs -f -L aux2 /dev/vdc
|
||||
'';
|
||||
virtualisation.emptyDiskImages = [
|
||||
4096
|
||||
4096
|
||||
{
|
||||
size = 4096;
|
||||
driveConfig.deviceExtraOpts.serial = "aux1";
|
||||
}
|
||||
{
|
||||
size = 4096;
|
||||
driveConfig.deviceExtraOpts.serial = "aux2";
|
||||
}
|
||||
];
|
||||
virtualisation.fileSystems = {
|
||||
"/aux1" = {
|
||||
# filesystem configured to be deduplicated
|
||||
device = "/dev/disk/by-label/aux1";
|
||||
device = "/dev/disk/by-id/virtio-aux1";
|
||||
fsType = "btrfs";
|
||||
autoFormat = true;
|
||||
};
|
||||
"/aux2" = {
|
||||
# filesystem not configured to be deduplicated
|
||||
device = "/dev/disk/by-label/aux2";
|
||||
device = "/dev/disk/by-id/virtio-aux2";
|
||||
fsType = "btrfs";
|
||||
autoFormat = true;
|
||||
};
|
||||
};
|
||||
services.beesd.filesystems = {
|
||||
aux1 = {
|
||||
spec = "LABEL=aux1";
|
||||
spec = "/dev/disk/by-id/virtio-aux1";
|
||||
hashTableSizeMB = 16;
|
||||
verbosity = "debug";
|
||||
};
|
||||
|
||||
@@ -19,17 +19,18 @@ let
|
||||
networking.firewall.enable = false;
|
||||
services.glusterfs.enable = true;
|
||||
|
||||
# create a mount point for the volume
|
||||
boot.initrd.postDeviceCommands = ''
|
||||
${pkgs.e2fsprogs}/bin/mkfs.ext4 -L data /dev/vdb
|
||||
'';
|
||||
|
||||
virtualisation.emptyDiskImages = [ 1024 ];
|
||||
virtualisation.emptyDiskImages = [
|
||||
{
|
||||
size = 1024;
|
||||
driveConfig.deviceExtraOpts.serial = "data";
|
||||
}
|
||||
];
|
||||
|
||||
virtualisation.fileSystems = {
|
||||
"/data" = {
|
||||
device = "/dev/disk/by-label/data";
|
||||
device = "/dev/disk/by-id/virtio-data";
|
||||
fsType = "ext4";
|
||||
autoFormat = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
+12
-10
@@ -24,14 +24,17 @@
|
||||
imports = [ ../modules/profiles/hardened.nix ];
|
||||
environment.memoryAllocator.provider = "graphene-hardened";
|
||||
nix.settings.sandbox = false;
|
||||
virtualisation.emptyDiskImages = [ 4096 ];
|
||||
boot.initrd.postDeviceCommands = ''
|
||||
${pkgs.dosfstools}/bin/mkfs.vfat -n EFISYS /dev/vdb
|
||||
'';
|
||||
virtualisation.emptyDiskImages = [
|
||||
{
|
||||
size = 4096;
|
||||
driveConfig.deviceExtraOpts.serial = "deferred";
|
||||
}
|
||||
];
|
||||
virtualisation.fileSystems = {
|
||||
"/efi" = {
|
||||
device = "/dev/disk/by-label/EFISYS";
|
||||
"/deferred" = {
|
||||
device = "/dev/disk/by-id/virtio-deferred";
|
||||
fsType = "vfat";
|
||||
autoFormat = true;
|
||||
options = [ "noauto" ];
|
||||
};
|
||||
};
|
||||
@@ -87,10 +90,9 @@
|
||||
|
||||
# Test deferred mount
|
||||
with subtest("Deferred mounts work"):
|
||||
machine.fail("mountpoint -q /efi") # was deferred
|
||||
machine.execute("mkdir -p /efi")
|
||||
machine.succeed("mount /dev/disk/by-label/EFISYS /efi")
|
||||
machine.succeed("mountpoint -q /efi") # now mounted
|
||||
machine.fail("mountpoint -q /deferred") # was deferred
|
||||
machine.systemctl("start deferred.mount")
|
||||
machine.succeed("mountpoint -q /deferred") # now mounted
|
||||
|
||||
|
||||
# Test Nix dæmon usage
|
||||
|
||||
+68
-10
@@ -1,29 +1,87 @@
|
||||
{ ... }:
|
||||
let
|
||||
adminPassword = "mySecretPassword";
|
||||
in
|
||||
{
|
||||
name = "lldap";
|
||||
|
||||
nodes.machine =
|
||||
{ pkgs, ... }:
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
services.lldap = {
|
||||
enable = true;
|
||||
|
||||
settings = {
|
||||
verbose = true;
|
||||
ldap_base_dn = "dc=example,dc=com";
|
||||
|
||||
ldap_user_pass = "password";
|
||||
};
|
||||
};
|
||||
environment.systemPackages = [ pkgs.openldap ];
|
||||
|
||||
specialisation = {
|
||||
differentAdminPassword.configuration =
|
||||
{ ... }:
|
||||
{
|
||||
services.lldap.settings = {
|
||||
ldap_user_pass = lib.mkForce null;
|
||||
ldap_user_pass_file = lib.mkForce (toString (pkgs.writeText "adminPasswordFile" adminPassword));
|
||||
force_ldap_user_pass_reset = "always";
|
||||
};
|
||||
};
|
||||
|
||||
changeAdminPassword.configuration =
|
||||
{ ... }:
|
||||
{
|
||||
services.lldap.settings = {
|
||||
ldap_user_pass = lib.mkForce null;
|
||||
ldap_user_pass_file = toString (pkgs.writeText "adminPasswordFile" "password");
|
||||
force_ldap_user_pass_reset = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("lldap.service")
|
||||
machine.wait_for_open_port(3890)
|
||||
machine.wait_for_open_port(17170)
|
||||
testScript =
|
||||
{ nodes, ... }:
|
||||
let
|
||||
specializations = "${nodes.machine.system.build.toplevel}/specialisation";
|
||||
in
|
||||
''
|
||||
machine.wait_for_unit("lldap.service")
|
||||
machine.wait_for_open_port(3890)
|
||||
machine.wait_for_open_port(17170)
|
||||
|
||||
machine.succeed("curl --location --fail http://localhost:17170/")
|
||||
machine.succeed("curl --location --fail http://localhost:17170/")
|
||||
|
||||
print(
|
||||
machine.succeed('ldapsearch -H ldap://localhost:3890 -D uid=admin,ou=people,dc=example,dc=com -b "ou=people,dc=example,dc=com" -w password')
|
||||
)
|
||||
'';
|
||||
adminPassword="${adminPassword}"
|
||||
|
||||
def try_login(user, password, expect_success=True):
|
||||
cmd = f'ldapsearch -H ldap://localhost:3890 -D uid={user},ou=people,dc=example,dc=com -b "ou=people,dc=example,dc=com" -w {password}'
|
||||
code, response = machine.execute(cmd)
|
||||
print(cmd)
|
||||
print(response)
|
||||
if expect_success:
|
||||
if code != 0:
|
||||
raise Exception(f"Expected success, had failure {code}")
|
||||
else:
|
||||
if code == 0:
|
||||
raise Exception("Expected failure, had success")
|
||||
return response
|
||||
|
||||
with subtest("default admin password"):
|
||||
try_login("admin", "password", expect_success=True)
|
||||
try_login("admin", adminPassword, expect_success=False)
|
||||
|
||||
with subtest("different admin password"):
|
||||
machine.succeed('${specializations}/differentAdminPassword/bin/switch-to-configuration test')
|
||||
try_login("admin", "password", expect_success=False)
|
||||
try_login("admin", adminPassword, expect_success=True)
|
||||
|
||||
with subtest("change admin password has no effect"):
|
||||
machine.succeed('${specializations}/differentAdminPassword/bin/switch-to-configuration test')
|
||||
try_login("admin", "password", expect_success=False)
|
||||
try_login("admin", adminPassword, expect_success=True)
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -22,15 +22,18 @@ let
|
||||
chunkserver =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
virtualisation.emptyDiskImages = [ 4096 ];
|
||||
boot.initrd.postDeviceCommands = ''
|
||||
${pkgs.e2fsprogs}/bin/mkfs.ext4 -L data /dev/vdb
|
||||
'';
|
||||
virtualisation.emptyDiskImages = [
|
||||
{
|
||||
size = 4096;
|
||||
driveConfig.deviceExtraOpts.serial = "data";
|
||||
}
|
||||
];
|
||||
|
||||
fileSystems = pkgs.lib.mkVMOverride {
|
||||
"/data" = {
|
||||
device = "/dev/disk/by-label/data";
|
||||
device = "/dev/disk/by-id/virtio-data";
|
||||
fsType = "ext4";
|
||||
autoFormat = true;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -5,16 +5,19 @@ let
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
networking.firewall.allowedTCPPorts = [ 3334 ];
|
||||
boot.initrd.postDeviceCommands = ''
|
||||
${pkgs.e2fsprogs}/bin/mkfs.ext4 -L data /dev/vdb
|
||||
'';
|
||||
|
||||
virtualisation.emptyDiskImages = [ 4096 ];
|
||||
virtualisation.emptyDiskImages = [
|
||||
{
|
||||
size = 4096;
|
||||
driveConfig.deviceExtraOpts.serial = "data";
|
||||
}
|
||||
];
|
||||
|
||||
virtualisation.fileSystems = {
|
||||
"/data" = {
|
||||
device = "/dev/disk/by-label/data";
|
||||
device = "/dev/disk/by-id/virtio-data";
|
||||
fsType = "ext4";
|
||||
autoFormat = true;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -20,15 +20,18 @@ let
|
||||
chunkserver =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
virtualisation.emptyDiskImages = [ 4096 ];
|
||||
boot.initrd.postDeviceCommands = ''
|
||||
${pkgs.e2fsprogs}/bin/mkfs.ext4 -L data /dev/vdb
|
||||
'';
|
||||
virtualisation.emptyDiskImages = [
|
||||
{
|
||||
size = 4096;
|
||||
driveConfig.deviceExtraOpts.serial = "data";
|
||||
}
|
||||
];
|
||||
|
||||
fileSystems = pkgs.lib.mkVMOverride {
|
||||
"/data" = {
|
||||
device = "/dev/disk/by-label/data";
|
||||
device = "/dev/disk/by-id/virtio-data";
|
||||
fsType = "ext4";
|
||||
autoFormat = true;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -5,16 +5,18 @@
|
||||
nodes.machine =
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
boot.initrd.postDeviceCommands = ''
|
||||
${pkgs.btrfs-progs}/bin/mkfs.btrfs -f -L aux /dev/vdb
|
||||
'';
|
||||
|
||||
virtualisation.emptyDiskImages = [ 4096 ];
|
||||
virtualisation.emptyDiskImages = [
|
||||
{
|
||||
size = 4096;
|
||||
driveConfig.deviceExtraOpts.serial = "aux";
|
||||
}
|
||||
];
|
||||
|
||||
virtualisation.fileSystems = {
|
||||
"/home" = {
|
||||
device = "/dev/disk/by-label/aux";
|
||||
device = "/dev/disk/by-id/virtio-aux";
|
||||
fsType = "btrfs";
|
||||
autoFormat = true;
|
||||
};
|
||||
};
|
||||
services.snapper.configs.home.SUBVOLUME = "/home";
|
||||
|
||||
@@ -5,20 +5,18 @@
|
||||
meta.maintainers = with lib.maintainers; [ oxalica ];
|
||||
|
||||
nodes.machine =
|
||||
{ pkgs, ... }:
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
virtualisation.useDefaultFilesystems = false;
|
||||
|
||||
virtualisation.rootDevice = "/dev/vda";
|
||||
|
||||
boot.initrd.postDeviceCommands = ''
|
||||
${pkgs.btrfs-progs}/bin/mkfs.btrfs --label root /dev/vda
|
||||
'';
|
||||
|
||||
boot.initrd.systemd.enable = true;
|
||||
virtualisation.fileSystems = {
|
||||
"/" = {
|
||||
device = "/dev/disk/by-label/root";
|
||||
device = config.virtualisation.rootDevice;
|
||||
fsType = "btrfs";
|
||||
autoFormat = true;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -33,22 +33,7 @@ pythonPackages.buildPythonApplication rec {
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
gst-plugins-ugly
|
||||
# Required patches for the Spotify plugin (https://github.com/mopidy/mopidy-spotify/releases/tag/v5.0.0a3)
|
||||
(gst-plugins-rs.overrideAttrs (
|
||||
newAttrs: oldAttrs: {
|
||||
cargoDeps = oldAttrs.cargoDeps.overrideAttrs (oldAttrs': {
|
||||
vendorStaging = oldAttrs'.vendorStaging.overrideAttrs {
|
||||
inherit (newAttrs) patches;
|
||||
outputHash = "sha256-urRYH5N1laBq1/SUEmwFKAtsHAC+KWYfYp+fmb7Ey7s=";
|
||||
};
|
||||
});
|
||||
|
||||
# https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1801/
|
||||
patches = oldAttrs.patches or [ ] ++ [
|
||||
./spotify-access-token-auth.patch
|
||||
];
|
||||
}
|
||||
))
|
||||
gst-plugins-rs
|
||||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pipewire ];
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -14,19 +14,19 @@ let
|
||||
{
|
||||
x86_64-linux = {
|
||||
arch = "linux-x64";
|
||||
hash = "sha256-lxslDmnBA5TSFH/5J5Mt/TYsiE+5noQXCnHKAfA7mko=";
|
||||
hash = "sha256-2hmkSgS3r4ghAXA8E0blWhe7kLvtZoApSRWXf6Ff5AE=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
arch = "linux-arm64";
|
||||
hash = "sha256-hCRtlgRNO49D9YrmPcw+guNwk6RE+mLi9MrJTKI+FdU=";
|
||||
hash = "sha256-XVygGMHtEhk+Fttd/xdZr5Yau9P3yCSo43RrXhqh/PQ=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
arch = "darwin-x64";
|
||||
hash = "sha256-CCsYPdiepfKa5s51ZZT/Rn9PoI4IKzGV+ztNkoQb9eo=";
|
||||
hash = "sha256-8awJFJVSo6ru3ej4utkTF/5eK4dMw63Z3KHNHRRFSBs=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
arch = "darwin-arm64";
|
||||
hash = "sha256-JOJf5JI46eBjSJ26aIe2nJ8TGHFsXsDNkIoCV9upSRA=";
|
||||
hash = "sha256-JNik8Q9/BDjjuLVNJFOazyH9/a4s2HmkuENLQlDdKP4=";
|
||||
};
|
||||
}
|
||||
.${system} or (throw "Unsupported system: ${system}");
|
||||
@@ -38,7 +38,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
# Please update the corresponding binary (typos-lsp)
|
||||
# when updating this extension.
|
||||
# See pkgs/by-name/ty/typos-lsp/package.nix
|
||||
version = "0.1.40";
|
||||
version = "0.1.41";
|
||||
inherit (extInfo) hash arch;
|
||||
};
|
||||
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "pure-maps";
|
||||
version = "3.4.0";
|
||||
version = "3.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rinigus";
|
||||
repo = "pure-maps";
|
||||
rev = version;
|
||||
hash = "sha256-3XghdDwzt0r8Qi8W3ZMwar2aaqTNGiGsM27BHVr5C2E=";
|
||||
hash = "sha256-Xh4TRc4B/rm2+S8ej/instfkO3271f0HPuqVJYGtCSM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
buildKodiAddon rec {
|
||||
pname = "netflix";
|
||||
namespace = "plugin.video.netflix";
|
||||
version = "1.23.4";
|
||||
version = "1.23.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CastagnaIT";
|
||||
repo = namespace;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-yq5XNhKQSBh7r/2apHXLMjhovV6xhL9DcDwXn9nt0KQ=";
|
||||
hash = "sha256-IIRut99AH08Z3udTkzUf2wz7dQMA94dOnfROm7iM9RM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -39,13 +39,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "86Box";
|
||||
version = "4.2.1";
|
||||
version = "5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "86Box";
|
||||
repo = "86Box";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ue5Coy2MpP7Iwl81KJPQPC7eD53/Db5a0PGIR+DdPYI=";
|
||||
hash = "sha256-vuVaV87BHgqiEDyaRqiqqT1AuBuPSMHs0d+/mT4cEuk=";
|
||||
};
|
||||
|
||||
patches = [ ./darwin.patch ];
|
||||
@@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "86Box";
|
||||
repo = "roms";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-p3djn950mTUIchFCEg56JbJtIsUuxmqRdYFRl50kI5Y=";
|
||||
hash = "sha256-bMCmDAdGTkO3BuU0EBC1svulZYP3tPqWBELbXwV0KO8=";
|
||||
};
|
||||
updateScript = ./update.sh;
|
||||
};
|
||||
|
||||
@@ -0,0 +1,124 @@
|
||||
diff --git a/aab/builder.py b/aab/builder.py
|
||||
index 5c3805c..7dfe595 100644
|
||||
--- a/aab/builder.py
|
||||
+++ b/aab/builder.py
|
||||
@@ -77,7 +77,7 @@ class AddonBuilder:
|
||||
self._config = Config()
|
||||
self._path_dist_module = PATH_DIST / "src" / self._config["module_name"]
|
||||
|
||||
- def build(self, qt_versions: List[QtVersion], disttype="local", pyenv=None):
|
||||
+ def build(self, qt_versions: List[QtVersion], disttype="local", pyenv=None, modtime=None):
|
||||
logging.info(
|
||||
"\n--- Building %s %s for %s ---\n",
|
||||
self._config["display_name"],
|
||||
@@ -86,7 +86,7 @@ class AddonBuilder:
|
||||
)
|
||||
|
||||
self.create_dist()
|
||||
- self.build_dist(qt_versions=qt_versions, disttype=disttype, pyenv=pyenv)
|
||||
+ self.build_dist(qt_versions=qt_versions, disttype=disttype, pyenv=pyenv, modtime=modtime)
|
||||
|
||||
return self.package_dist(qt_versions=qt_versions, disttype=disttype)
|
||||
|
||||
@@ -102,7 +102,7 @@ class AddonBuilder:
|
||||
PATH_DIST.mkdir(parents=True)
|
||||
Git().archive(self._version, PATH_DIST)
|
||||
|
||||
- def build_dist(self, qt_versions: List[QtVersion], disttype="local", pyenv=None):
|
||||
+ def build_dist(self, qt_versions: List[QtVersion], disttype="local", pyenv=None, modtime=None):
|
||||
self._copy_licenses()
|
||||
if self._path_changelog.exists():
|
||||
self._copy_changelog()
|
||||
@@ -111,7 +111,7 @@ class AddonBuilder:
|
||||
if self._callback_archive:
|
||||
self._callback_archive()
|
||||
|
||||
- self._write_manifest(disttype)
|
||||
+ self._write_manifest(disttype, modtime=modtime)
|
||||
|
||||
ui_builder = UIBuilder(dist=PATH_DIST, config=self._config)
|
||||
|
||||
@@ -162,12 +162,13 @@ class AddonBuilder:
|
||||
|
||||
return out_path
|
||||
|
||||
- def _write_manifest(self, disttype):
|
||||
+ def _write_manifest(self, disttype, modtime=None):
|
||||
ManifestUtils.generate_and_write_manifest(
|
||||
addon_properties=self._config,
|
||||
version=self._version,
|
||||
dist_type=disttype,
|
||||
target_dir=self._path_dist_module,
|
||||
+ modtime=modtime,
|
||||
)
|
||||
|
||||
def _copy_licenses(self):
|
||||
diff --git a/aab/cli.py b/aab/cli.py
|
||||
index 2ce6425..0956e98 100644
|
||||
--- a/aab/cli.py
|
||||
+++ b/aab/cli.py
|
||||
@@ -89,7 +89,7 @@ def build(args):
|
||||
total = len(dists)
|
||||
for dist in dists:
|
||||
logging.info("\n=== Build task %s/%s ===", cnt, total)
|
||||
- builder.build(qt_versions=qt_versions, disttype=dist)
|
||||
+ builder.build(qt_versions=qt_versions, disttype=dist, modtime=args.modtime)
|
||||
cnt += 1
|
||||
|
||||
|
||||
@@ -146,7 +146,7 @@ def build_dist(args):
|
||||
total = len(dists)
|
||||
for dist in dists:
|
||||
logging.info("\n=== Build task %s/%s ===", cnt, total)
|
||||
- builder.build_dist(qt_versions=qt_versions, disttype=dist)
|
||||
+ builder.build_dist(qt_versions=qt_versions, disttype=dist, modtime=args.modtime)
|
||||
cnt += 1
|
||||
|
||||
|
||||
@@ -204,6 +204,12 @@ def construct_parser():
|
||||
default="local",
|
||||
choices=["local", "ankiweb", "all"],
|
||||
)
|
||||
+ dist_parent.add_argument(
|
||||
+ "--modtime",
|
||||
+ help="Last modified timestamp",
|
||||
+ type=int,
|
||||
+ required=False,
|
||||
+ )
|
||||
|
||||
build_parent = argparse.ArgumentParser(add_help=False)
|
||||
build_parent.add_argument(
|
||||
diff --git a/aab/manifest.py b/aab/manifest.py
|
||||
index fc0038d..355e370 100644
|
||||
--- a/aab/manifest.py
|
||||
+++ b/aab/manifest.py
|
||||
@@ -49,10 +49,11 @@ class ManifestUtils:
|
||||
version: str,
|
||||
dist_type: DistType,
|
||||
target_dir: Path,
|
||||
+ modtime=None,
|
||||
):
|
||||
logging.info("Writing manifest...")
|
||||
manifest = cls.generate_manifest_from_properties(
|
||||
- addon_properties=addon_properties, version=version, dist_type=dist_type
|
||||
+ addon_properties=addon_properties, version=version, dist_type=dist_type, modtime=modtime
|
||||
)
|
||||
cls.write_manifest(manifest=manifest, target_dir=target_dir)
|
||||
|
||||
@@ -62,6 +63,7 @@ class ManifestUtils:
|
||||
addon_properties: Config,
|
||||
version: str,
|
||||
dist_type: DistType,
|
||||
+ modtime=None,
|
||||
) -> Dict[str, Any]:
|
||||
manifest = {
|
||||
"name": addon_properties["display_name"],
|
||||
@@ -71,7 +73,7 @@ class ManifestUtils:
|
||||
"version": version,
|
||||
"homepage": addon_properties.get("homepage", ""),
|
||||
"conflicts": deepcopy(addon_properties["conflicts"]),
|
||||
- "mod": Git().modtime(version),
|
||||
+ "mod": modtime if modtime is not None else Git().modtime(version),
|
||||
}
|
||||
|
||||
# Add version specifiers:
|
||||
@@ -0,0 +1,75 @@
|
||||
diff --git a/tests/test_legacy.py b/tests/test_legacy.py
|
||||
index 33790b9..0577262 100644
|
||||
--- a/tests/test_legacy.py
|
||||
+++ b/tests/test_legacy.py
|
||||
@@ -101,8 +101,8 @@ gui/
|
||||
sample-project/
|
||||
icons/
|
||||
coffee.svg
|
||||
- heart.svg
|
||||
email.svg
|
||||
+ heart.svg
|
||||
help.svg\
|
||||
"""
|
||||
|
||||
diff --git a/tests/test_ui.py b/tests/test_ui.py
|
||||
index 0774672..3764fda 100644
|
||||
--- a/tests/test_ui.py
|
||||
+++ b/tests/test_ui.py
|
||||
@@ -60,22 +60,22 @@ def test_ui_builder(tmp_path: Path):
|
||||
|
||||
expected_file_structure = """\
|
||||
gui/
|
||||
+ forms/
|
||||
+ __init__.py
|
||||
+ qt5/
|
||||
+ __init__.py
|
||||
+ dialog.py
|
||||
+ qt6/
|
||||
+ __init__.py
|
||||
+ dialog.py
|
||||
resources/
|
||||
__init__.py
|
||||
sample-project/
|
||||
icons/
|
||||
coffee.svg
|
||||
- heart.svg
|
||||
email.svg
|
||||
- help.svg
|
||||
- forms/
|
||||
- __init__.py
|
||||
- qt6/
|
||||
- __init__.py
|
||||
- dialog.py
|
||||
- qt5/
|
||||
- __init__.py
|
||||
- dialog.py\
|
||||
+ heart.svg
|
||||
+ help.svg\
|
||||
"""
|
||||
|
||||
config = Config(test_project_root / "addon.json")
|
||||
@@ -136,8 +136,8 @@ gui/
|
||||
sample-project/
|
||||
icons/
|
||||
coffee.svg
|
||||
- heart.svg
|
||||
email.svg
|
||||
+ heart.svg
|
||||
help.svg\
|
||||
"""
|
||||
|
||||
diff --git a/tests/util.py b/tests/util.py
|
||||
index a682bcd..a4aa7de 100644
|
||||
--- a/tests/util.py
|
||||
+++ b/tests/util.py
|
||||
@@ -40,6 +40,9 @@ def list_files(startpath: Path):
|
||||
ret = []
|
||||
|
||||
for root, dirs, files in os.walk(path):
|
||||
+ dirs.sort()
|
||||
+ files.sort()
|
||||
+
|
||||
level = root.replace(path, "").count(os.sep)
|
||||
indent = " " * 4 * (level)
|
||||
ret.append("{}{}/".format(indent, os.path.basename(root)))
|
||||
@@ -0,0 +1,14 @@
|
||||
diff --git a/aab/builder.py b/aab/builder.py
|
||||
index 5c3805c..a181b27 100644
|
||||
--- a/aab/builder.py
|
||||
+++ b/aab/builder.py
|
||||
@@ -67,8 +67,7 @@ class AddonBuilder:
|
||||
self._version = Git().parse_version(version)
|
||||
# git stash create comes up empty when no changes were made since the
|
||||
# last commit. Don't use 'dev' as version in these cases.
|
||||
- git_status = call_shell("git status --porcelain")
|
||||
- if self._version == "dev" and git_status == "":
|
||||
+ if self._version == "dev" and call_shell("git status --porcelain") == "":
|
||||
self._version = Git().parse_version("current")
|
||||
if not self._version:
|
||||
logging.error("Error: Version could not be determined through Git")
|
||||
@@ -0,0 +1,48 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
python3,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "aab";
|
||||
version = "1.0.0-dev.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "glutanimate";
|
||||
repo = "anki-addon-builder";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-92Xqxgb9MLhSIa5EN3Rdk4aJlRfzEWqKmXFe604Q354=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./fix-flaky-tests.patch
|
||||
./only-call-git-when-necessary.patch
|
||||
./allow-manually-setting-modtime.patch
|
||||
];
|
||||
|
||||
build-system = [ python3.pkgs.poetry-core ];
|
||||
|
||||
dependencies = with python3.pkgs; [
|
||||
jsonschema
|
||||
whichcraft
|
||||
pyqt5
|
||||
pyqt6
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
python3.pkgs.pytestCheckHook
|
||||
python3.pkgs.pyqt5
|
||||
python3.pkgs.pyqt6
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "aab" ];
|
||||
|
||||
meta = {
|
||||
description = "Build tool for Anki add-ons";
|
||||
homepage = "https://github.com/glutanimate/anki-addon-builder";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [ eljamm ];
|
||||
};
|
||||
}
|
||||
@@ -24,16 +24,16 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "age-plugin-fido2-hmac";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "olastor";
|
||||
repo = "age-plugin-fido2-hmac";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-DQVNUvKUyx1MUpWy5TeL1FYM5s8eeoNnNjKYozVgAxE=";
|
||||
hash = "sha256-f/Ld4bc+AWLkuVbL0zKEJNVqA8qJeRP/zF3jyHs3CQg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-/H4zHfaRw2EqV8p57Y1Lgb2N1VXBucetvl7mJ6Jdu/8=";
|
||||
vendorHash = "sha256-pWa0PWBy32eIayKwB6Y6TeEBMt/GXpFzWJANUvvTie8=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "arc-browser";
|
||||
version = "1.106.0-66192";
|
||||
version = "1.109.0-67185";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg";
|
||||
hash = "sha256-AlM0wJ/2okrxw2ZpMPodlSVQaMMkBPf5iIN4bnMTaME=";
|
||||
hash = "sha256-zVErRSKMd5xhIB5fyawBNEatenHnm+q7VLAE78PLkmY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ undmg ];
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cimg";
|
||||
version = "3.5.5";
|
||||
version = "3.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GreycLab";
|
||||
repo = "CImg";
|
||||
tag = "v.${finalAttrs.version}";
|
||||
hash = "sha256-vVRdSjrSCprhxraLzZ531zIYXsqbnnxOcoawJddwvgY=";
|
||||
hash = "sha256-j4WYdLQvNZAMb+16zO4M24CNKJFTITN9VXa1jFKduOk=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -16,6 +16,10 @@ buildGoModule rec {
|
||||
hash = "sha256-r11HNRXnmTC1CJR871sX7xW9ts9KAu1+azwIwXH09qg=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/cli $out/bin/docker-color-output
|
||||
'';
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dool";
|
||||
version = "1.3.4";
|
||||
version = "1.3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scottchiefbaker";
|
||||
repo = "dool";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-eyWt8gWPGiU8YavX8KT018upSB6xg8eAyRZ84snrvoY=";
|
||||
hash = "sha256-4q57MIQBnXm1zfOXQyIec/T9HWDtX7nZWYMJa4YkSS8=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -32,6 +32,5 @@ stdenv.mkDerivation {
|
||||
mainProgram = "bcc";
|
||||
homepage = "https://github.com/wormt/bcc";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ertes ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -27,14 +27,14 @@ assert (svgSupport && svgBackend == "nanosvg") -> enableCairo;
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fuzzel";
|
||||
version = "1.12.0";
|
||||
version = "1.13.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "dnkl";
|
||||
repo = "fuzzel";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-42a8VF4EUTbyEKcfVSIbTXmPC55+cLq7FX+lRDZKXEM=";
|
||||
hash = "sha256-sZycvHoKn9i+360XxDOEhieLEeicSiAqWVUJFb/VK4Y=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gat";
|
||||
version = "0.25.0";
|
||||
version = "0.25.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "koki-develop";
|
||||
repo = "gat";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-be6pV8e1Grw7HSvGrJN4ukCpI+Xu4nKN+ITtb+saVgw=";
|
||||
hash = "sha256-DgIAAlA7rhMvTovmIZOsJ7KoXizGZXT2GRkTnxOh7L0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-AaDFeDZMMDrIRqYFR+b4nrmLf13KUMEEE1zUHpVQxTg=";
|
||||
vendorHash = "sha256-Aq+wcBeYpKWwXgGUZbAqT0zm1Bri7Df3rt7ycwy060o=";
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-compute-runtime";
|
||||
version = "25.27.34303.6";
|
||||
version = "25.31.34666.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "compute-runtime";
|
||||
tag = version;
|
||||
hash = "sha256-AgdPhEAg9N15lNfcX/zQLxBUDTzEEvph+y0FYbB6iCs=";
|
||||
hash = "sha256-eijW4VYKUbiC7izaocadIxFvdZ3neaM3dewPnQDCLYc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "level-zero";
|
||||
version = "1.22.4";
|
||||
version = "1.24.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oneapi-src";
|
||||
repo = "level-zero";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-9MZcxpRyr0YMLHKTgxqJnm72rAYLkTdrn7Egky8mM48=";
|
||||
hash = "sha256-mDVq8wUkCvXHTqW4niYB1JIZIQQNpHTmhPu3Ydy6IyQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcerf";
|
||||
version = "3.0";
|
||||
version = "3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://jugit.fz-juelich.de/mlz/libcerf/-/archive/v${version}/libcerf-v${version}.tar.gz";
|
||||
sha256 = "sha256-xhCPvaia839YgRnAxUK2wegkhFo2vqL6MfftLMGiRts=";
|
||||
sha256 = "sha256-TAfiqOK00OTUjbng/JGRtDoOEg5XfVXYfibe6HRcb6s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,64 +0,0 @@
|
||||
From a09babb0cd9dd532ad2de920a2a35aa03d740dc6 Mon Sep 17 00:00:00 2001
|
||||
From: Herwig Hochleitner <herwig@bendlas.net>
|
||||
Date: Thu, 8 Aug 2024 00:29:14 +0200
|
||||
Subject: [PATCH] parameterize frontend location
|
||||
|
||||
---
|
||||
server/src/infra/tcp_server.rs | 14 +++++++-------
|
||||
1 file changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/server/src/infra/tcp_server.rs b/server/src/infra/tcp_server.rs
|
||||
index fa5f11f..16e64c5 100644
|
||||
--- a/server/src/infra/tcp_server.rs
|
||||
+++ b/server/src/infra/tcp_server.rs
|
||||
@@ -25,7 +25,7 @@ use std::sync::RwLock;
|
||||
use tracing::info;
|
||||
|
||||
async fn index<Backend>(data: web::Data<AppState<Backend>>) -> actix_web::Result<impl Responder> {
|
||||
- let mut file = std::fs::read_to_string(r"./app/index.html")?;
|
||||
+ let mut file = std::fs::read_to_string(r"@frontend@/index.html")?;
|
||||
|
||||
if data.server_url.path() != "/" {
|
||||
file = file.replace(
|
||||
@@ -80,7 +80,7 @@ pub(crate) fn error_to_http_response(error: TcpError) -> HttpResponse {
|
||||
async fn main_js_handler<Backend>(
|
||||
data: web::Data<AppState<Backend>>,
|
||||
) -> actix_web::Result<impl Responder> {
|
||||
- let mut file = std::fs::read_to_string(r"./app/static/main.js")?;
|
||||
+ let mut file = std::fs::read_to_string(r"@frontend@/static/main.js")?;
|
||||
|
||||
if data.server_url.path() != "/" {
|
||||
file = file.replace("/pkg/", format!("{}/pkg/", data.server_url.path()).as_str());
|
||||
@@ -92,12 +92,12 @@ async fn main_js_handler<Backend>(
|
||||
}
|
||||
|
||||
async fn wasm_handler() -> actix_web::Result<impl Responder> {
|
||||
- Ok(actix_files::NamedFile::open_async("./app/pkg/lldap_app_bg.wasm").await?)
|
||||
+ Ok(actix_files::NamedFile::open_async("@frontend@/pkg/lldap_app_bg.wasm").await?)
|
||||
}
|
||||
|
||||
async fn wasm_handler_compressed() -> actix_web::Result<impl Responder> {
|
||||
Ok(
|
||||
- actix_files::NamedFile::open_async("./app/pkg/lldap_app_bg.wasm.gz")
|
||||
+ actix_files::NamedFile::open_async("@frontend@/pkg/lldap_app_bg.wasm.gz")
|
||||
.await?
|
||||
.customize()
|
||||
.insert_header(header::ContentEncoding::Gzip)
|
||||
@@ -143,11 +143,11 @@ fn http_config<Backend>(
|
||||
.service(web::resource("/pkg/lldap_app_bg.wasm").route(web::route().to(wasm_handler)))
|
||||
.service(web::resource("/static/main.js").route(web::route().to(main_js_handler::<Backend>)))
|
||||
// Serve the /pkg path with the compiled WASM app.
|
||||
- .service(Files::new("/pkg", "./app/pkg"))
|
||||
+ .service(Files::new("/pkg", "@frontend@/pkg"))
|
||||
// Serve static files
|
||||
- .service(Files::new("/static", "./app/static"))
|
||||
+ .service(Files::new("/static", "@frontend@/static"))
|
||||
// Serve static fonts
|
||||
- .service(Files::new("/static/fonts", "./app/static/fonts"))
|
||||
+ .service(Files::new("/static/fonts", "@frontend@/static/fonts"))
|
||||
// Default to serve index.html for unknown routes, to support routing.
|
||||
.default_service(web::route().guard(guard::Get()).to(index::<Backend>));
|
||||
}
|
||||
--
|
||||
2.45.2
|
||||
|
||||
@@ -3,29 +3,30 @@
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
lldap,
|
||||
makeWrapper,
|
||||
nixosTests,
|
||||
rustPlatform,
|
||||
rustc,
|
||||
wasm-bindgen-cli_0_2_95,
|
||||
wasm-bindgen-cli_0_2_100,
|
||||
wasm-pack,
|
||||
which,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.6.2";
|
||||
|
||||
commonDerivationAttrs = rec {
|
||||
commonDerivationAttrs = {
|
||||
pname = "lldap";
|
||||
version = "0.6.1";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lldap";
|
||||
repo = "lldap";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-iQ+Vv9kx/pWHoa/WZChBK+FD2r1avzWWz57bnnzRjUg=";
|
||||
hash = "sha256-UBQWOrHika8X24tYdFfY8ETPh9zvI7/HV5j4aK8Uq+Y=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-qXYgr9uRswuo9hwVROUX9KUKpkzR0VEcXImbdyOgxsY=";
|
||||
|
||||
cargoHash = "sha256-SO7+HiiXNB/KF3fjzSMeiTPjRQq/unEfsnplx4kZv9c=";
|
||||
};
|
||||
|
||||
frontend = rustPlatform.buildRustPackage (
|
||||
@@ -35,7 +36,7 @@ let
|
||||
|
||||
nativeBuildInputs = [
|
||||
wasm-pack
|
||||
wasm-bindgen-cli_0_2_95
|
||||
wasm-bindgen-cli_0_2_100
|
||||
binaryen
|
||||
which
|
||||
rustc
|
||||
@@ -68,12 +69,10 @@ rustPlatform.buildRustPackage (
|
||||
"lldap_set_password"
|
||||
];
|
||||
|
||||
patches = [
|
||||
./0001-parameterize-frontend-location.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace server/src/infra/tcp_server.rs --subst-var-by frontend '${frontend}'
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/lldap \
|
||||
--set LLDAP_ASSETS_PATH ${frontend}
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
@@ -89,7 +88,10 @@ rustPlatform.buildRustPackage (
|
||||
changelog = "https://github.com/lldap/lldap/blob/v${lldap.version}/CHANGELOG.md";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ bendlas ];
|
||||
maintainers = with maintainers; [
|
||||
bendlas
|
||||
ibizaman
|
||||
];
|
||||
mainProgram = "lldap";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -15,11 +15,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "log4cxx";
|
||||
version = "1.2.0";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/logging/log4cxx/${version}/apache-${pname}-${version}.tar.gz";
|
||||
hash = "sha256-CfR0iqVnXvXAdwvtv14ASIZokzxak1pDrFuFviQ2xIo=";
|
||||
hash = "sha256-qiP0fDFkqiz4SMIli0tLw3Lnlk1KPtR8K0pKkVxd+jc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "matrix-synapse-mjolnir-antispam";
|
||||
version = "1.10.0";
|
||||
version = "1.11.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-org";
|
||||
repo = "mjolnir";
|
||||
tag = "v${version}";
|
||||
sha256 = "sha256-xc/vrBL1rqgB69NqkEmUg7YMX4EZRFrRNPrWA7euaXU=";
|
||||
sha256 = "sha256-+MdPJz9QEiohWZZXvGdfR6NeLS5jyHUifD6LSZbFfvs=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/synapse_antispam";
|
||||
|
||||
@@ -31,11 +31,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nano";
|
||||
version = "8.5";
|
||||
version = "8.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/nano/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-AAsBHTOcFBr5ZG1DKI9UMl/1xujTnW5IK3h7vGZUwmo=";
|
||||
hash = "sha256-96v78O7V9XOrUb13pFjzLYL5hZxV6WifgZ2W/hQ3phk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ texinfo ] ++ lib.optional enableNls gettext;
|
||||
|
||||
@@ -22,11 +22,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "NetworkManager-openvpn";
|
||||
version = "1.12.0";
|
||||
version = "1.12.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/NetworkManager-openvpn/${lib.versions.majorMinor finalAttrs.version}/NetworkManager-openvpn-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "kD/UwK69KqescMnYwr7Y35ImVdItdkUUQDVmrom36IY=";
|
||||
sha256 = "qhtfmt341kvIxFk2HPDV4+uZ8Utg6oKjUAYxkor2Km8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
let
|
||||
bits = if stdenv.hostPlatform.is64bit then "x64" else "ia32";
|
||||
version = "0.102.0";
|
||||
version = "0.102.1";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "nwjs-ffmpeg-prebuilt";
|
||||
@@ -16,8 +16,8 @@ stdenv.mkDerivation {
|
||||
src =
|
||||
let
|
||||
hashes = {
|
||||
"x64" = "sha256-o9Xso1bRRfGJhf0cfWS1sS6FNugl1bbI27Jzn1YXqNw=";
|
||||
"ia32" = "sha256-o9Xso1bRRfGJhf0cfWS1sS6FNugl1bbI27Jzn1YXqNw=";
|
||||
"x64" = "sha256-n+HvcOg3QieUu/2Ezc+rk80XceionHjIE+xAH/MkoAc=";
|
||||
"ia32" = "sha256-n+HvcOg3QieUu/2Ezc+rk80XceionHjIE+xAH/MkoAc=";
|
||||
};
|
||||
in
|
||||
fetchurl {
|
||||
|
||||
@@ -29,13 +29,13 @@
|
||||
xorg,
|
||||
}:
|
||||
let
|
||||
version = "2.18.1";
|
||||
version = "2.18.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paperless-ngx";
|
||||
repo = "paperless-ngx";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-POHF00cV8pl6i1rcwxtZ+Q1AlLybDj6gSlL0lPwSSCo=";
|
||||
hash = "sha256-JaDeOiubu9VE8E/u2K9BS7GLNSTqXTcX926WhPMGd64=";
|
||||
};
|
||||
|
||||
python = python3.override {
|
||||
@@ -168,16 +168,8 @@ python.pkgs.buildPythonApplication rec {
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"django"
|
||||
"django-allauth"
|
||||
"django-auditlog"
|
||||
"django-guardian"
|
||||
"django-multiselectfield"
|
||||
"imap-tools"
|
||||
"pathvalidate"
|
||||
"redis"
|
||||
"scikit-learn"
|
||||
"tika-client"
|
||||
];
|
||||
|
||||
dependencies =
|
||||
|
||||
@@ -78,7 +78,6 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
downloadPage = "http://pari.math.u-bordeaux.fr/download.html";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ ertes ];
|
||||
teams = [ teams.sage ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
mainProgram = "gp";
|
||||
|
||||
@@ -131,7 +131,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/yshui/picom";
|
||||
mainProgram = "picom";
|
||||
maintainers = with lib.maintainers; [
|
||||
ertes
|
||||
gepbird
|
||||
thiagokokada
|
||||
twey
|
||||
|
||||
@@ -30,18 +30,18 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pipeline";
|
||||
version = "2.6.1";
|
||||
version = "3.0.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "schmiddi-on-mobile";
|
||||
repo = "pipeline";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-0g8J65dQoxOmdDdZHn7O1FB8fL2EdfuhbFO1VG0UCtE=";
|
||||
hash = "sha256-AF34En1MKlwyOd4zKQjGAeb/c6ElJipreBTCJhbbJuI=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-c9bjAc6ozCJ1l+SeR9LoQmk/wKQEXAZy0+c1+vGoE9U=";
|
||||
hash = "sha256-oO0c6DMmEmeP7Q2LoTDTNeEHUgRT0c3cJnZBVo2cX1U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
Generated
-168
@@ -29,66 +29,6 @@
|
||||
"hash": "sha256-WnXjX2pGroKn+KukCgPeUUZAkz2S6CdMrCc9P2VcBDQ=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/messagepack.annotations/2.5.198/messagepack.annotations.2.5.198.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.App.Ref",
|
||||
"version": "8.0.17",
|
||||
"hash": "sha256-NNGXfUV5RVt1VqLI99NlHoBkt2Vv/Hg3TAHzm8nGM8M=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.ref/8.0.17/microsoft.aspnetcore.app.ref.8.0.17.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.App.Ref",
|
||||
"version": "9.0.6",
|
||||
"hash": "sha256-5lyWeyUruj1azKGhUa09h7CrKQFKG/eeKFER2X4RxO8=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.ref/9.0.6/microsoft.aspnetcore.app.ref.9.0.6.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64",
|
||||
"version": "8.0.17",
|
||||
"hash": "sha256-Eunz3nZF5r8a9nqwdeorQPgqd5G+Z4ddofMeAk6VmnA=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-arm64/8.0.17/microsoft.aspnetcore.app.runtime.linux-arm64.8.0.17.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64",
|
||||
"version": "9.0.6",
|
||||
"hash": "sha256-OYGCWHvZCYDdgJK2IL0pePsOOTgq6y0rQt5gDJedv2s=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-arm64/9.0.6/microsoft.aspnetcore.app.runtime.linux-arm64.9.0.6.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.App.Runtime.linux-x64",
|
||||
"version": "8.0.17",
|
||||
"hash": "sha256-SWdah72tC5i2CQL4mRUYfHC0Kh8+C2jiskIIeC74smY=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-x64/8.0.17/microsoft.aspnetcore.app.runtime.linux-x64.8.0.17.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.App.Runtime.linux-x64",
|
||||
"version": "9.0.6",
|
||||
"hash": "sha256-q0dK5La8B+fxo2Qtz9TA+KFTDW3/6+Y1XtsGF3H9TJY=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-x64/9.0.6/microsoft.aspnetcore.app.runtime.linux-x64.9.0.6.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.App.Runtime.osx-arm64",
|
||||
"version": "8.0.17",
|
||||
"hash": "sha256-y55EGfQ2FzrY2X5+Ne5N3dqi5WNHkFTGVW1hEMrh6OI=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-arm64/8.0.17/microsoft.aspnetcore.app.runtime.osx-arm64.8.0.17.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.App.Runtime.osx-arm64",
|
||||
"version": "9.0.6",
|
||||
"hash": "sha256-xZrp6yT2GYYazdzwXJ+54/j0jbrso94/bgBGeSgEA+I=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-arm64/9.0.6/microsoft.aspnetcore.app.runtime.osx-arm64.9.0.6.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.App.Runtime.osx-x64",
|
||||
"version": "8.0.17",
|
||||
"hash": "sha256-uRCCNPevPemvKIuUxy/VtQlgskChbiAauMWVK/xhoc0=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-x64/8.0.17/microsoft.aspnetcore.app.runtime.osx-x64.8.0.17.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.App.Runtime.osx-x64",
|
||||
"version": "9.0.6",
|
||||
"hash": "sha256-0L5HMCXRf7qkj0yuAGlt3ZWrXVAKzEfnRzi+cX+heEQ=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-x64/9.0.6/microsoft.aspnetcore.app.runtime.osx-x64.9.0.6.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Bcl.AsyncInterfaces",
|
||||
"version": "9.0.0",
|
||||
@@ -293,114 +233,6 @@
|
||||
"hash": "sha256-H2Qw8x47WyFOd/VmgRmGMc+uXySgUv68UISgK8Frsjw=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.6.3/microsoft.net.stringtools.17.6.3.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.App.Host.linux-arm64",
|
||||
"version": "8.0.17",
|
||||
"hash": "sha256-pzOqFCd+UrIXmWGDfds5GxkI+Asjx30yFtLIuHFu/h4=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-arm64/8.0.17/microsoft.netcore.app.host.linux-arm64.8.0.17.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.App.Host.linux-arm64",
|
||||
"version": "9.0.6",
|
||||
"hash": "sha256-c03NdUDlM2oM0MBOTLsYhRfS64teVXfue3SNSza2gJI=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-arm64/9.0.6/microsoft.netcore.app.host.linux-arm64.9.0.6.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.App.Host.linux-x64",
|
||||
"version": "8.0.17",
|
||||
"hash": "sha256-AGnEGHcO2hfvChG3xEGOTA6dX4MiYPB7FoBkmWz3dc8=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/8.0.17/microsoft.netcore.app.host.linux-x64.8.0.17.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.App.Host.linux-x64",
|
||||
"version": "9.0.6",
|
||||
"hash": "sha256-OQwudVyZi+SeLpiNzxpkxVjNZSs0kq4GG10zF3TERS8=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/9.0.6/microsoft.netcore.app.host.linux-x64.9.0.6.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.App.Host.osx-arm64",
|
||||
"version": "8.0.17",
|
||||
"hash": "sha256-fpMzkOWaA3OFNtHsqOk9s9xKVrcrqOyKHxE7jk8hebg=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.osx-arm64/8.0.17/microsoft.netcore.app.host.osx-arm64.8.0.17.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.App.Host.osx-arm64",
|
||||
"version": "9.0.6",
|
||||
"hash": "sha256-mkLxg2k2NH64SPJ87pgKdYMYXQa7nGbSVf/yfNX3s+g=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.osx-arm64/9.0.6/microsoft.netcore.app.host.osx-arm64.9.0.6.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.App.Host.osx-x64",
|
||||
"version": "8.0.17",
|
||||
"hash": "sha256-Hrn01x+S+gnGEEHhr6mN6bPyqVAhp5u3CqgWwQbh4To=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.osx-x64/8.0.17/microsoft.netcore.app.host.osx-x64.8.0.17.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.App.Host.osx-x64",
|
||||
"version": "9.0.6",
|
||||
"hash": "sha256-NRrb7WQPpZqarH7OTsBZWroNrBCS6sMdiGm2wlqqXNw=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.osx-x64/9.0.6/microsoft.netcore.app.host.osx-x64.9.0.6.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.App.Ref",
|
||||
"version": "8.0.17",
|
||||
"hash": "sha256-tKawpjkMjV0ysNIWWrgHTiLxncZJDRNiDkQBwl255l4=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.ref/8.0.17/microsoft.netcore.app.ref.8.0.17.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.App.Ref",
|
||||
"version": "9.0.6",
|
||||
"hash": "sha256-pSDW5VBIA11bwuZv8klq4+P+X6jFwZqu9JR1M1aUT9k=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.ref/9.0.6/microsoft.netcore.app.ref.9.0.6.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.App.Runtime.linux-arm64",
|
||||
"version": "8.0.17",
|
||||
"hash": "sha256-FutphE4bEjd8s6ZqpFXrD1zuCDkNCJ7Vnl0pBm86HBA=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-arm64/8.0.17/microsoft.netcore.app.runtime.linux-arm64.8.0.17.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.App.Runtime.linux-arm64",
|
||||
"version": "9.0.6",
|
||||
"hash": "sha256-+SEo4lrzGnLk1+jJQeJeYS7PJxDID/N1WH6snfsRGAI=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-arm64/9.0.6/microsoft.netcore.app.runtime.linux-arm64.9.0.6.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.App.Runtime.linux-x64",
|
||||
"version": "8.0.17",
|
||||
"hash": "sha256-6YVEXiJ3b2gZAYri8iSRBdi/J+0DEl7FcwBX6h1Unkg=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-x64/8.0.17/microsoft.netcore.app.runtime.linux-x64.8.0.17.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.App.Runtime.linux-x64",
|
||||
"version": "9.0.6",
|
||||
"hash": "sha256-Y3VzFepVQghnvo6LWoeGnBAaWygy/eLJ8oLlnmRHjps=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-x64/9.0.6/microsoft.netcore.app.runtime.linux-x64.9.0.6.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.App.Runtime.osx-arm64",
|
||||
"version": "8.0.17",
|
||||
"hash": "sha256-J3dfDial8GHyKQMFuBNFtOMD/mOK58vjrK2ZtrYObZg=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.osx-arm64/8.0.17/microsoft.netcore.app.runtime.osx-arm64.8.0.17.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.App.Runtime.osx-arm64",
|
||||
"version": "9.0.6",
|
||||
"hash": "sha256-ZxAcTppjSDMaMaRXKX8C4BNg3d1Hy6xVt4AuPpPTxwI=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.osx-arm64/9.0.6/microsoft.netcore.app.runtime.osx-arm64.9.0.6.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.App.Runtime.osx-x64",
|
||||
"version": "8.0.17",
|
||||
"hash": "sha256-WnkJyhSBHMw/VtLHWy0AFwzzkbIC1YQugFuj3Adg+Ks=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.osx-x64/8.0.17/microsoft.netcore.app.runtime.osx-x64.8.0.17.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.App.Runtime.osx-x64",
|
||||
"version": "9.0.6",
|
||||
"hash": "sha256-3wCLKoYt6LeJwV14M1DkZspmjxTUdqsiRSJ96y3qMvk=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.osx-x64/9.0.6/microsoft.netcore.app.runtime.osx-x64.9.0.6.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.Platforms",
|
||||
"version": "5.0.0",
|
||||
|
||||
@@ -7,6 +7,9 @@
|
||||
testers,
|
||||
roslyn-ls,
|
||||
jq,
|
||||
writeText,
|
||||
runCommand,
|
||||
expect,
|
||||
}:
|
||||
let
|
||||
pname = "roslyn-ls";
|
||||
@@ -28,8 +31,26 @@ let
|
||||
rid = dotnetCorePackages.systemToDotnetRid stdenvNoCC.targetPlatform.system;
|
||||
|
||||
project = "Microsoft.CodeAnalysis.LanguageServer";
|
||||
|
||||
targets = writeText "versions.targets" ''
|
||||
<Project>
|
||||
<ItemGroup>
|
||||
<KnownFrameworkReference Update="@(KnownFrameworkReference)">
|
||||
<LatestRuntimeFrameworkVersion Condition="'%(TargetFramework)' == 'net8.0'">${dotnetCorePackages.sdk_8_0.runtime.version}</LatestRuntimeFrameworkVersion>
|
||||
<LatestRuntimeFrameworkVersion Condition="'%(TargetFramework)' == 'net9.0'">${dotnetCorePackages.sdk_9_0.runtime.version}</LatestRuntimeFrameworkVersion>
|
||||
<TargetingPackVersion Condition="'%(TargetFramework)' == 'net8.0'">${dotnetCorePackages.sdk_8_0.runtime.version}</TargetingPackVersion>
|
||||
<TargetingPackVersion Condition="'%(TargetFramework)' == 'net9.0'">${dotnetCorePackages.sdk_9_0.runtime.version}</TargetingPackVersion>
|
||||
</KnownFrameworkReference>
|
||||
<KnownAppHostPack Update="@(KnownAppHostPack)">
|
||||
<AppHostPackVersion Condition="'%(TargetFramework)' == 'net8.0'">${dotnetCorePackages.sdk_8_0.runtime.version}</AppHostPackVersion>
|
||||
<AppHostPackVersion Condition="'%(TargetFramework)' == 'net9.0'">${dotnetCorePackages.sdk_9_0.runtime.version}</AppHostPackVersion>
|
||||
</KnownAppHostPack>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
'';
|
||||
|
||||
in
|
||||
buildDotnetModule rec {
|
||||
buildDotnetModule (finalAttrs: rec {
|
||||
inherit pname dotnet-sdk dotnet-runtime;
|
||||
|
||||
vsVersion = "2.87.26";
|
||||
@@ -57,20 +78,23 @@ buildDotnetModule rec {
|
||||
# until made configurable/and or different location
|
||||
# https://github.com/dotnet/roslyn/issues/76892
|
||||
./cachedirectory.patch
|
||||
# Force download of apphost
|
||||
./runtimedownload.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Upstream uses rollForward = latestPatch, which pins to an *exact* .NET SDK version.
|
||||
jq '.sdk.rollForward = "latestMinor"' < global.json > global.json.tmp
|
||||
mv global.json.tmp global.json
|
||||
|
||||
substituteInPlace Directory.Build.targets \
|
||||
--replace-fail '</Project>' '<Import Project="${targets}" /></Project>'
|
||||
'';
|
||||
|
||||
dotnetFlags = [
|
||||
"-p:TargetRid=${rid}"
|
||||
# this removes the Microsoft.WindowsDesktop.App.Ref dependency
|
||||
"-p:EnableWindowsTargeting=false"
|
||||
# this is needed for the KnownAppHostPack changes to work
|
||||
"-p:EnableAppHostPackDownload=true"
|
||||
];
|
||||
|
||||
# two problems solved here:
|
||||
@@ -99,7 +123,43 @@ buildDotnetModule rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion { package = roslyn-ls; };
|
||||
tests =
|
||||
let
|
||||
with-sdk =
|
||||
sdk:
|
||||
runCommand "with-${if sdk ? version then sdk.version else "no"}-sdk"
|
||||
{
|
||||
nativeBuildInputs = [
|
||||
finalAttrs.finalPackage
|
||||
sdk
|
||||
expect
|
||||
];
|
||||
meta.timeout = 60;
|
||||
}
|
||||
''
|
||||
HOME=$TMPDIR
|
||||
expect <<"EOF"
|
||||
spawn ${meta.mainProgram} --stdio --logLevel Information --extensionLogDirectory log
|
||||
expect_before timeout {
|
||||
send_error "timeout!\n"
|
||||
exit 1
|
||||
}
|
||||
expect "Language server initialized"
|
||||
send \x04
|
||||
expect eof
|
||||
catch wait result
|
||||
exit [lindex $result 3]
|
||||
EOF
|
||||
touch $out
|
||||
'';
|
||||
in
|
||||
{
|
||||
# Make sure we can run with any supported SDK version, as well as without
|
||||
with-net9-sdk = with-sdk dotnetCorePackages.sdk_9_0;
|
||||
with-net10-sdk = with-sdk dotnetCorePackages.sdk_10_0;
|
||||
no-sdk = with-sdk null;
|
||||
version = testers.testVersion { package = finalAttrs.finalPackage; };
|
||||
};
|
||||
updateScript = ./update.sh;
|
||||
};
|
||||
|
||||
@@ -111,4 +171,4 @@ buildDotnetModule rec {
|
||||
maintainers = with lib.maintainers; [ konradmalik ];
|
||||
mainProgram = "Microsoft.CodeAnalysis.LanguageServer";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
diff --git a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj
|
||||
index c32f01a6695..b98bab44c4e 100644
|
||||
--- a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj
|
||||
+++ b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj
|
||||
@@ -54,8 +54,8 @@
|
||||
<RuntimeIdentifiers Condition="'$(TargetRid)' == '' and '$(PortableTargetRid)' == ''">win-x64;win-arm64;linux-x64;linux-arm64;linux-musl-x64;linux-musl-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
|
||||
|
||||
<!-- These indicate that the runtime/apphost packages should not be downloaded as part of build/restore -->
|
||||
- <EnableRuntimePackDownload>false</EnableRuntimePackDownload>
|
||||
- <EnableAppHostPackDownload>false</EnableAppHostPackDownload>
|
||||
+ <EnableRuntimePackDownload>true</EnableRuntimePackDownload>
|
||||
+ <EnableAppHostPackDownload>true</EnableAppHostPackDownload>
|
||||
|
||||
<!-- Publish ready to run executables when we're publishing platform specific executables. -->
|
||||
<PublishReadyToRun Condition="'$(RuntimeIdentifier)' != '' AND '$(Configuration)' == 'Release' ">true</PublishReadyToRun>
|
||||
@@ -19,13 +19,13 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sby";
|
||||
version = "0.55";
|
||||
version = "0.56";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "YosysHQ";
|
||||
repo = "sby";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Q02CLx8GYu7Rnngd03kRGstYVOm8mBl7JsP0bYOFtDg=";
|
||||
hash = "sha256-uKndGUoLbG7SBhsOSYyM/v9g33pq7zFFajzvTUYa7NY=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@@ -27,13 +27,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "shader-slang";
|
||||
version = "2025.12.1";
|
||||
version = "2025.14.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shader-slang";
|
||||
repo = "slang";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-5M/sKoCFVGW4VcOPzL8dVhTuo+esjINPXw76fnO7OEw=";
|
||||
hash = "sha256-tHLm0XmS5vV+o3VmFHWG8wZnrb0p63Nz1zVyvc/e5+s=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -114,13 +114,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# Handled by separateDebugInfo so we don't need special installation handling
|
||||
"-DSLANG_ENABLE_SPLIT_DEBUG_INFO=OFF"
|
||||
"-DSLANG_VERSION_FULL=v${finalAttrs.version}-nixpkgs"
|
||||
# slang-rhi tries to download WebGPU dawn binaries, and as stated on
|
||||
# https://github.com/shader-slang/slang-rhi is "under active refactoring
|
||||
# and development, and is not yet ready for general use."
|
||||
"-DSLANG_ENABLE_SLANG_RHI=OFF"
|
||||
"-DSLANG_USE_SYSTEM_MINIZ=ON"
|
||||
"-DSLANG_USE_SYSTEM_LZ4=ON"
|
||||
"-DSLANG_SLANG_LLVM_FLAVOR=${if withLLVM then "USE_SYSTEM_LLVM" else "DISABLE"}"
|
||||
# slang-rhi tries to download headers and precompiled binaries for these backends
|
||||
"-DSLANG_RHI_ENABLE_OPTIX=OFF"
|
||||
"-DSLANG_RHI_ENABLE_VULKAN=OFF"
|
||||
"-DSLANG_RHI_ENABLE_METAL=OFF"
|
||||
"-DSLANG_RHI_ENABLE_WGPU=OFF"
|
||||
]
|
||||
++ lib.optionals withGlslang [
|
||||
"-DSLANG_USE_SYSTEM_SPIRV_TOOLS=ON"
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "snx-rs";
|
||||
version = "4.5.0";
|
||||
version = "4.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ancwrd1";
|
||||
repo = "snx-rs";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-24zklkFczsp7fhvka3T3Nz3bL61Owyrs8eHt7F9CQM8=";
|
||||
hash = "sha256-KfN4lyBngatjk1e3DYabz+sruX/NjELg0psktMb8Pew=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec {
|
||||
versionCheckHook
|
||||
];
|
||||
|
||||
cargoHash = "sha256-uDQzUl1q6mlDzs5D3b1/Q53Sz//BFeJZrE88HfMrXIk=";
|
||||
cargoHash = "sha256-QMfQqy9VV3GF4ZWmzeWe+xGHYcvAxJUFg3QSCEMgS9E=";
|
||||
|
||||
doInstallCheck = true;
|
||||
versionCheckProgram = "${placeholder "out"}/bin/snx-rs";
|
||||
|
||||
@@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec {
|
||||
pname = "typos-lsp";
|
||||
# Please update the corresponding VSCode extension too.
|
||||
# See pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix
|
||||
version = "0.1.40";
|
||||
version = "0.1.41";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tekumara";
|
||||
repo = "typos-lsp";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-O8TikrjFpmZ7PX7KmnErMW3OE6BoAlSAeZGD9qOEfog=";
|
||||
hash = "sha256-DJnq0PtRGYRgC0JhR8myeIddBTAvP+Ey3+qEZi75EmQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-V6uYmnsbWuQc002hdDfc/B1mzrS7xu0xcR/6m2oxyMU=";
|
||||
cargoHash = "sha256-OSTPVLVLl3LaijEorcSSscOMiDfgIGRXSvaFMKJ+hq0=";
|
||||
|
||||
# fix for compilation on aarch64
|
||||
# see https://github.com/NixOS/nixpkgs/issues/145726
|
||||
|
||||
@@ -11,28 +11,28 @@ let
|
||||
commonPackages = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.AspNetCore.App.Ref";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-DF9lEJjcAAcQtFB9hLXHbQaLW82nb4xlG9MKfbqpZzIQfidqcAuE2GOug/q6NNDcw+N88J0p0jKPz+k3qKmAKw==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-ZedqhbGvDx8Ajn1N9SRKq4q/m7rIQdPmcvQS7WOaijpqqjNa4P4zTd1kx+/kb6a5FJ6thD6yt/hEADTGpUpflg==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.DotNetAppHost";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-SV9nyI2/sg7Rh3f01eDScmjKYuuzI6xPX+iknl2zsecspqYBlWcPN1SvMDlaD/sK3GG5jl3hrM/GcOIqMpoFJA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-OcQqR5UG3AFa0aQNIRTB3acRpQ+OhuF8ZpLIQM3xp+egvzzKRP20jja/gWhngIVtEA012XxLiNxJrHhzWhtLhQ==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Ref";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-npMO7GioGKn0FigriTOCsi4HgSENnW9YRJYXhyFtCGLR7b71FDLVY8nHemM0XYm9lI0tH23N1EwcDFyzHTDuNA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-1UT2fr9kFvdpRb3+h3dTmGTnhKTvGKpYFRQuZUD8ukmaQ9ABhnXp35E8GJoA6d6pOERiRnhimzrVg/X3B4znUA==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.DotNet.ILCompiler";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-zDr+tWvnlB9iEwnAlfa3PW/S1/0nw1lhvXBWghgE6o9O5sxc35V3aobPAs+Cm6DTN+lvNMouhjPt6pn2t4PvQQ==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-Eekoq6ATo+jeIsK0GafnGK8XkdjKtdOVT7deD1TWo04/nt0KV7nOmBUOhwUKY1sBsjvTQvOoDthn505f74N3Vg==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NET.ILLink.Tasks";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-W1yNC4+7vV1XPSXJx7HFsvFCi1C1XZ7QVlfbu+xq4pt1/0cVJGZaRlbwBNUAv4PAdg2JGM4VYtcr3ZreOJ1hzA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-pX4P7NG1jHIRJrbHrVP/MvDyA89o7HeuKucToiIH6flQ5ixTntZJupIW5qg2wsScJOltfP3A7j/w6MTRA9dHOQ==";
|
||||
})
|
||||
];
|
||||
|
||||
@@ -40,118 +40,118 @@ let
|
||||
linux-arm = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Crossgen2.linux-arm";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-IKe0SROzAWJiFZyh2KVmTU5i8ddcEqvr5NIr+3RfzvBEYa3SNBbqy1W1x0TR2aEvYgSqxKSohhs9YVSDlrlx0Q==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-ekrR6F7cC48jWc0+Fyv3emOc5bkuv+yvKg2ZDjuv9gRf6e8zWGG6PkXKkPuo8sxHacPucgc1bIibVgVGJi20VA==";
|
||||
})
|
||||
];
|
||||
linux-arm64 = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-5h33Uf2vFcjVkeNRD41YiERegQ7twv6sljYAMtz/kIHcIk90aB0ztZoKXXVi+vNxma7q/f5oPxhzUVidZ3vw8g==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-QUg7nZopW/0+Lnk4VeNHF3Ov3I6IuqsDSbvkeEDWjWyNXyOnJzDErKN3d5p6jWdmc3jjndyOw1137vaOKV5apA==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-yImkb4fnUJIXR2Me5N8eOrX7w9+u8SAAIp8QtlWdZ6WptjG6PUByTs2hjTfX/aVKjO4p1dmKTaWJ0qYR6yuDEQ==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-k9W3fq0DjcbjxuveOQd1ou8fsHhNH/zHayPE9b1VRj2CijLx8krGGKkP3gUR7jLbOE+o9/Xln7cEsWzRBb9tdg==";
|
||||
})
|
||||
];
|
||||
linux-x64 = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Crossgen2.linux-x64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-1FIBZLtWKIxULrRjLrldz6kwVSoAIf72kXKE0WgXECVez98NbQXLEM90hfpHj0LcQfzqOoP9kY48yRSoXp+rXg==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-+zsgGnlZS6MdL/uyvAQAN0KAc8Vk1qT8ylHCi+iwUXqwslSGtZQku+qGvkd7hjMMnEbnSa5j7xJY4PNGDbco4Q==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-eMokXhxbTVJUHwlAhM1dVZmjljs/s1nRfvrJ0AeJaTbetXnD63Fd6sQeMmw/EifYnpdtxr/gIJRHLPsuLNDcAA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-+LG/u+Jp6b3Oyud1QYP3nph1uqtx4rhPbeH65leIMSFQg6bB8Jd9g4hNwESllHd6iKpKP7Sp17VxLKynzxwHDw==";
|
||||
})
|
||||
];
|
||||
linux-musl-arm = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-qw5Xb2+l14q+2OSesjwGn3gHpdFj0wUeA3RLEUaljzW8FF5HD78B6t1YuhFJhcENuDNAv5d8Fcy4N1mG/RQZUw==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-BE7hZwP4oZ5Xacmhjwc3Ciy0KJKOXwg9NJiBVzFv7xEJ7IqVceP7kAdMPsMNoojwz2KNs9gJdCOGOLtwyeTZyw==";
|
||||
})
|
||||
];
|
||||
linux-musl-arm64 = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-Etq6qbPIzEV8Z3+w0C1ibreDduKkAF1zZOGfvcBz3sjAC9sWs/qflxfKGZ7tBKhEV/A3vZWKNGyxYKnawCtC3g==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-oskWoBpDhGI4WBOJPFTBIirjUdSs7hvHKGuz8OQmrByyv8C3rY9jtt+sM45uqINoGNyYsgbUQkQlKFhIB+mT+Q==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-SINZNHzxrKbgD7VGAx9GDMIlMOmXSpqWIeLpmNpPTm2D7F+NfXv2lVLxLl0nLUAJ70ipI51HdHGyrKXTOaFO8g==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-+/apDtwjBvmEn40DJ4yPOYqCsgIfhrD/zPYY15A6ny5kN1n6uV8LgUce9vv2HatRsD4uOuepD2z22/TbB8GjLA==";
|
||||
})
|
||||
];
|
||||
linux-musl-x64 = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-t2YTlMAHq+V8K8TnsFhUudCqiV5CElb/dk2tFmZ61Td4gyLY/iz+4q5lvpGAZOlCFddTtublSbIC3n4EH3liEQ==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-+uZHCjs+FlbFU2StjeANC3vvYjWd+6PlhIX0F8sHS60u3U9/HEi4JECQ0vhak5ODJCi+wktEKZQ53DwGAvPbJQ==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-lEaH55DO++s5EKEHfODZkF279HI5DROQgaTif93wcMg9mhL5kPHnLhi9S7qTMFKt+GQfmZWMlwZd+L6GVz+RVQ==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-mtm6VWoDGYg7qlqF6sFlf8LBEbGOL6ZCSoqzZ7hmDBy9UIe0AswL0d+AhsDOE5ewHifbK+vGqXeK83ZdL/1IRA==";
|
||||
})
|
||||
];
|
||||
osx-arm64 = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-zuh5p3Hq0ejcgbCe3IaVOj+mItbRve25QdIXaGirOfDuO2a5fGXSO8RtgFosw8ar2jBSG3qL6loMFqqgkiEuVA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-/X/ugPn9DMhWz26lDvuSlBqX/s56B7Sl/Qkd2/Jy5iYw64+9tOFo0Xh4kz0fF5nOj1H9RbKxIaNfPVc41rxvIQ==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-Ivl/uKKvVrgGxfbC8SSz5N1NZRi39PQ5ZXfsECiSsiNR2ls02Wy2Icy5mLRUGCFY4FMILAKsgfJRKejafqGxyA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-/SiUD5N7pwkJ4mK83CBkre6oOB76BTJ7lJUTDDw3t8F6HUJS+3i6Cx9sODd7BS7TXXA5ahql2gcfohVsaFsR9Q==";
|
||||
})
|
||||
];
|
||||
osx-x64 = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Crossgen2.osx-x64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-zTiRlyK4ElT/MES3AX1bLRcuX3lY3NXlwL89YTyEjuHrqjCpxEbHfsoznqYd7zLAF1itzvNnxDkqDPoXat/zZA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-WKqXIohGOzMUpDOsAEpknxj93fSuTzSdP7X/Ud19dggmqwPKMIWN5NZpWlBLdyP8+NMwLyNM/aR4uCtNf7MT2A==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-sSi6F1x2UVJe5Jp8RbURsNGVxFFPyxq6P8ZlV6r9dimYM2KkDyEOtcZ0hHSOtmMU3rghzZYksvSKv7+9fAYUNA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-GQokK1ugeF0JQi0IfkyNDm5nIVCKpH6V8zSskBRSAH8O5U4iVImpDkqBg1icxUFIAaVyiMi6GJB0CkTD2cC+yQ==";
|
||||
})
|
||||
];
|
||||
win-arm64 = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Crossgen2.win-arm64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-Qj4yn5t5k+lGY8dBPwh0jLQOXoilcVvwpmyxJp8LJHoOM8EmGjRoiCy68sRXGTQMt5d3iNIdV93rX+fXu20rlw==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-X15A3yBhigC8T81Ut1Zqqay9HzfCjjwLh1QDbHL2XggIWiGzkDf4hSX7qnkbki12DdFZP5p0xDFiYsnEBTGNgg==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-b26YbRN+y0LrdVq32iV7gUmi8sY4vY+P8GvaqiPTcJBH20OSfrsvDhyM08qMs6hCDo17xL5hFdLt9BSBfqcrOw==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-vNMheP+ysMxIiINElw4ebu7O8KHDz+l2dYTlP9zfBllo7eJW3XX0k7kOP0nYke78KFhheXu2JUHAAEZVhazOUA==";
|
||||
})
|
||||
];
|
||||
win-x64 = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Crossgen2.win-x64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-IoNNvrZ/pKBwn/XSvDp1saM2XHk1ZOKxrA4lDyrL10/s4IS8hRo/Yv3qs+ihWpwVStORW3lh0YIxQhMDHbMkzw==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-478qsicUIxQcpq/UGGoNNLRbUldl34RRZqxDdRl1HqC2D4aUdCpR3MEU5vd0zcbHxkegfPfgQgsv6xfIt+k/Ww==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-/D+xqMtDuo8ji4FPJm5EsEORBGEsbcHHYIjZDiEHP7ltIexg/oOSwuyvepvV+mK46Q4uyQU9zuBVZaG5FdKU0Q==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-fDGfrQnqXasfMLIUs2xVvLNxWjN0w7HypZ22wYG0y8PkN8u3vpVIQz9tYgUgEXvxKpFLYq1L2EcxksY6reAWug==";
|
||||
})
|
||||
];
|
||||
win-x86 = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Crossgen2.win-x86";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-kEXLQCzNVAnwkQ58qiO7lUOuO6WJSMlNmnQxx5o1RTiMIoqrgfjMazn5bpL5DPeZjMhWcB4kary/3Vkj06xRtA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-WE52ljXg7k8/ry1wBJ7lqrKniEZgwpMtuf7m82tMtuc30k5X+1nAbOa2evezPgjsXrB3k78uertzT+GoSRX/fQ==";
|
||||
})
|
||||
];
|
||||
};
|
||||
@@ -160,361 +160,361 @@ let
|
||||
linux-arm = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.AspNetCore.App.Runtime.linux-arm";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-z0RiU5O+4aelPS7+JYakKFXrmczOzTYp5sptrRoz8H2zM0Tbvwc7sX3pT2F5ZosBEaub37XJKrwSdvpdHoe6/w==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-TY4LXwPBf9d0vOpzCkV8Ze9e/Tnn4V07FkSctLB6Vc6XreNkVqEQcB1TuUQZOFc7pXBvpImRAD5mAfuLVNohDA==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Host.linux-arm";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-CRQl1RVkbfaLnYOEO4ApZ6Py1OG8zJjwU0UkAcIhg7MqsGgZcathISOzlDYayxqdbp+Gga21aaJJZbL0TSPkdw==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-UBWg0zDyYiiy3wXtxmRqaoAvi2hpXGGJ4VxoKcqgD927ftcYXz80g5dFDtk8zof3CVnfXHgaDCm40jxOrYU3qw==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Runtime.linux-arm";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-UjSZtTgg1EEmNJeI+Esg2pMNjSb+lCy0VjwkUIVUJA6vezRNsb66NjsO5h4rvSMS2VhoKWGc7jbNV1AKRj891g==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-ZHAexbNsU0DMvR9vVqYldw9m+wyqLM5AVZyx6E6Lgk5JzjgDI9rFfDI2h+UGi1WOJyKPDKrjyLWG5phtGC6ytg==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-h8mVEj/5JRPzKcDpoHvnQ0wt7nn7+euuPKLDtWH4yiAWztH8CX6udfHqjIE103USfpfMKEEcEWRqOe877rgp2Q==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-HmKdrzhgbW4ikm6lKWgaBm5OokH7aPyGuaniMHvRKnHSeUxDYMj2PU/ZSIlIxTntxELeTBd+ZcJlknJqR7Duuw==";
|
||||
})
|
||||
];
|
||||
linux-arm64 = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-rXmRirmXSlmvrc4lY76+eK6UoXIi78sUSDggleEYs6Mwip1PWWQ1bg2Bi3tpxcRgF1MBOgHhiz37lybWaS1y7A==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-bPfmwsqmA39Vfa+Uu9mH1eaCJZo/qd+/O0aOYRhjSrypYBQK2AIif8lq7zYxhOR2U5AhvkkeqLNnaEC3spTHiA==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Host.linux-arm64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-sw5cXyvNbbXyDkmnPJqNgSnOeDFdl9VL7OfA4kA2GcPCujXhnElVmF48rwibVtoYmDUe940zKPjUAeuXmmOH+g==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-OSpFCcAHBwfDK4bY6zNDfbtY+fKY6koEgvfVyk6OtdUI+dOM/Jjw9Kyxiqe1S8JC5dm3366+AFdqF2ZWbMW4fw==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-BYeSSlt4ck/kK7L9I+OYdI+aklnF9JDNaHyIQ+nea+E/e6qqENxlgDPzJKwTKAX4XdIF7Rc/Gk14PuYBpC7+Ew==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-gFoRuWxJUSjqz8meGfPQhK/xI8LXK0/z2mOiVWfwFBO1lMuPUWFrzlUvoPBHhZSYj7578iHtUog8r/tnnK6+Bw==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-poxX0QwFAsVfHDfH85V0BVd5dEtlhr+/3rPhCe5qhkFscmUM31BcD1ABbzdxYt/PRJKnKMCCA/tOHhMU5rUieA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-BLvup3LOAkOw5G/xJ0j9pcTNNQuPLibW0u5bTVAmMYYZny8b39xNWWVqNQ8Rl5jewPko/8luoany0SbHZ+GUpQ==";
|
||||
})
|
||||
];
|
||||
linux-x64 = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.AspNetCore.App.Runtime.linux-x64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-kPsplrPdJ9VmThmB0kXTumkVG0WikMbkSRzGVyNU/Ploa9Cvv80PnCxF5VBAqRV1l/l3qBq9TZQV+7c6mIef9Q==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-2NeuUX5T7ZRuc76byZXf7cLXYTK5fGufEbrjEXRlBMXyI+vQ8x+6BR+hbqef9JGylT8pcLv+xL11Gx39vk2KmQ==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Host.linux-x64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-LOoGtTUAg4/m9912v1s4yvh/wx64gRW6+052ZpHphizEbI/mvy5MGZpxS/WQHX34+RDXIG90CpdT7caL5iC1JA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-iZO21GJ4K+PjcH9Gn/OUVQrBkkfCVCifO+PsQItVuWuenEOwAShzCfz8E5icd/INLIosoriCyRV777jpjxHZXg==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Runtime.linux-x64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-t10QcEDpbrSvoe2BhUCtqOAqfXayzy9uujpiIeAdOyptGmBppA37G+F4cCRsIx6wzhCSrdPkYoh1KzD4rqqlyA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-SAKw8xQa/VBWOumG7JmId0UIKUs2RM8tnl3KPXJ85mjnrrP3wJLWynNf6v/hMxdxqjAOIb2Y6AIGwK4zFzA97g==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-ykHn7VUDn711h67XQd+nx5Tn0L0vYWQY8kKWqqTXm/mBEM5CjoMd9qft6jirusGORVxC5RAnUENDt5n48B4xfg==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-PTVNAmlIQRHnMCcw8Pm5+t8eLLtwyZ1J6lUjTcZ68dU9FGXIySRr750lekvMpBugMjmXIsNw0VQvg9AnL5SIDQ==";
|
||||
})
|
||||
];
|
||||
linux-musl-arm = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-6G+05BJAEjErJMixdkEAndBjgaCe7WmasdRypKPtYRfzvPVExrq/nak0ZiaJ0Dd3WuYdbi69Qyeuhj7atnAImw==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-VbIqcklAsQYAAV5CTXo/6NAa6lkirCeh1XF7Yo2D6xZmkwLbQsKfNF1jpiwYr6luiVwJCkIA6p/owsPAZT42gA==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Host.linux-musl-arm";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-xjepU2UUYCP30YJHPdX0PN6C0ZqP2RKAEsJWpnNSlYQ8fcDHgy+l5ZTQPBD4egfWKlPCEtgSZod3p9nTggSoDA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-H5a0wdzBU4tWXtTkYcgHsezWolqD59sDLSlDdOGE/OF7p3X1AijCo1BKCb/ub+Qn24dXoS7RGQf4TwmPP/fDdw==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-NORvYn5NilmBCZzLwrWXEPI7WeEKKwIHzh5USjQHQLsSoiWcOSZVKQLkqK2baSFjGktLyHmHRUQ6VnTggDuPeg==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-DpKE33FA9NYJXAY5SbKcIfAvU5RyH30YqhCXxHi/NYfEcR6e5hrzn4992S6TpUQzeYHeJHprfXEQGK+x8bWTqg==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-tMM7GajJVqT1W1qOzxmrvYyFTsTiSNrXSl0ww5CYz/pKr05gvncBdK0kCD9lYHruYMPVdlYyBCAICFg1kvO7aA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-prERCrIwyGg735ahEDi15HwriaDnwZlQidlFkiDSOuh4EJTXLqbYvwJxSygCNIgKAivNEwt5HuqAR0WxIzxLJA==";
|
||||
})
|
||||
];
|
||||
linux-musl-arm64 = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-wUU31YeB3hCc41XTTSXbhuYKKSbFv3rQb4aO0d93B1m8xPZfUpYA121ysuwaaiPgHvFK27wfYBHAAO82d1Tbsg==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-gI8nk0A8LtN/NXufax5tgmoxnAFvG9SUA+yGfBz82HlAvwZkWeQsNjZav06LsIdBgY+34oJqPfhGFWki234b3A==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Host.linux-musl-arm64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-eQ28Igd0kDwNnBeaXvQul2U4Za4KTkBJ2hF5gi6/8xL8tJAIvpSiuHrcspBB7oqr9/uOU6R4eR7gDmOH0OVRaQ==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-6deTINJifUd+6BioAPScqa94hbH35wweO3UazZ0Dob4GFoSxD/z7jUjRIib/HmyhXz+F/QMOZapPNN+qNsmEPg==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-zHJSkQl00ygE1BBWjjSZgQmT+rpX/ZoNvU3az2Vfk0D9tqM4+zQ0M0IdBw0Eu1Wr46LeifWIScp4pTvzBB0R/w==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-T93T3DT3SakSQcwaB9SFTT6R38hEh0/52bM+4IqvFAo1EAKx3eXiKezE3bMSjOGKHxKzb71Rp1d9Jflv6capLQ==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-RaDmfdtde+m27g31HXvBUJme7NUUT07bv5+Wp3mPH/FXE6tT8W1DvG9XNRcT2rIEDq24ktpfyBiNbN8fieBfqw==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-dnHqxZvkLe4SubfrXiPhb08qkj2FOrdCBWLHo/Hd+pSop3C86rCTRJY454LrPwjnktjnQf/X0b4anadwOkckrg==";
|
||||
})
|
||||
];
|
||||
linux-musl-x64 = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-723qKUmFeBKN0yfsf9zhP3k5ZKqK4UYvdKbDL80oyhzm4gQZ6tsUU4fHeHjJVJfqyN+wKS+R0WthyxhA9m07/g==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-8r/yMsXff3vlFUaRzlHKnkd/qxmbo6FzATU4d065j8YTNZcduF/uKiOKijwXSd96nj216RjCUIJWrcH72c5H6Q==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Host.linux-musl-x64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-hPcjYztP9miyYl+mqvTqoEqaa+fp+kCFVrROIwUEDBMNs6Urk76qsWJWE/uI9kLBh1zTHiDsWlXDiOXcftVBxA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-D6qubx3bzbfdDMJw1CcUJdPR2w2oHmOt/ur4q4Pi8cdFueROux3u2bcuurKmx2eZvHhYVKnL1njTxWDVHUM1OA==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-IG7yOIrrLUvA22aUGR7g9VtXK3WGCsID9TokGqET+LoO4QTLlFRYjbrsUkvttuGUHftOTgDh+4abzkcqaTfd6A==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-neXYzUGCn4zBhHa4+9NgG6c0ulwsfGczrrH2hqJcwf16fNtBgfe9L+JnwRctrVVe7iOci/qYh69c36OlCsREug==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-3PwE2oDr4+n93nPZbHz1kgJkpdus91UR5IXKnMWMMxcEq+VgNvNpU4+M+khwPOXSmxK9LY6dsd9beQVIFtrDVg==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-D8SDjyznO8H+3w5eAuL1pl+JZ+4S8eXM8gIMuNaDXvBZv43lU2by27Gk+Ue4eH5zV+462fBtBvqZtaETgfPsgQ==";
|
||||
})
|
||||
];
|
||||
osx-arm64 = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-QVYtaGiLQ0bWTiav/cc2Ps+PQ9co8EmTW8NAzlf835camz7gdjZHKo5/z4FOVUHVftCY9vn2yBuBcwceI6f+Bg==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-vk6trHjpJkCveABOceuodbxeAefojPqaUCGwU6HXinNgu281I/iEF7Afj6mJBLHxaPcvlFQjAjbRhll1SwcSNw==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Host.osx-arm64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-4ktCvzYslGK2G2CLPy4As8rbHGPtQw0RA5VC9WxRmRpDH/3cyicFbRaBRVc2y19p0tV9nMC9KdaFyptm80lQZg==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-r1LB1Ilq1/Pf71SubpoHU53s5bjfHY/TLQUhG2R3AGFMe1S2J6H35pkXuCdwBH+x99AX4khX1zw00BCYP5liVQ==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-MPUbFdcUXGrfUpdNmcPvq+EdaBLcl+4+nsbUwftOT1041DpIUkFfDzgWNWVMjPG3Prf3K0iKPtvdKx9bdUlq6A==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-ovDMqhvYv4o6P/AjvAh26EcSs6auYHe4YBgWF7SBLgB/r1xOvjlRZRuVL7znu/js0CwTH7h8w/YvW+q1+Tzw/A==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-CtxI7P/Il0bLfPXN6ofeL4Vm4ISp3TjvRBZt8MkACaTErFseNiwIIAKNqZ+d9lIxj1MDGA5fCfVn/0PsGIksRg==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-K7jCpNm0lYr/dHheLoaPadsd9q8oQ0X+iK/rJkeKrZ76FLzAvcC1FqX9yXICwAW44m63bXcmg0ggra1+yXx0/Q==";
|
||||
})
|
||||
];
|
||||
osx-x64 = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-p18BC5bG9/0ktSBUvxZOqPpr9qkS0Z6G71GViCAzjtV+fBllt6OE7T0rSvOZ14FjZFcSqMA2HZ60I3H93cK6TA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-R7g8lya69aqDY/iAIIoX8TnbxEJxBIxvuqD0zrcEuJgRh33b2xys9OAT2NmyZH3GWdTZ5UPiolJ2SifKNE1ztQ==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Host.osx-x64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-T9Rhlb0Ivsaev2JNEKRLRoc5pyowBy+meS7GzijwfHOEviRw2rMpPNK+8DoygI8HRetSnjLghMlzdcfURF10LA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-tPbKNB5TVRIAHyts6RMV2AP7pnmO/1MRtfTByCqTkTjH945dJ8+2r4ytMIoQ3ooVLi00yll9w2tDL+XnuNT3xw==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Runtime.osx-x64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-7SI6G+CVFjxrcgJny64fmvOp4Pz02EXrhlKJdEKoht+enh8c/1pY55cgR5jq9GWJ9iJNtV9/sDUiADK74NWWKQ==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-W18K405wGThiTnn12Mi0K6KXznjPZX87mX9APiq+nbKIsMmGC+r7cyIPgy9hmggnTb3qqv1p/0PACRD6NXm0CQ==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-ui1NVLgK7tEN1Xv+MO8FRovfg1OR4sKGf5GXHz2CN88GLkzznp5m9sSAETN2IPueRV+aaQ8JFaLEEw1QOdlh2Q==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-K7fKG8YuufAgq6VcvotJH/D4uHmcjg/X9TwWq8EmbyysqyNCuMkg6a1torpyaomdooKSZ0LSOodqbo57B6jERg==";
|
||||
})
|
||||
];
|
||||
win-arm64 = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.AspNetCore.App.Runtime.win-arm64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-kTwrqjATCL5woNksB+G2B39lOIUkxLnouFruipzLnsDKSxG50pKIhxWUkrwTfwatL/zQasE+aVlwEfSQAxQteQ==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-alvGXGuLfWb35dOybu83zGbH9VyIJRf17FEhF6yrNGvg8gJ3SwpU/N2uGnuxI1TIb8dFlKq3FoE2hqfxWAERKA==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Host.win-arm64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-86sGYDN7tFGBhAUacYgosah0TTIMT1czQtKHb6vKXOGo1wWAYa+MsGXrdUA6o3rpvybL8rbRANQ1tarIfui4Bw==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-8345qvf7b3Q8hoqXErpJTWQeLmBV3GFUNa/hp8eCglnY5WWbnfd/muQAdA5zUoOX/8fMA4TILhZx2K0M8k1/mw==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Runtime.win-arm64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-VkXVbi8EbajQYu5pge5VCXxWGhHJtLivHM+rqHt78b8w2IpYfRACV7lqEU1COg9D3sZEG5oLOzKLCCN7lSiekA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-um95x3i3Jdyat4T6HTXP9I0STmsqJyuTWmZwCg/5EPNWMX1fm/OIFIoUQ9lX2kplPyq6Ys0hmiBaVcHOHGThgw==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-CUdm0Uw4kGSk6oVm8QZLSwxngMFmbNoiFXve2hT0/Csu4mJe6ttV8C/Y0VLPBJr3GmoovOzMeH3coQfEf2YvBA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-LneCr0cNCIEYVfDI2Ab++j+baaKut+pqTsCb3R9FAp9pqYVXveSEXn8V4xx+N0i//SQx4i9Dkd+oYGERun9k2A==";
|
||||
})
|
||||
];
|
||||
win-x64 = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-kV1DnmxJrCauIvUfNe4wC4Yi888dzxxf7sYT4W/apnCSHvcjueYEZOGtoLSirsJJrn5aj9OeFVz+bAbd9nurxg==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-xr4GBhH7aIMfPXjv+CuGZI3h1PZc+yETwn3/9UMOXXNxgM1zrkCR1p4I8rQNpwVPd440P8pReq2AWrdbLX7kTQ==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Host.win-x64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-XsP6i0SHVuDjS0IWBC+/3QXDJO+3ARuFbPSu9fRjR5NkK5/A4lQpBWJRymTzqWHzmD0DLYMEfwR+3mdG2A/StQ==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-slvRNr3ZPyyGLrOFEPVF91TD6BJcC7/UKrowVg0XGq37IxTeicrNLhs7PE8qmVGBgUTiKcqxEU7DXI2/qBh9nA==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Runtime.win-x64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-UsW6m9/wuBUWM8SU/PHsn+9GQMRp4i00KfWDzE/s6rnCs40WRvy5Zcj923XMy05Bt04dhSrOOmDR1/vkydaysg==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-1JBZRsQMZ4mCN0rS+F6wwP7s7+es+uwx6hG9ubUuccJYjCEAWwDg3vBVAbQqwMOF9rdbqOLFbkbvawOT7BHAaw==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-Btz15yrqllW8cQ82bDOMB+fo1ONv4j+BvpZGQTt4zwqgyxq3qznnxVHrMxiG+UUwhDlD4ajCGYuZCjHECODTHg==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-8fiTrOmlVMojv2oFxSO4zKP0Mz+3HazxfqBFBbgioN+/dMNiCa6ql3Sm0kp88Qmfcb68PwhWCJLy3x3XHLEUuA==";
|
||||
})
|
||||
];
|
||||
win-x86 = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.AspNetCore.App.Runtime.win-x86";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-bVGv/VP4T598HMR97vrcF8NxOv43rTn4RtH5JSm/Z/I2l6Jf4OsEmrP7ciCJho65xgG2NN7E80dAfv6Waan/DQ==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-t0G1lpmSy3Bb/0k4riHo+oT2h53IbHHC92oy3Mnxg2Nm/ZBoGDW55/maB5lF+IbEoNsScpAhsFNf7gAv5KPOhw==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Host.win-x86";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-OvOg+DllupzQyo2AiWJOWhd3G7sXoROVbGIbaO48l3cXJf+EkT3mwK0WyKNJo1SYDBSHP4PL3CELLyl7KeuBTA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-Xgu9wAHojyPC6/9OhNk4Bpmhmb4FAcJMMb3S7xwwPFuEx7pKSCPOA/3Gv/8xR3w3lYoMhvs94Jn4zzLPw/d46A==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Runtime.win-x86";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-di/eQOCbK7Gckc/GaFEJbeHA8xc1sjPYb4ZgSDQG8s/lSc5EocnPG6YSiPu5noCS/kl4caLJzu8mcNEbHo9fQg==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-FDFqh+DYEYnPZjLzODbygevvyrQH15WVg/pcDbiFlE0dsoL7LQ3ST3G6Vz5GfpAZyO0A8O7ekGOH81+wskmeiw==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-e4ZDOtOGLbKnCy90C+6+pAtkX/CJlAI3dPV3zF8Dtk4kCG6m+4TnbohG8z+CBaY4Tyh7HRXfCwA0sMhkZIhJ/A==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-npZ0pXzs+1mOb/G8asxE4QYUrrQlvuVjO24sgaqgQ/o8Ir3m1jTxXhETRj7IXKiPiVMIaLPV+c3XtpdDKouH9A==";
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
in
|
||||
rec {
|
||||
release_10_0 = "10.0.0-preview.6";
|
||||
release_10_0 = "10.0.0-preview.7";
|
||||
|
||||
aspnetcore_10_0 = buildAspNetCore {
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
srcs = {
|
||||
linux-arm = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-linux-arm.tar.gz";
|
||||
hash = "sha512-/mrP2TIr27NliznmIGDFdjriPeeSpDDbRyaM++1gNgJk55NQArHO3KgTMog2d5XlnTgkp03lH5lk3FQKgU2RiQ==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-linux-arm.tar.gz";
|
||||
hash = "sha512-lXwjay3tSsk2fperQsxjo28PeydYBQA552QN/aOCTlpl6/LTB2L8diIqgdGUpJ593riZcUo3vCjbZwjY1bGC7Q==";
|
||||
};
|
||||
linux-arm64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-linux-arm64.tar.gz";
|
||||
hash = "sha512-iGZ9ZtkKq6MGSfhNENBX2nwNtHnNs2t2gk3I4PAqRKa/XSaddNqg1reDdvLcZrYCOFWCZ1VeLO1Ay9BqrHRdag==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-linux-arm64.tar.gz";
|
||||
hash = "sha512-gTWO1Grf/RpOLglePSPWfR0ommxMUKsg4ecRYbKCPIxE3VpsJBrJs/zUoq9Rjb/7zNt7Os0HpCr5/yTF/WLGow==";
|
||||
};
|
||||
linux-x64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-linux-x64.tar.gz";
|
||||
hash = "sha512-FczqQ09eM7SvhyvaANMNP+5ElBE6Hl17HoziBqsKLgk4T6WiI6/d5LlOo7fhK3lsGkUTi+gzKIvWh0GuhD+2yA==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-linux-x64.tar.gz";
|
||||
hash = "sha512-9onzhvf6Vrm1O9fVEKvs8rnCI1j7KTZ4RsI/u6ewphpH2G287vlrc6corwduVcNGg4SXQC4M2AuGldncHqPCuQ==";
|
||||
};
|
||||
linux-musl-arm = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-linux-musl-arm.tar.gz";
|
||||
hash = "sha512-HArq8wBlBcK/tkjyViWT9iu3pVsAULbMgecK6cwaNcrbv9VGEXBaGwv4SYqqNV0DeEfJ6nqa2j9YVWiLpqYTSQ==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-linux-musl-arm.tar.gz";
|
||||
hash = "sha512-uJ0bnKWphyzzZ3dKLKUVKkLtht7MGMWTsQSINGPOXPrKamn5F0SaArTSXqQVj4IqNqwNZVxTjBhOR611EYbs2w==";
|
||||
};
|
||||
linux-musl-arm64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-linux-musl-arm64.tar.gz";
|
||||
hash = "sha512-CH7Qk+rFkx3YjOnIF1Q/rEp/sAcF/+cet1U6/QoVtQfrWmO46FDhT+SI3t17OaCshkmaFU5oSBWpnBIjr1NJ0A==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-linux-musl-arm64.tar.gz";
|
||||
hash = "sha512-cAY0HJWlGRCm7gLVgemkHXZGSn777QrXedDmT8DXfEK70jNTf1fXb28P2zh/biVZK6UzYmcKXm7+1ho3TkIc7A==";
|
||||
};
|
||||
linux-musl-x64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-linux-musl-x64.tar.gz";
|
||||
hash = "sha512-bU2Jk/BySlwwy7XDR9ovxoct3HUdvGykOI5/umDVFiZhk5g6mErGv+h5tEh4j3e6+1C5mWfe+6QD9E7j/ycx7Q==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-linux-musl-x64.tar.gz";
|
||||
hash = "sha512-wRf0SCHNbFWna7nr/HRlYG04rInIEO4iSys6D/T1q/Ld27sZVoOeZyrrpPlR3wtax/GTXSqQttTc3cEep8M7UQ==";
|
||||
};
|
||||
osx-arm64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-osx-arm64.tar.gz";
|
||||
hash = "sha512-VlWHBJhm7w4JIR0SLJUOPYfzvCL/dA5NVQYY1ppidjuN12bBNcC95Px8zLqmTzMhQrSQ0P1ClOTFjimCB49yBA==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-osx-arm64.tar.gz";
|
||||
hash = "sha512-D5iye4E6etLrWkCOe9sf/97fheARsEmF6QCV3ikW2qTDQhSsPPmgZvSbPn7gnVbXP56aGFjHHv+JAMxBRf0yVQ==";
|
||||
};
|
||||
osx-x64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-osx-x64.tar.gz";
|
||||
hash = "sha512-c2tCqqrbhlRIvM/bOO2KlmCELsmPS4Trexq/E6imjPsWbx8dHZt6viROKAC0BwPUsxpQO+o2NZc5oEHjMsZSXQ==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-osx-x64.tar.gz";
|
||||
hash = "sha512-FQLipaTYahQwhA2TGknRX/07ZEZeV9IdcURItxlpz7zmU4LvgoJg8Wlt1GxAnzwD9riuenLlFWe0RMoQuoreoA==";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
runtime_10_0 = buildNetRuntime {
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
srcs = {
|
||||
linux-arm = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-linux-arm.tar.gz";
|
||||
hash = "sha512-dkFn08ZTnl3/nj8Qh+pAs3urJy9+bB3gyGLXak0MNEUnmbRY6fpwMprijsbQfWtiSz9b0KooEubn7I+PavI7hw==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-linux-arm.tar.gz";
|
||||
hash = "sha512-oyaRhovGFTGjL6O78RNBZGrFFBasUvaACTxXfTO2ODBqJqCjJ5poaoZUPg8v3MoOegfzYIF5UpRdybRt4pyXCQ==";
|
||||
};
|
||||
linux-arm64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-linux-arm64.tar.gz";
|
||||
hash = "sha512-cbydt+UH85l1JsTzkzkUYA+Q8AAxxhc1nzuAtyuBiljcgEpe2zTGt8qx4WVx6FVVRZUNGgcgv/WzGsY3RP204w==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-linux-arm64.tar.gz";
|
||||
hash = "sha512-tTAequEUCb2/MZg7xpk39w3RezVe84D0yrMX6SHl1mFiZCzVfRmhT7ug78CadjNcbl8u6ZimDErHYssXJR04QA==";
|
||||
};
|
||||
linux-x64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-linux-x64.tar.gz";
|
||||
hash = "sha512-f+rKqGVeFFIdtrqaeGByN38GOGTkGMXk9ep5kjop9HJO9u0WB0VFnuAo8ZJ5r6HA/t6atpM3IgiQnu+HM8oDZA==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-linux-x64.tar.gz";
|
||||
hash = "sha512-EnSHIJyzxKOUhHzO1aFduMW2bJOGboi0pweJ6iyQtB4pk+ANkZLUupiPM928iaXKL+TxmmEdftitjD4KRpLFAQ==";
|
||||
};
|
||||
linux-musl-arm = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-linux-musl-arm.tar.gz";
|
||||
hash = "sha512-XXF9htD5Vt8lgTAnA9TYSNyBQjHnEpOgkOr1axgUYIRUOj1GcOQxDrkPOS4YKtAHycx8wfRRTQ76nfO2XRCD8Q==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-linux-musl-arm.tar.gz";
|
||||
hash = "sha512-aCCXjXxzep/7Pj9IGsDDAm3FRsH0JzlqgwkCdTiwhu+QEHHiKiCJt3ivXlG8aJpEFCAs79lgkc0zAVtQ9+GtHA==";
|
||||
};
|
||||
linux-musl-arm64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-linux-musl-arm64.tar.gz";
|
||||
hash = "sha512-4mP7M8JBvsvY8vemP5tfQSPBpmfFVEfwOiSc/1SRs4pt+mKEURwPxidFxp8wK0ytnICIwnAJNYLX28p6LsZdCg==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-linux-musl-arm64.tar.gz";
|
||||
hash = "sha512-xJAlZHKLkx0jIHojHNSUZCKvqtFQjpGMISfcgjbc/yqVNXQQ4vC61bLYcZxkFMIJLQk4DDrnAVG1kgoyuzOHzw==";
|
||||
};
|
||||
linux-musl-x64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-linux-musl-x64.tar.gz";
|
||||
hash = "sha512-zf3Ek3pbRF4rjuks2odZedJWiUjdX+fQH4QwW2Mh3KZNZ+1hqYweccbaHu2CLwddC7BBBVGuyw+PPhMThDZ2qA==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-linux-musl-x64.tar.gz";
|
||||
hash = "sha512-wCfUh5zikKE4NaJWtYraqu2hdvCYgsej42+w4ik7Qo7/U+YhpHj+xF2SjxeL3VLn9KK03p4C0gSUxLmSXMtkBg==";
|
||||
};
|
||||
osx-arm64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-osx-arm64.tar.gz";
|
||||
hash = "sha512-zXzElKrtYs2r8Sh6CMvDoPKPMRLoluA37YLYRdZThzJ+I0UlvxwESbA+8hhSM9RWL7Wfv9GdXyjaPgpnE3RTdw==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-osx-arm64.tar.gz";
|
||||
hash = "sha512-72B+c82XraPNoxoMvqVWzWBAmiYSqUEnJxub+SXhLfhM97MmsLXt3s07rON/1vpwENSHzdxcIyR0Xe2W+LymAA==";
|
||||
};
|
||||
osx-x64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-osx-x64.tar.gz";
|
||||
hash = "sha512-lm3Eezqhx6qSOzVI2IdkiCNpKwU/CT5PJrhmu/WAmx3W7zi9LC5RpOgPBsXb5K7Q21uuVSrZgmRi+sMOpormFg==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-osx-x64.tar.gz";
|
||||
hash = "sha512-4kBn/dR8b/jTCNNnNwK6FD/a3VC0pRca8qq36AYz7uGeZqC2lAvqSq6Yik05EVWjW6eOV3YM3d2lr169M1s9EA==";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
sdk_10_0_1xx = buildNetSdk {
|
||||
version = "10.0.100-preview.6.25358.103";
|
||||
version = "10.0.100-preview.7.25380.108";
|
||||
srcs = {
|
||||
linux-arm = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-linux-arm.tar.gz";
|
||||
hash = "sha512-lYjjTcixBEvdjpzqH9DWtWf+3w3br0iXsVOrmz6TrElXRXgQ+p7NfaTVo22KBbxItnCv0PUtTVbRQPdCoEOCCg==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-linux-arm.tar.gz";
|
||||
hash = "sha512-knm/wwbPU/3AJnPGjrwGgYsm+wXukE/zFej/UoqNWLU0KoZkIjOkpnIi9Qe2ARC4IYSSx7l5cb7nj7EKFfiu6A==";
|
||||
};
|
||||
linux-arm64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-linux-arm64.tar.gz";
|
||||
hash = "sha512-cwFkPqL72yWCUmxtRpnTy2V/bJDjzn8nRq1RwyCoSDwoDToV/C4HJgWyvf52NpBjo4T/Ydef+WRBg+SyHBundA==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-linux-arm64.tar.gz";
|
||||
hash = "sha512-qBiJz0LOz2FqdoXKsXUIaUzug+dqlhnGTomvr/TTgmaOpMft/etEU6DBPfzurIZuo9D+BfPfEkY4pMpYtP2nJQ==";
|
||||
};
|
||||
linux-x64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-linux-x64.tar.gz";
|
||||
hash = "sha512-ZivWGncnWokxhq7VsKbmamE9M2V/cQJqJ/dl8RlreOPzoq2ljhs34Prqw5qDd7Pps7zqK3LFsG3V2YSK2Yc/Pw==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-linux-x64.tar.gz";
|
||||
hash = "sha512-KNA8LaQR6BYb+jcUjzX/Yi6qI0GtzXKae1I/dKoh6Pf2UBnaENKG1nhY0Z/2AII4C4dDbfm8zicUe0/bIShvsg==";
|
||||
};
|
||||
linux-musl-arm = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-linux-musl-arm.tar.gz";
|
||||
hash = "sha512-9E/Akg2mqGl07lLa7ODP/oyJEZPOmp1ob9k+gXiB7CSLkT5xdF7ldqZb9P3BZQZxivkERM7g9wFPuJZ6k6bMyA==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-linux-musl-arm.tar.gz";
|
||||
hash = "sha512-D65/QdZ5g5I0GWMqoc+JW9K+0oaBLcysWLUkrgxrgBuxhVUJ1t9L+EfkxAx5ll31z2BrwH8iV49JzAo+/1dEjQ==";
|
||||
};
|
||||
linux-musl-arm64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-linux-musl-arm64.tar.gz";
|
||||
hash = "sha512-xK/vp5j5cN3jplkjwCZItn87VU5Rp94TstKSRoQ3EtCGRcj8IjpAi9N+Df17+HWA0EaM+nQAlexbNbknQG+Lnw==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-linux-musl-arm64.tar.gz";
|
||||
hash = "sha512-zIjcxU2QbdIS9MOD3gfTSUfMS2RZJAtfwTqei25dfUgrymc1cXixQZUFfviDx+YOT/2ArvSEyYqXOYf+SZPBow==";
|
||||
};
|
||||
linux-musl-x64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-linux-musl-x64.tar.gz";
|
||||
hash = "sha512-LCj610mZoxlInz08MT41eSP+UaQCG+01OZeA8trqlZzehNkYNdHjEMk71LfLaV+xT29lAa0LFmF0L/xYAVNiaQ==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-linux-musl-x64.tar.gz";
|
||||
hash = "sha512-hcpucoRlWBlxrzWL7dJkDADJ11xJysH6mz3plrQKE+lfNbdXPe+u/r38Z0xHjotXn4GhAwvj8WC2cgsx/f1ooQ==";
|
||||
};
|
||||
osx-arm64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-osx-arm64.tar.gz";
|
||||
hash = "sha512-xDIGEqUUEXVSocsTu6RBc72L25UGwTtLmmeumrCziq1+zU5d0dTDIwukn7luzRSyrzQWkp52UcXJkMv3ber7mg==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-osx-arm64.tar.gz";
|
||||
hash = "sha512-eI/e7V31AEm8/hNwBZzfp0M5CkLZv1LHRVY+qsRL9UqVSqyjVjZLq2tbEIsbbZ4NbPJ8JT0uYrBkQARmn4GXxw==";
|
||||
};
|
||||
osx-x64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-osx-x64.tar.gz";
|
||||
hash = "sha512-rWlkOrW5A00BlxcOx+TusNgSzeXwKKHq8X+w8gnOKyUZMrJBKNsMVfBXs+mv9n14vLBFmAiT+B2WlQMjYRpnlQ==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-osx-x64.tar.gz";
|
||||
hash = "sha512-/Dk0clsJJHMl7hDlaBlhZyKmMPSBS7k8Q7YLLtvTLuI83esARdZACAi4QNBQ7Q3Etbz5WpDeG5MpNrYjVuHqVQ==";
|
||||
};
|
||||
};
|
||||
inherit commonPackages hostPackages targetPackages;
|
||||
|
||||
+24
-24
@@ -1,50 +1,50 @@
|
||||
[
|
||||
{
|
||||
"pname": "runtime.linux-arm64.Microsoft.NETCore.ILAsm",
|
||||
"sha256": "ac90a9d11e9397e6e3dff022f99459d0666e2d29e899ac06471e860ae5173980",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/10.0.0-preview.6.25302.104/runtime.linux-arm64.microsoft.netcore.ilasm.10.0.0-preview.6.25302.104.nupkg",
|
||||
"version": "10.0.0-preview.6.25302.104"
|
||||
"sha256": "aa14afd80807b2b9f4956b8600d20f7d3516aecf05f55d1ca7d905a329cfe83b",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/10.0.0-preview.7.25322.101/runtime.linux-arm64.microsoft.netcore.ilasm.10.0.0-preview.7.25322.101.nupkg",
|
||||
"version": "10.0.0-preview.7.25322.101"
|
||||
},
|
||||
{
|
||||
"pname": "runtime.linux-arm64.Microsoft.NETCore.ILDAsm",
|
||||
"sha256": "c5a904d430cbe6014fea6ace35a339838f598ac2560ab741ecc085a00f37ae49",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/10.0.0-preview.6.25302.104/runtime.linux-arm64.microsoft.netcore.ildasm.10.0.0-preview.6.25302.104.nupkg",
|
||||
"version": "10.0.0-preview.6.25302.104"
|
||||
"sha256": "53c920333f4762f1f79b108726129c1d8c1416ccd76526fe3a9a7ab7a1f93597",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/10.0.0-preview.7.25322.101/runtime.linux-arm64.microsoft.netcore.ildasm.10.0.0-preview.7.25322.101.nupkg",
|
||||
"version": "10.0.0-preview.7.25322.101"
|
||||
},
|
||||
{
|
||||
"hash": "sha256-Nupnw/U9dxLxWNqETTtxyvJhuuGDPyU+ksmZ+qwSkxk=",
|
||||
"hash": "sha256-KhdfkhtQFehIcwo3koGdmmqSTXZD3jbZUMxj61cX0LA=",
|
||||
"pname": "runtime.linux-x64.Microsoft.NETCore.ILAsm",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/10.0.0-preview.6.25302.104/runtime.linux-x64.microsoft.netcore.ilasm.10.0.0-preview.6.25302.104.nupkg",
|
||||
"version": "10.0.0-preview.6.25302.104"
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/10.0.0-preview.7.25322.101/runtime.linux-x64.microsoft.netcore.ilasm.10.0.0-preview.7.25322.101.nupkg",
|
||||
"version": "10.0.0-preview.7.25322.101"
|
||||
},
|
||||
{
|
||||
"hash": "sha256-QHSni2ad7MQEQoCMRPWTtwmMOTZaDWn/CZbUanLAc2Y=",
|
||||
"hash": "sha256-/R26o0IJCYf6Fa/uxTNpRh4E9Sm5JrUlC6yr7V/sMiw=",
|
||||
"pname": "runtime.linux-x64.Microsoft.NETCore.ILDAsm",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/10.0.0-preview.6.25302.104/runtime.linux-x64.microsoft.netcore.ildasm.10.0.0-preview.6.25302.104.nupkg",
|
||||
"version": "10.0.0-preview.6.25302.104"
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/10.0.0-preview.7.25322.101/runtime.linux-x64.microsoft.netcore.ildasm.10.0.0-preview.7.25322.101.nupkg",
|
||||
"version": "10.0.0-preview.7.25322.101"
|
||||
},
|
||||
{
|
||||
"pname": "runtime.osx-arm64.Microsoft.NETCore.ILAsm",
|
||||
"sha256": "06130621565ec2be89c86e322af5abc095c4efe0334f8dfc3ea43695c1ed9893",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/10.0.0-preview.6.25302.104/runtime.osx-arm64.microsoft.netcore.ilasm.10.0.0-preview.6.25302.104.nupkg",
|
||||
"version": "10.0.0-preview.6.25302.104"
|
||||
"sha256": "7a685b61f9aa514104e2d43698696a035b701879262bfd9795ef282a506a572e",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/10.0.0-preview.7.25322.101/runtime.osx-arm64.microsoft.netcore.ilasm.10.0.0-preview.7.25322.101.nupkg",
|
||||
"version": "10.0.0-preview.7.25322.101"
|
||||
},
|
||||
{
|
||||
"pname": "runtime.osx-arm64.Microsoft.NETCore.ILDAsm",
|
||||
"sha256": "43da2ec6d8351784865e8a18113f2c90211c13966d352765316b5d5c9f4b3cbd",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/10.0.0-preview.6.25302.104/runtime.osx-arm64.microsoft.netcore.ildasm.10.0.0-preview.6.25302.104.nupkg",
|
||||
"version": "10.0.0-preview.6.25302.104"
|
||||
"sha256": "ff8889ae28490cfe2906cf1fb9ea1a299dbe7300e5645d36e1b144ec79ae7374",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/10.0.0-preview.7.25322.101/runtime.osx-arm64.microsoft.netcore.ildasm.10.0.0-preview.7.25322.101.nupkg",
|
||||
"version": "10.0.0-preview.7.25322.101"
|
||||
},
|
||||
{
|
||||
"pname": "runtime.osx-x64.Microsoft.NETCore.ILAsm",
|
||||
"sha256": "0234d829a2e019b4b3f87b93c068c14cc3d71be6d489a3c8e4c358f9a1609d36",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/10.0.0-preview.6.25302.104/runtime.osx-x64.microsoft.netcore.ilasm.10.0.0-preview.6.25302.104.nupkg",
|
||||
"version": "10.0.0-preview.6.25302.104"
|
||||
"sha256": "3a512f5afee951500f328f2c166eb11d877cc0ce8a176358ecc5bbabe8a14f7a",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/10.0.0-preview.7.25322.101/runtime.osx-x64.microsoft.netcore.ilasm.10.0.0-preview.7.25322.101.nupkg",
|
||||
"version": "10.0.0-preview.7.25322.101"
|
||||
},
|
||||
{
|
||||
"pname": "runtime.osx-x64.Microsoft.NETCore.ILDAsm",
|
||||
"sha256": "ce1b95a1611a442ead51a5a6f33939311a94c20dee287d1aa903b0e1425a5e28",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/10.0.0-preview.6.25302.104/runtime.osx-x64.microsoft.netcore.ildasm.10.0.0-preview.6.25302.104.nupkg",
|
||||
"version": "10.0.0-preview.6.25302.104"
|
||||
"sha256": "7c0cf48f6a48ab0b7b4cd339aed9c1626873674e614fea33e15ee7c938514e8d",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/10.0.0-preview.7.25322.101/runtime.osx-x64.microsoft.netcore.ildasm.10.0.0-preview.7.25322.101.nupkg",
|
||||
"version": "10.0.0-preview.7.25322.101"
|
||||
}
|
||||
]
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"tarballHash": "sha256-ffQAL6kerSjdOcd4YsC1374zH2gBDsdWJeBTwEsTUbo=",
|
||||
"artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.10.0.100-preview.6.25302.104.centos.9-x64.tar.gz",
|
||||
"artifactsHash": "sha256-CEmna8eEx6+8nxThVGnqWkz6DSJOnJWuFrCWzDRoAYo="
|
||||
"tarballHash": "sha256-sE7HIeZfg3Q4/izN7ZNg+KHCQAkp7NwJXoe2BA+E4Ww=",
|
||||
"artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.10.0.100-preview.7.25322.101-1.centos.10-x64.tar.gz",
|
||||
"artifactsHash": "sha256-jwyPybGkBPrmwDBkesqEauTEFNTgBv/sUW3jaUnWbt4="
|
||||
}
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{
|
||||
"release": "10.0.0-preview.6",
|
||||
"release": "10.0.0-preview.7",
|
||||
"channel": "10.0",
|
||||
"tag": "v10.0.0-preview.6.25358.103",
|
||||
"sdkVersion": "10.0.100-preview.6.25358.103",
|
||||
"runtimeVersion": "10.0.0-preview.6.25358.103",
|
||||
"aspNetCoreVersion": "10.0.0-preview.6.25358.103",
|
||||
"tag": "v10.0.100-preview.7.25380.108",
|
||||
"sdkVersion": "10.0.100-preview.7.25380.108",
|
||||
"runtimeVersion": "10.0.0-preview.7.25380.108",
|
||||
"aspNetCoreVersion": "10.0.0-preview.7.25380.108",
|
||||
"sourceRepository": "https://github.com/dotnet/dotnet",
|
||||
"sourceVersion": "75972a5ba730bdaf7cf3a34f528ab0f5c7f05183",
|
||||
"officialBuildId": "20250708.3"
|
||||
"sourceVersion": "30000d883e06c122311a66894579bc12329a09d4",
|
||||
"officialBuildId": "20250730.8"
|
||||
}
|
||||
|
||||
+47
@@ -0,0 +1,47 @@
|
||||
From 8fa3570bf75c48bf68f42b74790bf8ba0f032a3f Mon Sep 17 00:00:00 2001
|
||||
From: David McFarland <corngood@gmail.com>
|
||||
Date: Thu, 14 Aug 2025 10:49:40 -0300
|
||||
Subject: [PATCH] bundler: fix file size estimation when bundling symlinks
|
||||
|
||||
---
|
||||
.../managed/Microsoft.NET.HostModel/Bundle/Bundler.cs | 10 ++++++++--
|
||||
1 file changed, 8 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/runtime/src/installer/managed/Microsoft.NET.HostModel/Bundle/Bundler.cs b/src/runtime/src/installer/managed/Microsoft.NET.HostModel/Bundle/Bundler.cs
|
||||
index a5e8b593484..39f39334251 100644
|
||||
--- a/src/runtime/src/installer/managed/Microsoft.NET.HostModel/Bundle/Bundler.cs
|
||||
+++ b/src/runtime/src/installer/managed/Microsoft.NET.HostModel/Bundle/Bundler.cs
|
||||
@@ -284,6 +284,12 @@ public string GenerateBundle(IReadOnlyList<FileSpec> fileSpecs)
|
||||
throw new ArgumentException("Invalid input specification: Must specify the host binary");
|
||||
}
|
||||
|
||||
+ static long GetFileLength(string path)
|
||||
+ {
|
||||
+ var info = new FileInfo(path);
|
||||
+ return ((FileInfo?)info.ResolveLinkTarget(true) ?? info).Length;
|
||||
+ }
|
||||
+
|
||||
(FileSpec Spec, FileType Type)[] relativePathToSpec = GetFilteredFileSpecs(fileSpecs);
|
||||
long bundledFilesSize = 0;
|
||||
// Conservatively estimate the size of bundled files.
|
||||
@@ -293,7 +299,7 @@ public string GenerateBundle(IReadOnlyList<FileSpec> fileSpecs)
|
||||
// We will memory map a larger file than needed, but we'll take that trade-off.
|
||||
foreach (var (spec, type) in relativePathToSpec)
|
||||
{
|
||||
- bundledFilesSize += new FileInfo(spec.SourcePath).Length;
|
||||
+ bundledFilesSize += GetFileLength(spec.SourcePath);
|
||||
if (type == FileType.Assembly)
|
||||
{
|
||||
// Alignment could be as much as AssemblyAlignment - 1 bytes.
|
||||
@@ -314,7 +320,7 @@ public string GenerateBundle(IReadOnlyList<FileSpec> fileSpecs)
|
||||
{
|
||||
Directory.CreateDirectory(destinationDirectory);
|
||||
}
|
||||
- var hostLength = new FileInfo(hostSource).Length;
|
||||
+ var hostLength = GetFileLength(hostSource);
|
||||
var bundleManifestLength = Manifest.GetManifestLength(BundleManifest.BundleMajorVersion, relativePathToSpec.Select(x => x.Spec.BundleRelativePath));
|
||||
long bundleTotalSize = hostLength + bundledFilesSize + bundleManifestLength;
|
||||
if (_target.IsOSX && _macosCodesign)
|
||||
--
|
||||
2.50.1
|
||||
|
||||
+42
@@ -0,0 +1,42 @@
|
||||
From 9ec09da8755f2888a2ae15c52e223953785bc146 Mon Sep 17 00:00:00 2001
|
||||
From: David McFarland <corngood@gmail.com>
|
||||
Date: Wed, 13 Aug 2025 16:03:41 -0300
|
||||
Subject: [PATCH] mscordac: fix missing libunwind symbols on linux
|
||||
|
||||
---
|
||||
src/runtime/src/coreclr/dlls/mscordac/CMakeLists.txt | 12 ++++++------
|
||||
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/runtime/src/coreclr/dlls/mscordac/CMakeLists.txt b/src/runtime/src/coreclr/dlls/mscordac/CMakeLists.txt
|
||||
index 71b69336e2e..dc3b79d6933 100644
|
||||
--- a/src/runtime/src/coreclr/dlls/mscordac/CMakeLists.txt
|
||||
+++ b/src/runtime/src/coreclr/dlls/mscordac/CMakeLists.txt
|
||||
@@ -157,6 +157,12 @@ set(COREDAC_LIBRARIES
|
||||
${END_LIBRARY_GROUP} # End group of libraries that have circular references
|
||||
)
|
||||
|
||||
+if(CLR_CMAKE_HOST_UNIX)
|
||||
+ list(APPEND COREDAC_LIBRARIES
|
||||
+ coreclrpal_dac
|
||||
+ )
|
||||
+endif(CLR_CMAKE_HOST_UNIX)
|
||||
+
|
||||
if(CLR_CMAKE_HOST_WIN32)
|
||||
# mscordac.def should be generated before mscordaccore.dll is built
|
||||
add_dependencies(mscordaccore mscordaccore_def)
|
||||
@@ -205,12 +211,6 @@ if(CLR_CMAKE_HOST_WIN32 AND CLR_CMAKE_TARGET_UNIX)
|
||||
)
|
||||
endif(CLR_CMAKE_HOST_WIN32 AND CLR_CMAKE_TARGET_UNIX)
|
||||
|
||||
-if(CLR_CMAKE_HOST_UNIX)
|
||||
- list(APPEND COREDAC_LIBRARIES
|
||||
- coreclrpal_dac
|
||||
- )
|
||||
-endif(CLR_CMAKE_HOST_UNIX)
|
||||
-
|
||||
target_link_libraries(mscordaccore PRIVATE ${COREDAC_LIBRARIES})
|
||||
|
||||
esrp_sign(mscordaccore)
|
||||
--
|
||||
2.50.0
|
||||
|
||||
-26
@@ -1,26 +0,0 @@
|
||||
From 393d224e7b05c73baf9f5d5130d7c9d15c5fc526 Mon Sep 17 00:00:00 2001
|
||||
From: David McFarland <corngood@gmail.com>
|
||||
Date: Fri, 13 Jun 2025 15:32:52 -0300
|
||||
Subject: [PATCH] source-build-externals: overwrite rather than append
|
||||
NuGet.config
|
||||
|
||||
---
|
||||
.../src/repos/projects/Directory.Build.targets | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/source-build-externals/src/repos/projects/Directory.Build.targets b/src/source-build-externals/src/repos/projects/Directory.Build.targets
|
||||
index 5b374f4fc42..9ed8cff895c 100644
|
||||
--- a/src/source-build-externals/src/repos/projects/Directory.Build.targets
|
||||
+++ b/src/source-build-externals/src/repos/projects/Directory.Build.targets
|
||||
@@ -101,7 +101,7 @@
|
||||
]]>
|
||||
</NewNuGetConfigContent>
|
||||
</PropertyGroup>
|
||||
- <WriteLinesToFile Lines="$(NewNuGetConfigContent)" File="$(NewNuGetConfigFile)" />
|
||||
+ <WriteLinesToFile Lines="$(NewNuGetConfigContent)" File="$(NewNuGetConfigFile)" Overwrite="True" />
|
||||
|
||||
<AddSourceToNuGetConfig NuGetConfigFile="$(NewNuGetConfigFile)"
|
||||
SourceName="%(_DependencyProjectsPackagesOutput.RepositoryName)"
|
||||
--
|
||||
2.49.0
|
||||
|
||||
@@ -124,13 +124,16 @@ writeScript "update-dotnet-vmr.sh" ''
|
||||
gpg --batch --verify release.sig "$tarball"
|
||||
)
|
||||
|
||||
tar --strip-components=1 --no-wildcards-match-slash --wildcards -xzf "$tarball" \*/eng/Versions.props \*/global.json
|
||||
tar --strip-components=1 --no-wildcards-match-slash --wildcards -xzf "$tarball" \*/eng/Versions.props \*/global.json \*/prep\*.sh
|
||||
artifactsVersion=$(xq -r '.Project.PropertyGroup |
|
||||
map(select(.PrivateSourceBuiltArtifactsVersion))
|
||||
| .[] | .PrivateSourceBuiltArtifactsVersion' eng/Versions.props)
|
||||
|
||||
if [[ "$artifactsVersion" != "" ]]; then
|
||||
artifactsUrl=https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.$artifactsVersion.centos.9-x64.tar.gz
|
||||
artifactVar=$(grep ^defaultArtifactsRid= prep-source-build.sh)
|
||||
eval "$artifactVar"
|
||||
|
||||
artifactsUrl=https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.$artifactsVersion.$defaultArtifactsRid.tar.gz
|
||||
else
|
||||
artifactsUrl=$(xq -r '.Project.PropertyGroup |
|
||||
map(select(.PrivateSourceBuiltArtifactsUrl))
|
||||
|
||||
@@ -220,6 +220,12 @@ netcore_target_packages () {
|
||||
esac
|
||||
fi
|
||||
|
||||
if versionAtLeast "$version" 10; then
|
||||
pkgs+=(
|
||||
"Microsoft.NETCore.App.Runtime.NativeAOT.$rid"
|
||||
)
|
||||
fi
|
||||
|
||||
generate_package_list "$version" ' ' "${pkgs[@]}"
|
||||
}
|
||||
|
||||
|
||||
@@ -11,28 +11,28 @@ let
|
||||
commonPackages = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.AspNetCore.App.Ref";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-DF9lEJjcAAcQtFB9hLXHbQaLW82nb4xlG9MKfbqpZzIQfidqcAuE2GOug/q6NNDcw+N88J0p0jKPz+k3qKmAKw==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-ZedqhbGvDx8Ajn1N9SRKq4q/m7rIQdPmcvQS7WOaijpqqjNa4P4zTd1kx+/kb6a5FJ6thD6yt/hEADTGpUpflg==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.DotNetAppHost";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-SV9nyI2/sg7Rh3f01eDScmjKYuuzI6xPX+iknl2zsecspqYBlWcPN1SvMDlaD/sK3GG5jl3hrM/GcOIqMpoFJA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-OcQqR5UG3AFa0aQNIRTB3acRpQ+OhuF8ZpLIQM3xp+egvzzKRP20jja/gWhngIVtEA012XxLiNxJrHhzWhtLhQ==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Ref";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-npMO7GioGKn0FigriTOCsi4HgSENnW9YRJYXhyFtCGLR7b71FDLVY8nHemM0XYm9lI0tH23N1EwcDFyzHTDuNA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-1UT2fr9kFvdpRb3+h3dTmGTnhKTvGKpYFRQuZUD8ukmaQ9ABhnXp35E8GJoA6d6pOERiRnhimzrVg/X3B4znUA==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.DotNet.ILCompiler";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-zDr+tWvnlB9iEwnAlfa3PW/S1/0nw1lhvXBWghgE6o9O5sxc35V3aobPAs+Cm6DTN+lvNMouhjPt6pn2t4PvQQ==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-Eekoq6ATo+jeIsK0GafnGK8XkdjKtdOVT7deD1TWo04/nt0KV7nOmBUOhwUKY1sBsjvTQvOoDthn505f74N3Vg==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NET.ILLink.Tasks";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-W1yNC4+7vV1XPSXJx7HFsvFCi1C1XZ7QVlfbu+xq4pt1/0cVJGZaRlbwBNUAv4PAdg2JGM4VYtcr3ZreOJ1hzA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-pX4P7NG1jHIRJrbHrVP/MvDyA89o7HeuKucToiIH6flQ5ixTntZJupIW5qg2wsScJOltfP3A7j/w6MTRA9dHOQ==";
|
||||
})
|
||||
];
|
||||
|
||||
@@ -40,118 +40,118 @@ let
|
||||
linux-arm = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Crossgen2.linux-arm";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-IKe0SROzAWJiFZyh2KVmTU5i8ddcEqvr5NIr+3RfzvBEYa3SNBbqy1W1x0TR2aEvYgSqxKSohhs9YVSDlrlx0Q==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-ekrR6F7cC48jWc0+Fyv3emOc5bkuv+yvKg2ZDjuv9gRf6e8zWGG6PkXKkPuo8sxHacPucgc1bIibVgVGJi20VA==";
|
||||
})
|
||||
];
|
||||
linux-arm64 = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-5h33Uf2vFcjVkeNRD41YiERegQ7twv6sljYAMtz/kIHcIk90aB0ztZoKXXVi+vNxma7q/f5oPxhzUVidZ3vw8g==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-QUg7nZopW/0+Lnk4VeNHF3Ov3I6IuqsDSbvkeEDWjWyNXyOnJzDErKN3d5p6jWdmc3jjndyOw1137vaOKV5apA==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-yImkb4fnUJIXR2Me5N8eOrX7w9+u8SAAIp8QtlWdZ6WptjG6PUByTs2hjTfX/aVKjO4p1dmKTaWJ0qYR6yuDEQ==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-k9W3fq0DjcbjxuveOQd1ou8fsHhNH/zHayPE9b1VRj2CijLx8krGGKkP3gUR7jLbOE+o9/Xln7cEsWzRBb9tdg==";
|
||||
})
|
||||
];
|
||||
linux-x64 = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Crossgen2.linux-x64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-1FIBZLtWKIxULrRjLrldz6kwVSoAIf72kXKE0WgXECVez98NbQXLEM90hfpHj0LcQfzqOoP9kY48yRSoXp+rXg==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-+zsgGnlZS6MdL/uyvAQAN0KAc8Vk1qT8ylHCi+iwUXqwslSGtZQku+qGvkd7hjMMnEbnSa5j7xJY4PNGDbco4Q==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-eMokXhxbTVJUHwlAhM1dVZmjljs/s1nRfvrJ0AeJaTbetXnD63Fd6sQeMmw/EifYnpdtxr/gIJRHLPsuLNDcAA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-+LG/u+Jp6b3Oyud1QYP3nph1uqtx4rhPbeH65leIMSFQg6bB8Jd9g4hNwESllHd6iKpKP7Sp17VxLKynzxwHDw==";
|
||||
})
|
||||
];
|
||||
linux-musl-arm = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-qw5Xb2+l14q+2OSesjwGn3gHpdFj0wUeA3RLEUaljzW8FF5HD78B6t1YuhFJhcENuDNAv5d8Fcy4N1mG/RQZUw==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-BE7hZwP4oZ5Xacmhjwc3Ciy0KJKOXwg9NJiBVzFv7xEJ7IqVceP7kAdMPsMNoojwz2KNs9gJdCOGOLtwyeTZyw==";
|
||||
})
|
||||
];
|
||||
linux-musl-arm64 = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-Etq6qbPIzEV8Z3+w0C1ibreDduKkAF1zZOGfvcBz3sjAC9sWs/qflxfKGZ7tBKhEV/A3vZWKNGyxYKnawCtC3g==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-oskWoBpDhGI4WBOJPFTBIirjUdSs7hvHKGuz8OQmrByyv8C3rY9jtt+sM45uqINoGNyYsgbUQkQlKFhIB+mT+Q==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-SINZNHzxrKbgD7VGAx9GDMIlMOmXSpqWIeLpmNpPTm2D7F+NfXv2lVLxLl0nLUAJ70ipI51HdHGyrKXTOaFO8g==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-+/apDtwjBvmEn40DJ4yPOYqCsgIfhrD/zPYY15A6ny5kN1n6uV8LgUce9vv2HatRsD4uOuepD2z22/TbB8GjLA==";
|
||||
})
|
||||
];
|
||||
linux-musl-x64 = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-t2YTlMAHq+V8K8TnsFhUudCqiV5CElb/dk2tFmZ61Td4gyLY/iz+4q5lvpGAZOlCFddTtublSbIC3n4EH3liEQ==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-+uZHCjs+FlbFU2StjeANC3vvYjWd+6PlhIX0F8sHS60u3U9/HEi4JECQ0vhak5ODJCi+wktEKZQ53DwGAvPbJQ==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-lEaH55DO++s5EKEHfODZkF279HI5DROQgaTif93wcMg9mhL5kPHnLhi9S7qTMFKt+GQfmZWMlwZd+L6GVz+RVQ==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-mtm6VWoDGYg7qlqF6sFlf8LBEbGOL6ZCSoqzZ7hmDBy9UIe0AswL0d+AhsDOE5ewHifbK+vGqXeK83ZdL/1IRA==";
|
||||
})
|
||||
];
|
||||
osx-arm64 = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-zuh5p3Hq0ejcgbCe3IaVOj+mItbRve25QdIXaGirOfDuO2a5fGXSO8RtgFosw8ar2jBSG3qL6loMFqqgkiEuVA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-/X/ugPn9DMhWz26lDvuSlBqX/s56B7Sl/Qkd2/Jy5iYw64+9tOFo0Xh4kz0fF5nOj1H9RbKxIaNfPVc41rxvIQ==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-Ivl/uKKvVrgGxfbC8SSz5N1NZRi39PQ5ZXfsECiSsiNR2ls02Wy2Icy5mLRUGCFY4FMILAKsgfJRKejafqGxyA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-/SiUD5N7pwkJ4mK83CBkre6oOB76BTJ7lJUTDDw3t8F6HUJS+3i6Cx9sODd7BS7TXXA5ahql2gcfohVsaFsR9Q==";
|
||||
})
|
||||
];
|
||||
osx-x64 = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Crossgen2.osx-x64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-zTiRlyK4ElT/MES3AX1bLRcuX3lY3NXlwL89YTyEjuHrqjCpxEbHfsoznqYd7zLAF1itzvNnxDkqDPoXat/zZA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-WKqXIohGOzMUpDOsAEpknxj93fSuTzSdP7X/Ud19dggmqwPKMIWN5NZpWlBLdyP8+NMwLyNM/aR4uCtNf7MT2A==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-sSi6F1x2UVJe5Jp8RbURsNGVxFFPyxq6P8ZlV6r9dimYM2KkDyEOtcZ0hHSOtmMU3rghzZYksvSKv7+9fAYUNA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-GQokK1ugeF0JQi0IfkyNDm5nIVCKpH6V8zSskBRSAH8O5U4iVImpDkqBg1icxUFIAaVyiMi6GJB0CkTD2cC+yQ==";
|
||||
})
|
||||
];
|
||||
win-arm64 = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Crossgen2.win-arm64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-Qj4yn5t5k+lGY8dBPwh0jLQOXoilcVvwpmyxJp8LJHoOM8EmGjRoiCy68sRXGTQMt5d3iNIdV93rX+fXu20rlw==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-X15A3yBhigC8T81Ut1Zqqay9HzfCjjwLh1QDbHL2XggIWiGzkDf4hSX7qnkbki12DdFZP5p0xDFiYsnEBTGNgg==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-b26YbRN+y0LrdVq32iV7gUmi8sY4vY+P8GvaqiPTcJBH20OSfrsvDhyM08qMs6hCDo17xL5hFdLt9BSBfqcrOw==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-vNMheP+ysMxIiINElw4ebu7O8KHDz+l2dYTlP9zfBllo7eJW3XX0k7kOP0nYke78KFhheXu2JUHAAEZVhazOUA==";
|
||||
})
|
||||
];
|
||||
win-x64 = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Crossgen2.win-x64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-IoNNvrZ/pKBwn/XSvDp1saM2XHk1ZOKxrA4lDyrL10/s4IS8hRo/Yv3qs+ihWpwVStORW3lh0YIxQhMDHbMkzw==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-478qsicUIxQcpq/UGGoNNLRbUldl34RRZqxDdRl1HqC2D4aUdCpR3MEU5vd0zcbHxkegfPfgQgsv6xfIt+k/Ww==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-/D+xqMtDuo8ji4FPJm5EsEORBGEsbcHHYIjZDiEHP7ltIexg/oOSwuyvepvV+mK46Q4uyQU9zuBVZaG5FdKU0Q==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-fDGfrQnqXasfMLIUs2xVvLNxWjN0w7HypZ22wYG0y8PkN8u3vpVIQz9tYgUgEXvxKpFLYq1L2EcxksY6reAWug==";
|
||||
})
|
||||
];
|
||||
win-x86 = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Crossgen2.win-x86";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-kEXLQCzNVAnwkQ58qiO7lUOuO6WJSMlNmnQxx5o1RTiMIoqrgfjMazn5bpL5DPeZjMhWcB4kary/3Vkj06xRtA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-WE52ljXg7k8/ry1wBJ7lqrKniEZgwpMtuf7m82tMtuc30k5X+1nAbOa2evezPgjsXrB3k78uertzT+GoSRX/fQ==";
|
||||
})
|
||||
];
|
||||
};
|
||||
@@ -160,361 +160,416 @@ let
|
||||
linux-arm = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.AspNetCore.App.Runtime.linux-arm";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-z0RiU5O+4aelPS7+JYakKFXrmczOzTYp5sptrRoz8H2zM0Tbvwc7sX3pT2F5ZosBEaub37XJKrwSdvpdHoe6/w==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-TY4LXwPBf9d0vOpzCkV8Ze9e/Tnn4V07FkSctLB6Vc6XreNkVqEQcB1TuUQZOFc7pXBvpImRAD5mAfuLVNohDA==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Host.linux-arm";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-CRQl1RVkbfaLnYOEO4ApZ6Py1OG8zJjwU0UkAcIhg7MqsGgZcathISOzlDYayxqdbp+Gga21aaJJZbL0TSPkdw==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-UBWg0zDyYiiy3wXtxmRqaoAvi2hpXGGJ4VxoKcqgD927ftcYXz80g5dFDtk8zof3CVnfXHgaDCm40jxOrYU3qw==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Runtime.linux-arm";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-UjSZtTgg1EEmNJeI+Esg2pMNjSb+lCy0VjwkUIVUJA6vezRNsb66NjsO5h4rvSMS2VhoKWGc7jbNV1AKRj891g==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-ZHAexbNsU0DMvR9vVqYldw9m+wyqLM5AVZyx6E6Lgk5JzjgDI9rFfDI2h+UGi1WOJyKPDKrjyLWG5phtGC6ytg==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-h8mVEj/5JRPzKcDpoHvnQ0wt7nn7+euuPKLDtWH4yiAWztH8CX6udfHqjIE103USfpfMKEEcEWRqOe877rgp2Q==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-HmKdrzhgbW4ikm6lKWgaBm5OokH7aPyGuaniMHvRKnHSeUxDYMj2PU/ZSIlIxTntxELeTBd+ZcJlknJqR7Duuw==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-arm";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-3WlHMaSa60X/owt47VYhN/RYy/98jKjoQtzW/FoZUfc0E3aCN3pJeUGbEq9NrNLfu0XbEriwTuwVG6zyI0rr8A==";
|
||||
})
|
||||
];
|
||||
linux-arm64 = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-rXmRirmXSlmvrc4lY76+eK6UoXIi78sUSDggleEYs6Mwip1PWWQ1bg2Bi3tpxcRgF1MBOgHhiz37lybWaS1y7A==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-bPfmwsqmA39Vfa+Uu9mH1eaCJZo/qd+/O0aOYRhjSrypYBQK2AIif8lq7zYxhOR2U5AhvkkeqLNnaEC3spTHiA==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Host.linux-arm64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-sw5cXyvNbbXyDkmnPJqNgSnOeDFdl9VL7OfA4kA2GcPCujXhnElVmF48rwibVtoYmDUe940zKPjUAeuXmmOH+g==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-OSpFCcAHBwfDK4bY6zNDfbtY+fKY6koEgvfVyk6OtdUI+dOM/Jjw9Kyxiqe1S8JC5dm3366+AFdqF2ZWbMW4fw==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-BYeSSlt4ck/kK7L9I+OYdI+aklnF9JDNaHyIQ+nea+E/e6qqENxlgDPzJKwTKAX4XdIF7Rc/Gk14PuYBpC7+Ew==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-gFoRuWxJUSjqz8meGfPQhK/xI8LXK0/z2mOiVWfwFBO1lMuPUWFrzlUvoPBHhZSYj7578iHtUog8r/tnnK6+Bw==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-poxX0QwFAsVfHDfH85V0BVd5dEtlhr+/3rPhCe5qhkFscmUM31BcD1ABbzdxYt/PRJKnKMCCA/tOHhMU5rUieA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-BLvup3LOAkOw5G/xJ0j9pcTNNQuPLibW0u5bTVAmMYYZny8b39xNWWVqNQ8Rl5jewPko/8luoany0SbHZ+GUpQ==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-arm64";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-koC5WN2WuOaApo6XSGjcdWKUhR94/7vZUiQZ9XKemdGJ2rpjgAhGvdQr0PcNqyTUDd+vC6LOsWjwwqg2GSHYnw==";
|
||||
})
|
||||
];
|
||||
linux-x64 = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.AspNetCore.App.Runtime.linux-x64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-kPsplrPdJ9VmThmB0kXTumkVG0WikMbkSRzGVyNU/Ploa9Cvv80PnCxF5VBAqRV1l/l3qBq9TZQV+7c6mIef9Q==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-2NeuUX5T7ZRuc76byZXf7cLXYTK5fGufEbrjEXRlBMXyI+vQ8x+6BR+hbqef9JGylT8pcLv+xL11Gx39vk2KmQ==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Host.linux-x64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-LOoGtTUAg4/m9912v1s4yvh/wx64gRW6+052ZpHphizEbI/mvy5MGZpxS/WQHX34+RDXIG90CpdT7caL5iC1JA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-iZO21GJ4K+PjcH9Gn/OUVQrBkkfCVCifO+PsQItVuWuenEOwAShzCfz8E5icd/INLIosoriCyRV777jpjxHZXg==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Runtime.linux-x64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-t10QcEDpbrSvoe2BhUCtqOAqfXayzy9uujpiIeAdOyptGmBppA37G+F4cCRsIx6wzhCSrdPkYoh1KzD4rqqlyA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-SAKw8xQa/VBWOumG7JmId0UIKUs2RM8tnl3KPXJ85mjnrrP3wJLWynNf6v/hMxdxqjAOIb2Y6AIGwK4zFzA97g==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-ykHn7VUDn711h67XQd+nx5Tn0L0vYWQY8kKWqqTXm/mBEM5CjoMd9qft6jirusGORVxC5RAnUENDt5n48B4xfg==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-PTVNAmlIQRHnMCcw8Pm5+t8eLLtwyZ1J6lUjTcZ68dU9FGXIySRr750lekvMpBugMjmXIsNw0VQvg9AnL5SIDQ==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-x64";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-cMnylrJR3P9phPos6bJJDinj8YO7eSeYxUijvcDHhGPXXzpD2aTZh2anv7WOSB84I21xKCpyjjgdhcdPgTCyJQ==";
|
||||
})
|
||||
];
|
||||
linux-musl-arm = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-6G+05BJAEjErJMixdkEAndBjgaCe7WmasdRypKPtYRfzvPVExrq/nak0ZiaJ0Dd3WuYdbi69Qyeuhj7atnAImw==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-VbIqcklAsQYAAV5CTXo/6NAa6lkirCeh1XF7Yo2D6xZmkwLbQsKfNF1jpiwYr6luiVwJCkIA6p/owsPAZT42gA==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Host.linux-musl-arm";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-xjepU2UUYCP30YJHPdX0PN6C0ZqP2RKAEsJWpnNSlYQ8fcDHgy+l5ZTQPBD4egfWKlPCEtgSZod3p9nTggSoDA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-H5a0wdzBU4tWXtTkYcgHsezWolqD59sDLSlDdOGE/OF7p3X1AijCo1BKCb/ub+Qn24dXoS7RGQf4TwmPP/fDdw==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-NORvYn5NilmBCZzLwrWXEPI7WeEKKwIHzh5USjQHQLsSoiWcOSZVKQLkqK2baSFjGktLyHmHRUQ6VnTggDuPeg==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-DpKE33FA9NYJXAY5SbKcIfAvU5RyH30YqhCXxHi/NYfEcR6e5hrzn4992S6TpUQzeYHeJHprfXEQGK+x8bWTqg==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-tMM7GajJVqT1W1qOzxmrvYyFTsTiSNrXSl0ww5CYz/pKr05gvncBdK0kCD9lYHruYMPVdlYyBCAICFg1kvO7aA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-prERCrIwyGg735ahEDi15HwriaDnwZlQidlFkiDSOuh4EJTXLqbYvwJxSygCNIgKAivNEwt5HuqAR0WxIzxLJA==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-musl-arm";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-SvUcMwIUDjSW7wIrQEChlhqEmSWIhruBP6pfvPaWu6WI4n9X6PtPvqyJp5dza77GATyc5i9sjECy8HNxRro07w==";
|
||||
})
|
||||
];
|
||||
linux-musl-arm64 = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-wUU31YeB3hCc41XTTSXbhuYKKSbFv3rQb4aO0d93B1m8xPZfUpYA121ysuwaaiPgHvFK27wfYBHAAO82d1Tbsg==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-gI8nk0A8LtN/NXufax5tgmoxnAFvG9SUA+yGfBz82HlAvwZkWeQsNjZav06LsIdBgY+34oJqPfhGFWki234b3A==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Host.linux-musl-arm64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-eQ28Igd0kDwNnBeaXvQul2U4Za4KTkBJ2hF5gi6/8xL8tJAIvpSiuHrcspBB7oqr9/uOU6R4eR7gDmOH0OVRaQ==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-6deTINJifUd+6BioAPScqa94hbH35wweO3UazZ0Dob4GFoSxD/z7jUjRIib/HmyhXz+F/QMOZapPNN+qNsmEPg==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-zHJSkQl00ygE1BBWjjSZgQmT+rpX/ZoNvU3az2Vfk0D9tqM4+zQ0M0IdBw0Eu1Wr46LeifWIScp4pTvzBB0R/w==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-T93T3DT3SakSQcwaB9SFTT6R38hEh0/52bM+4IqvFAo1EAKx3eXiKezE3bMSjOGKHxKzb71Rp1d9Jflv6capLQ==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-RaDmfdtde+m27g31HXvBUJme7NUUT07bv5+Wp3mPH/FXE6tT8W1DvG9XNRcT2rIEDq24ktpfyBiNbN8fieBfqw==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-dnHqxZvkLe4SubfrXiPhb08qkj2FOrdCBWLHo/Hd+pSop3C86rCTRJY454LrPwjnktjnQf/X0b4anadwOkckrg==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-musl-arm64";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-ewu+rh/Kky08pqSvyC33WsqopzmUojhx4NZRn5bFF3pcO0xbdhOEBuZR8ZQspXA2tuKL/n9bAKWDIPsVdDMdyg==";
|
||||
})
|
||||
];
|
||||
linux-musl-x64 = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-723qKUmFeBKN0yfsf9zhP3k5ZKqK4UYvdKbDL80oyhzm4gQZ6tsUU4fHeHjJVJfqyN+wKS+R0WthyxhA9m07/g==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-8r/yMsXff3vlFUaRzlHKnkd/qxmbo6FzATU4d065j8YTNZcduF/uKiOKijwXSd96nj216RjCUIJWrcH72c5H6Q==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Host.linux-musl-x64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-hPcjYztP9miyYl+mqvTqoEqaa+fp+kCFVrROIwUEDBMNs6Urk76qsWJWE/uI9kLBh1zTHiDsWlXDiOXcftVBxA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-D6qubx3bzbfdDMJw1CcUJdPR2w2oHmOt/ur4q4Pi8cdFueROux3u2bcuurKmx2eZvHhYVKnL1njTxWDVHUM1OA==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-IG7yOIrrLUvA22aUGR7g9VtXK3WGCsID9TokGqET+LoO4QTLlFRYjbrsUkvttuGUHftOTgDh+4abzkcqaTfd6A==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-neXYzUGCn4zBhHa4+9NgG6c0ulwsfGczrrH2hqJcwf16fNtBgfe9L+JnwRctrVVe7iOci/qYh69c36OlCsREug==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-3PwE2oDr4+n93nPZbHz1kgJkpdus91UR5IXKnMWMMxcEq+VgNvNpU4+M+khwPOXSmxK9LY6dsd9beQVIFtrDVg==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-D8SDjyznO8H+3w5eAuL1pl+JZ+4S8eXM8gIMuNaDXvBZv43lU2by27Gk+Ue4eH5zV+462fBtBvqZtaETgfPsgQ==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-musl-x64";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-zPgYi5k0qLWv1+BGxMmZnNplAa6tAnTpibzsSQTCcSmLJfazFww4sRI4qFYZ+H8/Tc1jVyIPHu3whUL3UirX+w==";
|
||||
})
|
||||
];
|
||||
osx-arm64 = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-QVYtaGiLQ0bWTiav/cc2Ps+PQ9co8EmTW8NAzlf835camz7gdjZHKo5/z4FOVUHVftCY9vn2yBuBcwceI6f+Bg==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-vk6trHjpJkCveABOceuodbxeAefojPqaUCGwU6HXinNgu281I/iEF7Afj6mJBLHxaPcvlFQjAjbRhll1SwcSNw==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Host.osx-arm64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-4ktCvzYslGK2G2CLPy4As8rbHGPtQw0RA5VC9WxRmRpDH/3cyicFbRaBRVc2y19p0tV9nMC9KdaFyptm80lQZg==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-r1LB1Ilq1/Pf71SubpoHU53s5bjfHY/TLQUhG2R3AGFMe1S2J6H35pkXuCdwBH+x99AX4khX1zw00BCYP5liVQ==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-MPUbFdcUXGrfUpdNmcPvq+EdaBLcl+4+nsbUwftOT1041DpIUkFfDzgWNWVMjPG3Prf3K0iKPtvdKx9bdUlq6A==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-ovDMqhvYv4o6P/AjvAh26EcSs6auYHe4YBgWF7SBLgB/r1xOvjlRZRuVL7znu/js0CwTH7h8w/YvW+q1+Tzw/A==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-CtxI7P/Il0bLfPXN6ofeL4Vm4ISp3TjvRBZt8MkACaTErFseNiwIIAKNqZ+d9lIxj1MDGA5fCfVn/0PsGIksRg==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-K7jCpNm0lYr/dHheLoaPadsd9q8oQ0X+iK/rJkeKrZ76FLzAvcC1FqX9yXICwAW44m63bXcmg0ggra1+yXx0/Q==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Runtime.NativeAOT.osx-arm64";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-HAloa6WZYn4LvTyANZMWs9l5q8NR0Bqvs7pGKKarpE2JnmlH7R371+nMg20Ejxw9UYp0SNNZ775dw83G/WX/oA==";
|
||||
})
|
||||
];
|
||||
osx-x64 = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-p18BC5bG9/0ktSBUvxZOqPpr9qkS0Z6G71GViCAzjtV+fBllt6OE7T0rSvOZ14FjZFcSqMA2HZ60I3H93cK6TA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-R7g8lya69aqDY/iAIIoX8TnbxEJxBIxvuqD0zrcEuJgRh33b2xys9OAT2NmyZH3GWdTZ5UPiolJ2SifKNE1ztQ==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Host.osx-x64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-T9Rhlb0Ivsaev2JNEKRLRoc5pyowBy+meS7GzijwfHOEviRw2rMpPNK+8DoygI8HRetSnjLghMlzdcfURF10LA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-tPbKNB5TVRIAHyts6RMV2AP7pnmO/1MRtfTByCqTkTjH945dJ8+2r4ytMIoQ3ooVLi00yll9w2tDL+XnuNT3xw==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Runtime.osx-x64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-7SI6G+CVFjxrcgJny64fmvOp4Pz02EXrhlKJdEKoht+enh8c/1pY55cgR5jq9GWJ9iJNtV9/sDUiADK74NWWKQ==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-W18K405wGThiTnn12Mi0K6KXznjPZX87mX9APiq+nbKIsMmGC+r7cyIPgy9hmggnTb3qqv1p/0PACRD6NXm0CQ==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-ui1NVLgK7tEN1Xv+MO8FRovfg1OR4sKGf5GXHz2CN88GLkzznp5m9sSAETN2IPueRV+aaQ8JFaLEEw1QOdlh2Q==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-K7fKG8YuufAgq6VcvotJH/D4uHmcjg/X9TwWq8EmbyysqyNCuMkg6a1torpyaomdooKSZ0LSOodqbo57B6jERg==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Runtime.NativeAOT.osx-x64";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-AAcenMQyUXqNewaFwVv74m4OyOy4DH/seZDjjmMtE6BcYchYlWjJjU7Dh7lR3qk1KFuRBdeIvLHpGUZS0+GcqQ==";
|
||||
})
|
||||
];
|
||||
win-arm64 = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.AspNetCore.App.Runtime.win-arm64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-kTwrqjATCL5woNksB+G2B39lOIUkxLnouFruipzLnsDKSxG50pKIhxWUkrwTfwatL/zQasE+aVlwEfSQAxQteQ==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-alvGXGuLfWb35dOybu83zGbH9VyIJRf17FEhF6yrNGvg8gJ3SwpU/N2uGnuxI1TIb8dFlKq3FoE2hqfxWAERKA==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Host.win-arm64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-86sGYDN7tFGBhAUacYgosah0TTIMT1czQtKHb6vKXOGo1wWAYa+MsGXrdUA6o3rpvybL8rbRANQ1tarIfui4Bw==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-8345qvf7b3Q8hoqXErpJTWQeLmBV3GFUNa/hp8eCglnY5WWbnfd/muQAdA5zUoOX/8fMA4TILhZx2K0M8k1/mw==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Runtime.win-arm64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-VkXVbi8EbajQYu5pge5VCXxWGhHJtLivHM+rqHt78b8w2IpYfRACV7lqEU1COg9D3sZEG5oLOzKLCCN7lSiekA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-um95x3i3Jdyat4T6HTXP9I0STmsqJyuTWmZwCg/5EPNWMX1fm/OIFIoUQ9lX2kplPyq6Ys0hmiBaVcHOHGThgw==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-CUdm0Uw4kGSk6oVm8QZLSwxngMFmbNoiFXve2hT0/Csu4mJe6ttV8C/Y0VLPBJr3GmoovOzMeH3coQfEf2YvBA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-LneCr0cNCIEYVfDI2Ab++j+baaKut+pqTsCb3R9FAp9pqYVXveSEXn8V4xx+N0i//SQx4i9Dkd+oYGERun9k2A==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Runtime.NativeAOT.win-arm64";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-xgYN99ynL4a37SaZebTPpeiui+2OVxCHFfPrW5vBoqoHLvAxhM67ZpqAY3zQELjS4Kb0ZxsLfOS4OPFKbcweSA==";
|
||||
})
|
||||
];
|
||||
win-x64 = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-kV1DnmxJrCauIvUfNe4wC4Yi888dzxxf7sYT4W/apnCSHvcjueYEZOGtoLSirsJJrn5aj9OeFVz+bAbd9nurxg==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-xr4GBhH7aIMfPXjv+CuGZI3h1PZc+yETwn3/9UMOXXNxgM1zrkCR1p4I8rQNpwVPd440P8pReq2AWrdbLX7kTQ==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Host.win-x64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-XsP6i0SHVuDjS0IWBC+/3QXDJO+3ARuFbPSu9fRjR5NkK5/A4lQpBWJRymTzqWHzmD0DLYMEfwR+3mdG2A/StQ==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-slvRNr3ZPyyGLrOFEPVF91TD6BJcC7/UKrowVg0XGq37IxTeicrNLhs7PE8qmVGBgUTiKcqxEU7DXI2/qBh9nA==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Runtime.win-x64";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-UsW6m9/wuBUWM8SU/PHsn+9GQMRp4i00KfWDzE/s6rnCs40WRvy5Zcj923XMy05Bt04dhSrOOmDR1/vkydaysg==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-1JBZRsQMZ4mCN0rS+F6wwP7s7+es+uwx6hG9ubUuccJYjCEAWwDg3vBVAbQqwMOF9rdbqOLFbkbvawOT7BHAaw==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-Btz15yrqllW8cQ82bDOMB+fo1ONv4j+BvpZGQTt4zwqgyxq3qznnxVHrMxiG+UUwhDlD4ajCGYuZCjHECODTHg==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-8fiTrOmlVMojv2oFxSO4zKP0Mz+3HazxfqBFBbgioN+/dMNiCa6ql3Sm0kp88Qmfcb68PwhWCJLy3x3XHLEUuA==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Runtime.NativeAOT.win-x64";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-m4+5c4eH8FsloMih4Pl/Fuf5dVljpTasP7wzRjn5UAt2M7RdQC5DbC3ZZDTuDSIwuDVKXoLzUbDV6ui5SBJ0mA==";
|
||||
})
|
||||
];
|
||||
win-x86 = [
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.AspNetCore.App.Runtime.win-x86";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-bVGv/VP4T598HMR97vrcF8NxOv43rTn4RtH5JSm/Z/I2l6Jf4OsEmrP7ciCJho65xgG2NN7E80dAfv6Waan/DQ==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-t0G1lpmSy3Bb/0k4riHo+oT2h53IbHHC92oy3Mnxg2Nm/ZBoGDW55/maB5lF+IbEoNsScpAhsFNf7gAv5KPOhw==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Host.win-x86";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-OvOg+DllupzQyo2AiWJOWhd3G7sXoROVbGIbaO48l3cXJf+EkT3mwK0WyKNJo1SYDBSHP4PL3CELLyl7KeuBTA==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-Xgu9wAHojyPC6/9OhNk4Bpmhmb4FAcJMMb3S7xwwPFuEx7pKSCPOA/3Gv/8xR3w3lYoMhvs94Jn4zzLPw/d46A==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Runtime.win-x86";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-di/eQOCbK7Gckc/GaFEJbeHA8xc1sjPYb4ZgSDQG8s/lSc5EocnPG6YSiPu5noCS/kl4caLJzu8mcNEbHo9fQg==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-FDFqh+DYEYnPZjLzODbygevvyrQH15WVg/pcDbiFlE0dsoL7LQ3ST3G6Vz5GfpAZyO0A8O7ekGOH81+wskmeiw==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost";
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
hash = "sha512-e4ZDOtOGLbKnCy90C+6+pAtkX/CJlAI3dPV3zF8Dtk4kCG6m+4TnbohG8z+CBaY4Tyh7HRXfCwA0sMhkZIhJ/A==";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-npZ0pXzs+1mOb/G8asxE4QYUrrQlvuVjO24sgaqgQ/o8Ir3m1jTxXhETRj7IXKiPiVMIaLPV+c3XtpdDKouH9A==";
|
||||
})
|
||||
(fetchNupkg {
|
||||
pname = "Microsoft.NETCore.App.Runtime.NativeAOT.win-x86";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
hash = "sha512-7mbJh2PmKeWmniK6eOPGC1RZ5MGgLzf4czbisbCrCvw/wS/TXlq3kfkmT8sU+jjQQvutRbNXCES8HYK4vuVaog==";
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
in
|
||||
rec {
|
||||
release_10_0 = "10.0.0-preview.6";
|
||||
release_10_0 = "10.0.0-preview.7";
|
||||
|
||||
aspnetcore_10_0 = buildAspNetCore {
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
srcs = {
|
||||
linux-arm = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-linux-arm.tar.gz";
|
||||
hash = "sha512-/mrP2TIr27NliznmIGDFdjriPeeSpDDbRyaM++1gNgJk55NQArHO3KgTMog2d5XlnTgkp03lH5lk3FQKgU2RiQ==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-linux-arm.tar.gz";
|
||||
hash = "sha512-lXwjay3tSsk2fperQsxjo28PeydYBQA552QN/aOCTlpl6/LTB2L8diIqgdGUpJ593riZcUo3vCjbZwjY1bGC7Q==";
|
||||
};
|
||||
linux-arm64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-linux-arm64.tar.gz";
|
||||
hash = "sha512-iGZ9ZtkKq6MGSfhNENBX2nwNtHnNs2t2gk3I4PAqRKa/XSaddNqg1reDdvLcZrYCOFWCZ1VeLO1Ay9BqrHRdag==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-linux-arm64.tar.gz";
|
||||
hash = "sha512-gTWO1Grf/RpOLglePSPWfR0ommxMUKsg4ecRYbKCPIxE3VpsJBrJs/zUoq9Rjb/7zNt7Os0HpCr5/yTF/WLGow==";
|
||||
};
|
||||
linux-x64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-linux-x64.tar.gz";
|
||||
hash = "sha512-FczqQ09eM7SvhyvaANMNP+5ElBE6Hl17HoziBqsKLgk4T6WiI6/d5LlOo7fhK3lsGkUTi+gzKIvWh0GuhD+2yA==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-linux-x64.tar.gz";
|
||||
hash = "sha512-9onzhvf6Vrm1O9fVEKvs8rnCI1j7KTZ4RsI/u6ewphpH2G287vlrc6corwduVcNGg4SXQC4M2AuGldncHqPCuQ==";
|
||||
};
|
||||
linux-musl-arm = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-linux-musl-arm.tar.gz";
|
||||
hash = "sha512-HArq8wBlBcK/tkjyViWT9iu3pVsAULbMgecK6cwaNcrbv9VGEXBaGwv4SYqqNV0DeEfJ6nqa2j9YVWiLpqYTSQ==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-linux-musl-arm.tar.gz";
|
||||
hash = "sha512-uJ0bnKWphyzzZ3dKLKUVKkLtht7MGMWTsQSINGPOXPrKamn5F0SaArTSXqQVj4IqNqwNZVxTjBhOR611EYbs2w==";
|
||||
};
|
||||
linux-musl-arm64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-linux-musl-arm64.tar.gz";
|
||||
hash = "sha512-CH7Qk+rFkx3YjOnIF1Q/rEp/sAcF/+cet1U6/QoVtQfrWmO46FDhT+SI3t17OaCshkmaFU5oSBWpnBIjr1NJ0A==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-linux-musl-arm64.tar.gz";
|
||||
hash = "sha512-cAY0HJWlGRCm7gLVgemkHXZGSn777QrXedDmT8DXfEK70jNTf1fXb28P2zh/biVZK6UzYmcKXm7+1ho3TkIc7A==";
|
||||
};
|
||||
linux-musl-x64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-linux-musl-x64.tar.gz";
|
||||
hash = "sha512-bU2Jk/BySlwwy7XDR9ovxoct3HUdvGykOI5/umDVFiZhk5g6mErGv+h5tEh4j3e6+1C5mWfe+6QD9E7j/ycx7Q==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-linux-musl-x64.tar.gz";
|
||||
hash = "sha512-wRf0SCHNbFWna7nr/HRlYG04rInIEO4iSys6D/T1q/Ld27sZVoOeZyrrpPlR3wtax/GTXSqQttTc3cEep8M7UQ==";
|
||||
};
|
||||
osx-arm64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-osx-arm64.tar.gz";
|
||||
hash = "sha512-VlWHBJhm7w4JIR0SLJUOPYfzvCL/dA5NVQYY1ppidjuN12bBNcC95Px8zLqmTzMhQrSQ0P1ClOTFjimCB49yBA==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-osx-arm64.tar.gz";
|
||||
hash = "sha512-D5iye4E6etLrWkCOe9sf/97fheARsEmF6QCV3ikW2qTDQhSsPPmgZvSbPn7gnVbXP56aGFjHHv+JAMxBRf0yVQ==";
|
||||
};
|
||||
osx-x64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-osx-x64.tar.gz";
|
||||
hash = "sha512-c2tCqqrbhlRIvM/bOO2KlmCELsmPS4Trexq/E6imjPsWbx8dHZt6viROKAC0BwPUsxpQO+o2NZc5oEHjMsZSXQ==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-osx-x64.tar.gz";
|
||||
hash = "sha512-FQLipaTYahQwhA2TGknRX/07ZEZeV9IdcURItxlpz7zmU4LvgoJg8Wlt1GxAnzwD9riuenLlFWe0RMoQuoreoA==";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
runtime_10_0 = buildNetRuntime {
|
||||
version = "10.0.0-preview.6.25358.103";
|
||||
version = "10.0.0-preview.7.25380.108";
|
||||
srcs = {
|
||||
linux-arm = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-linux-arm.tar.gz";
|
||||
hash = "sha512-dkFn08ZTnl3/nj8Qh+pAs3urJy9+bB3gyGLXak0MNEUnmbRY6fpwMprijsbQfWtiSz9b0KooEubn7I+PavI7hw==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-linux-arm.tar.gz";
|
||||
hash = "sha512-oyaRhovGFTGjL6O78RNBZGrFFBasUvaACTxXfTO2ODBqJqCjJ5poaoZUPg8v3MoOegfzYIF5UpRdybRt4pyXCQ==";
|
||||
};
|
||||
linux-arm64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-linux-arm64.tar.gz";
|
||||
hash = "sha512-cbydt+UH85l1JsTzkzkUYA+Q8AAxxhc1nzuAtyuBiljcgEpe2zTGt8qx4WVx6FVVRZUNGgcgv/WzGsY3RP204w==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-linux-arm64.tar.gz";
|
||||
hash = "sha512-tTAequEUCb2/MZg7xpk39w3RezVe84D0yrMX6SHl1mFiZCzVfRmhT7ug78CadjNcbl8u6ZimDErHYssXJR04QA==";
|
||||
};
|
||||
linux-x64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-linux-x64.tar.gz";
|
||||
hash = "sha512-f+rKqGVeFFIdtrqaeGByN38GOGTkGMXk9ep5kjop9HJO9u0WB0VFnuAo8ZJ5r6HA/t6atpM3IgiQnu+HM8oDZA==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-linux-x64.tar.gz";
|
||||
hash = "sha512-EnSHIJyzxKOUhHzO1aFduMW2bJOGboi0pweJ6iyQtB4pk+ANkZLUupiPM928iaXKL+TxmmEdftitjD4KRpLFAQ==";
|
||||
};
|
||||
linux-musl-arm = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-linux-musl-arm.tar.gz";
|
||||
hash = "sha512-XXF9htD5Vt8lgTAnA9TYSNyBQjHnEpOgkOr1axgUYIRUOj1GcOQxDrkPOS4YKtAHycx8wfRRTQ76nfO2XRCD8Q==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-linux-musl-arm.tar.gz";
|
||||
hash = "sha512-aCCXjXxzep/7Pj9IGsDDAm3FRsH0JzlqgwkCdTiwhu+QEHHiKiCJt3ivXlG8aJpEFCAs79lgkc0zAVtQ9+GtHA==";
|
||||
};
|
||||
linux-musl-arm64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-linux-musl-arm64.tar.gz";
|
||||
hash = "sha512-4mP7M8JBvsvY8vemP5tfQSPBpmfFVEfwOiSc/1SRs4pt+mKEURwPxidFxp8wK0ytnICIwnAJNYLX28p6LsZdCg==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-linux-musl-arm64.tar.gz";
|
||||
hash = "sha512-xJAlZHKLkx0jIHojHNSUZCKvqtFQjpGMISfcgjbc/yqVNXQQ4vC61bLYcZxkFMIJLQk4DDrnAVG1kgoyuzOHzw==";
|
||||
};
|
||||
linux-musl-x64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-linux-musl-x64.tar.gz";
|
||||
hash = "sha512-zf3Ek3pbRF4rjuks2odZedJWiUjdX+fQH4QwW2Mh3KZNZ+1hqYweccbaHu2CLwddC7BBBVGuyw+PPhMThDZ2qA==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-linux-musl-x64.tar.gz";
|
||||
hash = "sha512-wCfUh5zikKE4NaJWtYraqu2hdvCYgsej42+w4ik7Qo7/U+YhpHj+xF2SjxeL3VLn9KK03p4C0gSUxLmSXMtkBg==";
|
||||
};
|
||||
osx-arm64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-osx-arm64.tar.gz";
|
||||
hash = "sha512-zXzElKrtYs2r8Sh6CMvDoPKPMRLoluA37YLYRdZThzJ+I0UlvxwESbA+8hhSM9RWL7Wfv9GdXyjaPgpnE3RTdw==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-osx-arm64.tar.gz";
|
||||
hash = "sha512-72B+c82XraPNoxoMvqVWzWBAmiYSqUEnJxub+SXhLfhM97MmsLXt3s07rON/1vpwENSHzdxcIyR0Xe2W+LymAA==";
|
||||
};
|
||||
osx-x64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-osx-x64.tar.gz";
|
||||
hash = "sha512-lm3Eezqhx6qSOzVI2IdkiCNpKwU/CT5PJrhmu/WAmx3W7zi9LC5RpOgPBsXb5K7Q21uuVSrZgmRi+sMOpormFg==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-osx-x64.tar.gz";
|
||||
hash = "sha512-4kBn/dR8b/jTCNNnNwK6FD/a3VC0pRca8qq36AYz7uGeZqC2lAvqSq6Yik05EVWjW6eOV3YM3d2lr169M1s9EA==";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
sdk_10_0_1xx = buildNetSdk {
|
||||
version = "10.0.100-preview.6.25358.103";
|
||||
version = "10.0.100-preview.7.25380.108";
|
||||
srcs = {
|
||||
linux-arm = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-linux-arm.tar.gz";
|
||||
hash = "sha512-lYjjTcixBEvdjpzqH9DWtWf+3w3br0iXsVOrmz6TrElXRXgQ+p7NfaTVo22KBbxItnCv0PUtTVbRQPdCoEOCCg==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-linux-arm.tar.gz";
|
||||
hash = "sha512-knm/wwbPU/3AJnPGjrwGgYsm+wXukE/zFej/UoqNWLU0KoZkIjOkpnIi9Qe2ARC4IYSSx7l5cb7nj7EKFfiu6A==";
|
||||
};
|
||||
linux-arm64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-linux-arm64.tar.gz";
|
||||
hash = "sha512-cwFkPqL72yWCUmxtRpnTy2V/bJDjzn8nRq1RwyCoSDwoDToV/C4HJgWyvf52NpBjo4T/Ydef+WRBg+SyHBundA==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-linux-arm64.tar.gz";
|
||||
hash = "sha512-qBiJz0LOz2FqdoXKsXUIaUzug+dqlhnGTomvr/TTgmaOpMft/etEU6DBPfzurIZuo9D+BfPfEkY4pMpYtP2nJQ==";
|
||||
};
|
||||
linux-x64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-linux-x64.tar.gz";
|
||||
hash = "sha512-ZivWGncnWokxhq7VsKbmamE9M2V/cQJqJ/dl8RlreOPzoq2ljhs34Prqw5qDd7Pps7zqK3LFsG3V2YSK2Yc/Pw==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-linux-x64.tar.gz";
|
||||
hash = "sha512-KNA8LaQR6BYb+jcUjzX/Yi6qI0GtzXKae1I/dKoh6Pf2UBnaENKG1nhY0Z/2AII4C4dDbfm8zicUe0/bIShvsg==";
|
||||
};
|
||||
linux-musl-arm = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-linux-musl-arm.tar.gz";
|
||||
hash = "sha512-9E/Akg2mqGl07lLa7ODP/oyJEZPOmp1ob9k+gXiB7CSLkT5xdF7ldqZb9P3BZQZxivkERM7g9wFPuJZ6k6bMyA==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-linux-musl-arm.tar.gz";
|
||||
hash = "sha512-D65/QdZ5g5I0GWMqoc+JW9K+0oaBLcysWLUkrgxrgBuxhVUJ1t9L+EfkxAx5ll31z2BrwH8iV49JzAo+/1dEjQ==";
|
||||
};
|
||||
linux-musl-arm64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-linux-musl-arm64.tar.gz";
|
||||
hash = "sha512-xK/vp5j5cN3jplkjwCZItn87VU5Rp94TstKSRoQ3EtCGRcj8IjpAi9N+Df17+HWA0EaM+nQAlexbNbknQG+Lnw==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-linux-musl-arm64.tar.gz";
|
||||
hash = "sha512-zIjcxU2QbdIS9MOD3gfTSUfMS2RZJAtfwTqei25dfUgrymc1cXixQZUFfviDx+YOT/2ArvSEyYqXOYf+SZPBow==";
|
||||
};
|
||||
linux-musl-x64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-linux-musl-x64.tar.gz";
|
||||
hash = "sha512-LCj610mZoxlInz08MT41eSP+UaQCG+01OZeA8trqlZzehNkYNdHjEMk71LfLaV+xT29lAa0LFmF0L/xYAVNiaQ==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-linux-musl-x64.tar.gz";
|
||||
hash = "sha512-hcpucoRlWBlxrzWL7dJkDADJ11xJysH6mz3plrQKE+lfNbdXPe+u/r38Z0xHjotXn4GhAwvj8WC2cgsx/f1ooQ==";
|
||||
};
|
||||
osx-arm64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-osx-arm64.tar.gz";
|
||||
hash = "sha512-xDIGEqUUEXVSocsTu6RBc72L25UGwTtLmmeumrCziq1+zU5d0dTDIwukn7luzRSyrzQWkp52UcXJkMv3ber7mg==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-osx-arm64.tar.gz";
|
||||
hash = "sha512-eI/e7V31AEm8/hNwBZzfp0M5CkLZv1LHRVY+qsRL9UqVSqyjVjZLq2tbEIsbbZ4NbPJ8JT0uYrBkQARmn4GXxw==";
|
||||
};
|
||||
osx-x64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-osx-x64.tar.gz";
|
||||
hash = "sha512-rWlkOrW5A00BlxcOx+TusNgSzeXwKKHq8X+w8gnOKyUZMrJBKNsMVfBXs+mv9n14vLBFmAiT+B2WlQMjYRpnlQ==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-osx-x64.tar.gz";
|
||||
hash = "sha512-/Dk0clsJJHMl7hDlaBlhZyKmMPSBS7k8Q7YLLtvTLuI83esARdZACAi4QNBQ7Q3Etbz5WpDeG5MpNrYjVuHqVQ==";
|
||||
};
|
||||
};
|
||||
inherit commonPackages hostPackages targetPackages;
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
darwin,
|
||||
xcbuild,
|
||||
swiftPackages,
|
||||
apple-sdk_13,
|
||||
openssl,
|
||||
getconf,
|
||||
python3,
|
||||
@@ -109,12 +110,15 @@ stdenv.mkDerivation rec {
|
||||
krb5
|
||||
lttng-ust_2_12
|
||||
]
|
||||
++ lib.optionals isDarwin [
|
||||
xcbuild
|
||||
swift
|
||||
krb5
|
||||
sigtool
|
||||
];
|
||||
++ lib.optionals isDarwin (
|
||||
[
|
||||
xcbuild
|
||||
swift
|
||||
krb5
|
||||
sigtool
|
||||
]
|
||||
++ lib.optional (lib.versionAtLeast version "10") apple-sdk_13
|
||||
);
|
||||
|
||||
# This is required to fix the error:
|
||||
# > CSSM_ModuleLoad(): One or more parameters passed to a function were not valid.
|
||||
@@ -141,9 +145,8 @@ stdenv.mkDerivation rec {
|
||||
./vmr-compiler-opt-v8.patch
|
||||
]
|
||||
++ lib.optionals (lib.versionAtLeast version "10") [
|
||||
# src/repos/projects/Directory.Build.targets(106,5): error MSB4018: The "AddSourceToNuGetConfig" task failed unexpectedly.
|
||||
# src/repos/projects/Directory.Build.targets(106,5): error MSB4018: System.Xml.XmlException->Microsoft.Build.Framework.BuildException.GenericBuildTransferredException: There are multiple root elements. Line 9, position 2.
|
||||
./source-build-externals-overwrite-rather-than-append-.patch
|
||||
./mscordac-fix-missing-libunwind-symbols-on-linux.patch
|
||||
./bundler-fix-file-size-estimation-when-bundling-symli.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@@ -178,11 +181,15 @@ stdenv.mkDerivation rec {
|
||||
-s \$prev -t elem -n NoWarn -v '$(NoWarn);AD0001' \
|
||||
src/source-build-reference-packages/src/referencePackages/Directory.Build.props
|
||||
|
||||
''
|
||||
+ lib.optionalString (lib.versionOlder version "10") ''
|
||||
# https://github.com/microsoft/ApplicationInsights-dotnet/issues/2848
|
||||
xmlstarlet ed \
|
||||
--inplace \
|
||||
-u //_:Project/_:PropertyGroup/_:BuildNumber -v 0 \
|
||||
src/source-build-externals/src/${lib.optionalString (lib.versionAtLeast version "10") "repos/src/"}application-insights/.props/_GlobalStaticVersion.props
|
||||
src/source-build-externals/src/application-insights/.props/_GlobalStaticVersion.props
|
||||
''
|
||||
+ ''
|
||||
|
||||
# this fixes compile errors with clang 15 (e.g. darwin)
|
||||
substituteInPlace \
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "llef";
|
||||
version = "1.2.1";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "foundryzero";
|
||||
repo = "llef";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-gbZDs3uurmi5YrnjumjQgzKhEumphvgYMk3R73vZiUA=";
|
||||
hash = "sha256-pAFjLaZi4Sjlq3evKT2IG+0/imf4Fp5bM2gknLKpRvs=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@@ -176,11 +176,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Disable uriplaylistbin test that requires network access.
|
||||
# https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/676
|
||||
# TODO: Remove in 0.14, it has been replaced by a different fix:
|
||||
# https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/2140
|
||||
./ignore-network-tests.patch
|
||||
# Related to https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/723
|
||||
./ignore-tests.patch
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
@@ -257,12 +254,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
# Applies patches.
|
||||
# TODO: remove with 0.14
|
||||
inherit mopidy;
|
||||
};
|
||||
|
||||
updateScript = nix-update-script {
|
||||
# use numbered releases rather than gstreamer-* releases
|
||||
# this matches upstream's recommendation: https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/470#note_2202772
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
diff --git a/utils/uriplaylistbin/tests/uriplaylistbin.rs b/utils/uriplaylistbin/tests/uriplaylistbin.rs
|
||||
index dfd1c9ce..8ed24949 100644
|
||||
--- a/utils/uriplaylistbin/tests/uriplaylistbin.rs
|
||||
+++ b/utils/uriplaylistbin/tests/uriplaylistbin.rs
|
||||
@@ -534,6 +534,7 @@ fn infinite_to_finite() {
|
||||
assert_eq!(current_uri_index, 0);
|
||||
}
|
||||
|
||||
+#[ignore = "Requires network access"]
|
||||
#[test]
|
||||
/// cache HTTP playlist items
|
||||
fn cache() {
|
||||
@@ -0,0 +1,40 @@
|
||||
diff --git a/mux/mp4/tests/tests.rs b/mux/mp4/tests/tests.rs
|
||||
index 52b91f59..c5875554 100644
|
||||
--- a/mux/mp4/tests/tests.rs
|
||||
+++ b/mux/mp4/tests/tests.rs
|
||||
@@ -1339,6 +1339,7 @@ fn test_taic_encode_cannot_sync(video_enc: &str) {
|
||||
);
|
||||
}
|
||||
|
||||
+#[ignore = "Unknown failure"]
|
||||
#[test]
|
||||
fn test_taic_x264() {
|
||||
init();
|
||||
@@ -1359,6 +1360,7 @@ fn test_taic_stai_x264_not_enabled() {
|
||||
test_taic_stai_encode("x264enc", false);
|
||||
}
|
||||
|
||||
+#[ignore = "Unknown failure"]
|
||||
#[test]
|
||||
fn test_taic_x264_no_sync() {
|
||||
init();
|
||||
diff --git a/utils/uriplaylistbin/tests/uriplaylistbin.rs b/utils/uriplaylistbin/tests/uriplaylistbin.rs
|
||||
index 3489eaa8..569635d6 100644
|
||||
--- a/utils/uriplaylistbin/tests/uriplaylistbin.rs
|
||||
+++ b/utils/uriplaylistbin/tests/uriplaylistbin.rs
|
||||
@@ -388,6 +388,7 @@ fn multi_audio() {
|
||||
assert_eq!(current_uri_index, 2);
|
||||
}
|
||||
|
||||
+#[ignore = "Unknown failure"]
|
||||
#[test]
|
||||
fn multi_audio_video() {
|
||||
let (_events, current_iteration, current_uri_index, eos) = test(
|
||||
@@ -403,6 +404,7 @@ fn multi_audio_video() {
|
||||
assert_eq!(current_uri_index, 1);
|
||||
}
|
||||
|
||||
+#[ignore = "Unknown failure"]
|
||||
#[test]
|
||||
fn iterations() {
|
||||
let (_events, current_iteration, current_uri_index, eos) = test(
|
||||
@@ -0,0 +1,9 @@
|
||||
{ callPackage, ... }@args:
|
||||
|
||||
callPackage ./generic.nix (
|
||||
{
|
||||
version = "32.0";
|
||||
hash = "sha256-kiA0P6ZU0i9vxpNjlusyMsFkvDb5DkoiH6FwE/q8FMI=";
|
||||
}
|
||||
// args
|
||||
)
|
||||
@@ -39,12 +39,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "coiled";
|
||||
version = "1.118.1";
|
||||
version = "1.118.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-74LILNrkvopEdEdECe0pwfgwxdGrfXucWf76Vkj95GQ=";
|
||||
hash = "sha256-HjbBZsTqb3D5uh3cBZPFkhe/QbJtnHwduUDCaMl3vc4=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -1,12 +1,19 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
|
||||
# dependencies
|
||||
frozendict,
|
||||
pydantic,
|
||||
torch,
|
||||
transformers,
|
||||
|
||||
# tests
|
||||
nbconvert,
|
||||
nbformat,
|
||||
pytestCheckHook,
|
||||
@@ -14,7 +21,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "compressed-tensors";
|
||||
version = "0.10.2";
|
||||
version = "0.11.0";
|
||||
pyproject = true;
|
||||
|
||||
# Release on PyPI is missing the `utils` directory, which `setup.py` wants to import
|
||||
@@ -22,12 +29,21 @@ buildPythonPackage rec {
|
||||
owner = "neuralmagic";
|
||||
repo = "compressed-tensors";
|
||||
tag = version;
|
||||
hash = "sha256-BJsMyCs+rupt5+i5JlO7oY08Udc8hI3ZnMiN+8ja0mc=";
|
||||
hash = "sha256-sSXn4/N/Pn+wOCY1Z0ziqFxfMRvRA1c90jPOBe+SwZw=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "setuptools_scm==8.2.0" "setuptools_scm"
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
frozendict
|
||||
pydantic
|
||||
torch
|
||||
transformers
|
||||
@@ -45,12 +61,17 @@ buildPythonPackage rec {
|
||||
|
||||
disabledTests = [
|
||||
# these try to download models from HF Hub
|
||||
"test_apply_tinyllama_dynamic_activations"
|
||||
"test_compress_model"
|
||||
"test_compress_model_meta"
|
||||
"test_compressed_linear_from_linear_usage"
|
||||
"test_decompress_model"
|
||||
"test_get_observer_token_count"
|
||||
"test_kv_cache_quantization"
|
||||
"test_target_prioritization"
|
||||
"test_load_compressed_sharded"
|
||||
"test_model_forward_pass"
|
||||
"test_save_compressed_model"
|
||||
"test_apply_tinyllama_dynamic_activations"
|
||||
"test_target_prioritization"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "resolvelib";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sarugaku";
|
||||
repo = "resolvelib";
|
||||
rev = version;
|
||||
hash = "sha256-UBdgFN+fvbjz+rp8+rog8FW2jwO/jCfUPV7UehJKiV8=";
|
||||
tag = version;
|
||||
hash = "sha256-8ffJ1Jlb/hzKY4pfE3B95ip2e1CxUByiR0cul/ZnxxA=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -31,7 +31,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Resolve abstract dependencies into concrete ones";
|
||||
homepage = "https://github.com/sarugaku/resolvelib";
|
||||
changelog = "https://github.com/sarugaku/resolvelib/blob/${src.rev}/CHANGELOG.rst";
|
||||
changelog = "https://github.com/sarugaku/resolvelib/blob/${src.tag}/CHANGELOG.rst";
|
||||
license = licenses.isc;
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
@@ -16,8 +16,8 @@ let
|
||||
hash = "sha256-z4anrXZEBjldQoam0J1zBxFyCsxtk+nc6ax6xNxKKKc=";
|
||||
};
|
||||
"10" = {
|
||||
version = "10.14.0";
|
||||
hash = "sha256-KXU05l1YQkUFOcHoAiyIMateH+LrdGZHh6gVUZVC1iA=";
|
||||
version = "10.15.0";
|
||||
hash = "sha256-hMGeeI19fuJI5Ka3FS+Ou6D0/nOApfRDyhfXbAMAUtI=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -16,5 +16,7 @@
|
||||
|
||||
reviewer-refocus-card = callPackage ./reviewer-refocus-card { };
|
||||
|
||||
review-heatmap = callPackage ./review-heatmap { };
|
||||
|
||||
yomichan-forvo-server = callPackage ./yomichan-forvo-server { };
|
||||
}
|
||||
|
||||
+26
@@ -0,0 +1,26 @@
|
||||
---
|
||||
src/web/main.ts | 8 ++++++--
|
||||
1 file changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/web/main.ts b/src/web/main.ts
|
||||
index 389c7fc..0b7c702 100644
|
||||
--- a/src/web/main.ts
|
||||
+++ b/src/web/main.ts
|
||||
@@ -29,8 +29,12 @@ listed here: <https://glutanimate.com/contact/>.
|
||||
Any modifications to this file must keep this entire header intact.
|
||||
*/
|
||||
|
||||
-import "./_vendor/cal-heatmap.css";
|
||||
-import "./css/review-heatmap.css";
|
||||
+import calHeatmapCss from "./_vendor/cal-heatmap.css";
|
||||
+import reviewHeatmapCss from "./css/review-heatmap.css";
|
||||
+
|
||||
+var __vite_style__ = document.createElement('style');
|
||||
+__vite_style__.textContent = calHeatmapCss + "\n" + reviewHeatmapCss;
|
||||
+document.head.appendChild(__vite_style__);
|
||||
|
||||
import { CalHeatMap } from "./_vendor/cal-heatmap.js";
|
||||
import { ReviewHeatmapOptions, ReviewHeatmapData } from "./types";
|
||||
--
|
||||
2.49.0
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
{
|
||||
lib,
|
||||
anki-utils,
|
||||
fetchFromGitHub,
|
||||
esbuild,
|
||||
aab,
|
||||
}:
|
||||
anki-utils.buildAnkiAddon (finalAttrs: {
|
||||
pname = "review-heatmap";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "glutanimate";
|
||||
repo = "review-heatmap";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-CL98DYikumoPR/QTWcMMwpd/tEpKLIDVC1Rj5NEvWJ8=";
|
||||
# Needed files are set to export-ignore in .gitattributes
|
||||
forceFetchGit = true;
|
||||
};
|
||||
|
||||
patches = [ ./0001-Apply-vite-style-to-anki-review-heatmap.js.patch ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
aab
|
||||
esbuild
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
# Work around missing icons
|
||||
mkdir resources/icons/optional
|
||||
touch resources/icons/optional/{patreon.svg,thanks.svg,twitter.svg,youtube.svg}
|
||||
|
||||
mkdir -p build/dist
|
||||
cp -r src resources designer --target-directory build/dist
|
||||
aab build_dist ${finalAttrs.version} --modtime -1
|
||||
|
||||
# build anki-review-heatmap.js
|
||||
esbuild \
|
||||
src/web/main.ts \
|
||||
--bundle \
|
||||
--minify \
|
||||
--target=es2015 \
|
||||
--loader:.css=text \
|
||||
--outfile=build/dist/src/review_heatmap/web/anki-review-heatmap.js
|
||||
|
||||
cd build/dist/src/review_heatmap
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Anki add-on to help you keep track of your review activity";
|
||||
homepage = "https://github.com/glutanimate/review-heatmap";
|
||||
changelog = "https://github.com/glutanimate/review-heatmap/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [ eljamm ];
|
||||
};
|
||||
})
|
||||
@@ -74,6 +74,5 @@ stdenv.mkDerivation {
|
||||
homepage = "http://slade.mancubus.net/";
|
||||
license = lib.licenses.gpl2Only; # https://github.com/sirjuddington/SLADE/issues/1754
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ ertes ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xone";
|
||||
version = "0.4.1";
|
||||
version = "0.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dlundqvist";
|
||||
repo = "xone";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-myiKYXJ4Qisz6uJYO75xs/lGj7A/Ft+6frky9lBuWzc=";
|
||||
hash = "sha256-ab/OlVezruvccKzcM4Ews6ydAJ8r64XfkPlFYpUycLQ=";
|
||||
};
|
||||
|
||||
setSourceRoot = ''
|
||||
|
||||
@@ -114,7 +114,7 @@ in
|
||||
};
|
||||
# EOL 2026-03-15
|
||||
varnish77 = common {
|
||||
version = "7.7.2";
|
||||
hash = "sha256-/ad1DhKBog6czMbGZkgdJDf6fA2BZZLIbk+3un/EZK0=";
|
||||
version = "7.7.3";
|
||||
hash = "sha256-6W7q/Ez+KlWO0vtU8eIr46PZlfRvjADaVF1YOq74AjY=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
@@ -8,18 +7,15 @@
|
||||
packagekit,
|
||||
}:
|
||||
|
||||
let
|
||||
isQt6 = lib.versions.major qttools.version == "6";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "packagekit-qt";
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hughsie";
|
||||
repo = "PackageKit-Qt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rLNeVjzIT18qUZgj6Qcf7E59CL4gx/ArYJfs9KHrqNs=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ZHkOFPaOMLCectYKzQs9oQ70kv8APOdkjDRimHgld+c=";
|
||||
};
|
||||
|
||||
buildInputs = [ packagekit ];
|
||||
@@ -30,8 +26,6 @@ stdenv.mkDerivation rec {
|
||||
qttools
|
||||
];
|
||||
|
||||
cmakeFlags = [ (lib.cmakeBool "BUILD_WITH_QT6" isQt6) ];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
meta = packagekit.meta // {
|
||||
|
||||
@@ -8810,6 +8810,7 @@ with pkgs;
|
||||
|
||||
inherit
|
||||
({
|
||||
protobuf_32 = callPackage ../development/libraries/protobuf/32.nix { };
|
||||
protobuf_31 = callPackage ../development/libraries/protobuf/31.nix { };
|
||||
protobuf_30 = callPackage ../development/libraries/protobuf/30.nix { };
|
||||
protobuf_29 = callPackage ../development/libraries/protobuf/29.nix {
|
||||
@@ -8822,6 +8823,7 @@ with pkgs;
|
||||
abseil-cpp = abseil-cpp_202103;
|
||||
};
|
||||
})
|
||||
protobuf_32
|
||||
protobuf_31
|
||||
protobuf_30
|
||||
protobuf_29
|
||||
|
||||
@@ -129,8 +129,6 @@ makeScopeWithSplicing' {
|
||||
|
||||
libopenshot = callPackage ../development/libraries/libopenshot { };
|
||||
|
||||
packagekit-qt = callPackage ../tools/package-management/packagekit/qt.nix { };
|
||||
|
||||
libopenshot-audio = callPackage ../development/libraries/libopenshot-audio { };
|
||||
|
||||
libqglviewer = callPackage ../development/libraries/libqglviewer { };
|
||||
|
||||
Reference in New Issue
Block a user