mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-10 03:23:29 +03:00
Merge master into staging-next
This commit is contained in:
commit
d4a1995529
207 changed files with 2504 additions and 11098 deletions
4
.github/workflows/backport.yml
vendored
4
.github/workflows/backport.yml
vendored
|
@ -22,8 +22,8 @@ jobs:
|
||||||
- uses: actions/create-github-app-token@c1a285145b9d317df6ced56c09f525b5c2b6f755 # v1.11.1
|
- uses: actions/create-github-app-token@c1a285145b9d317df6ced56c09f525b5c2b6f755 # v1.11.1
|
||||||
id: app-token
|
id: app-token
|
||||||
with:
|
with:
|
||||||
app-id: ${{ vars.BACKPORT_APP_ID }}
|
app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
|
||||||
private-key: ${{ secrets.BACKPORT_PRIVATE_KEY }}
|
private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
|
||||||
|
|
||||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
|
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
|
||||||
with:
|
with:
|
||||||
|
|
5
.github/workflows/periodic-merge-24h.yml
vendored
5
.github/workflows/periodic-merge-24h.yml
vendored
|
@ -14,9 +14,7 @@ on:
|
||||||
- cron: '0 0 * * *'
|
- cron: '0 0 * * *'
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
permissions:
|
permissions: {}
|
||||||
contents: write # for devmasx/merge-branch to merge branches
|
|
||||||
pull-requests: write # for peter-evans/create-or-update-comment to create or update comment
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
periodic-merge:
|
periodic-merge:
|
||||||
|
@ -39,3 +37,4 @@ jobs:
|
||||||
with:
|
with:
|
||||||
from: ${{ matrix.pairs.from }}
|
from: ${{ matrix.pairs.from }}
|
||||||
into: ${{ matrix.pairs.into }}
|
into: ${{ matrix.pairs.into }}
|
||||||
|
secrets: inherit
|
||||||
|
|
5
.github/workflows/periodic-merge-6h.yml
vendored
5
.github/workflows/periodic-merge-6h.yml
vendored
|
@ -14,9 +14,7 @@ on:
|
||||||
- cron: '0 */6 * * *'
|
- cron: '0 */6 * * *'
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
permissions:
|
permissions: {}
|
||||||
contents: write # for devmasx/merge-branch to merge branches
|
|
||||||
pull-requests: write # for peter-evans/create-or-update-comment to create or update comment
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
periodic-merge:
|
periodic-merge:
|
||||||
|
@ -37,3 +35,4 @@ jobs:
|
||||||
with:
|
with:
|
||||||
from: ${{ matrix.pairs.from }}
|
from: ${{ matrix.pairs.from }}
|
||||||
into: ${{ matrix.pairs.into }}
|
into: ${{ matrix.pairs.into }}
|
||||||
|
secrets: inherit
|
||||||
|
|
11
.github/workflows/periodic-merge.yml
vendored
11
.github/workflows/periodic-merge.yml
vendored
|
@ -17,6 +17,14 @@ jobs:
|
||||||
runs-on: ubuntu-24.04
|
runs-on: ubuntu-24.04
|
||||||
name: ${{ inputs.from }} → ${{ inputs.into }}
|
name: ${{ inputs.from }} → ${{ inputs.into }}
|
||||||
steps:
|
steps:
|
||||||
|
# Use a GitHub App to create the PR so that CI gets triggered
|
||||||
|
# The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs
|
||||||
|
- uses: actions/create-github-app-token@c1a285145b9d317df6ced56c09f525b5c2b6f755 # v1.11.1
|
||||||
|
id: app-token
|
||||||
|
with:
|
||||||
|
app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
|
||||||
|
private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
|
||||||
|
|
||||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
|
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
|
||||||
|
|
||||||
- name: Find merge base between two branches
|
- name: Find merge base between two branches
|
||||||
|
@ -38,7 +46,7 @@ jobs:
|
||||||
type: now
|
type: now
|
||||||
from_branch: ${{ steps.merge_base.outputs.merge_base || inputs.from }}
|
from_branch: ${{ steps.merge_base.outputs.merge_base || inputs.from }}
|
||||||
target_branch: ${{ inputs.into }}
|
target_branch: ${{ inputs.into }}
|
||||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
github_token: ${{ steps.app-token.outputs.token }}
|
||||||
|
|
||||||
- name: Comment on failure
|
- name: Comment on failure
|
||||||
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
|
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
|
||||||
|
@ -47,3 +55,4 @@ jobs:
|
||||||
issue-number: 105153
|
issue-number: 105153
|
||||||
body: |
|
body: |
|
||||||
Periodic merge from `${{ inputs.from }}` into `${{ inputs.into }}` has [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}).
|
Periodic merge from `${{ inputs.from }}` into `${{ inputs.into }}` has [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}).
|
||||||
|
token: ${{ steps.app-token.outputs.token }}
|
||||||
|
|
|
@ -80,7 +80,7 @@ stdenv.mkDerivation {
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
Note: It is possible to have multiple, different instances of `darwinMinVerisonHook` in your inputs.
|
Note: It is possible to have multiple, different instances of `darwinMinVersionHook` in your inputs.
|
||||||
When that happens, the one with the highest version is always used.
|
When that happens, the one with the highest version is always used.
|
||||||
|
|
||||||
#### Picking an SDK version {#sec-darwin-troubleshooting-picking-sdk-version}
|
#### Picking an SDK version {#sec-darwin-troubleshooting-picking-sdk-version}
|
||||||
|
|
|
@ -2066,6 +2066,12 @@
|
||||||
githubId = 869771;
|
githubId = 869771;
|
||||||
name = "Kirill Boltaev";
|
name = "Kirill Boltaev";
|
||||||
};
|
};
|
||||||
|
aspauldingcode = {
|
||||||
|
email = "aspauldingcode@gmail.com";
|
||||||
|
github = "aspauldingcode";
|
||||||
|
githubId = 10196826;
|
||||||
|
name = "Alex Spaulding";
|
||||||
|
};
|
||||||
asppsa = {
|
asppsa = {
|
||||||
email = "asppsa@gmail.com";
|
email = "asppsa@gmail.com";
|
||||||
github = "asppsa";
|
github = "asppsa";
|
||||||
|
@ -4956,6 +4962,12 @@
|
||||||
name = "Dov Alperin";
|
name = "Dov Alperin";
|
||||||
keys = [ { fingerprint = "4EED 5096 B925 86FA 1101 6673 7F2C 07B9 1B52 BB61"; } ];
|
keys = [ { fingerprint = "4EED 5096 B925 86FA 1101 6673 7F2C 07B9 1B52 BB61"; } ];
|
||||||
};
|
};
|
||||||
|
da-luce = {
|
||||||
|
email = "daltonluce42@gmail.com";
|
||||||
|
github = "da-luce";
|
||||||
|
githubId = 102048662;
|
||||||
|
name = "Dalton Luce";
|
||||||
|
};
|
||||||
damhiya = {
|
damhiya = {
|
||||||
name = "SoonWon Moon";
|
name = "SoonWon Moon";
|
||||||
email = "damhiya@gmail.com";
|
email = "damhiya@gmail.com";
|
||||||
|
@ -7422,6 +7434,12 @@
|
||||||
name = "Felix Albrigtsen";
|
name = "Felix Albrigtsen";
|
||||||
matrix = "@felixalb:feal.no";
|
matrix = "@felixalb:feal.no";
|
||||||
};
|
};
|
||||||
|
felixdorn = {
|
||||||
|
name = "Félix";
|
||||||
|
matrix = "@d:xfe.li";
|
||||||
|
github = "felixdorn";
|
||||||
|
githubId = 55788595;
|
||||||
|
};
|
||||||
felixscheinost = {
|
felixscheinost = {
|
||||||
name = "Felix Scheinost";
|
name = "Felix Scheinost";
|
||||||
email = "felix.scheinost@posteo.de";
|
email = "felix.scheinost@posteo.de";
|
||||||
|
@ -20884,6 +20902,12 @@
|
||||||
githubId = 16765155;
|
githubId = 16765155;
|
||||||
name = "Shardul Baral";
|
name = "Shardul Baral";
|
||||||
};
|
};
|
||||||
|
sharpchen = {
|
||||||
|
github = "sharpchen";
|
||||||
|
githubId = 77432836;
|
||||||
|
name = "sharpchen";
|
||||||
|
email = "rui.chen.sharp@gmail.com";
|
||||||
|
};
|
||||||
sharzy = {
|
sharzy = {
|
||||||
email = "me@sharzy.in";
|
email = "me@sharzy.in";
|
||||||
github = "SharzyL";
|
github = "SharzyL";
|
||||||
|
|
|
@ -37,6 +37,8 @@
|
||||||
|
|
||||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||||
|
|
||||||
|
- [AmneziaVPN](https://amnezia.org/en), an open-source VPN client, with a key feature that enables you to deploy your own VPN server on your server. Available as [programs.amnezia-vpn](#opt-programs.amnezia-vpn.enable).
|
||||||
|
|
||||||
- [Bazecor](https://github.com/Dygmalab/Bazecor), the graphical configurator for Dygma Products.
|
- [Bazecor](https://github.com/Dygmalab/Bazecor), the graphical configurator for Dygma Products.
|
||||||
|
|
||||||
- [Bonsai](https://git.sr.ht/~stacyharper/bonsai), a general-purpose event mapper/state machine primarily used to create complex key shortcuts, and as part of the [SXMO](https://sxmo.org/) desktop environment. Available as [services.bonsaid](#opt-services.bonsaid.enable).
|
- [Bonsai](https://git.sr.ht/~stacyharper/bonsai), a general-purpose event mapper/state machine primarily used to create complex key shortcuts, and as part of the [SXMO](https://sxmo.org/) desktop environment. Available as [services.bonsaid](#opt-services.bonsaid.enable).
|
||||||
|
@ -182,6 +184,8 @@
|
||||||
|
|
||||||
- `linuxPackages.nvidiaPackages.dc_520` has been removed since it is marked broken and there are better newer alternatives.
|
- `linuxPackages.nvidiaPackages.dc_520` has been removed since it is marked broken and there are better newer alternatives.
|
||||||
|
|
||||||
|
- `pnpm` was updated to version 10. If your project is incompatible, you can install the previous version from the package attribute `pnpm_9`.
|
||||||
|
|
||||||
- `programs.less.lessopen` is now null by default. To restore the previous behaviour, set it to `''|${lib.getExe' pkgs.lesspipe "lesspipe.sh"} %s''`.
|
- `programs.less.lessopen` is now null by default. To restore the previous behaviour, set it to `''|${lib.getExe' pkgs.lesspipe "lesspipe.sh"} %s''`.
|
||||||
|
|
||||||
- `hardware.pulseaudio` has been renamed to `services.pulseaudio`. The deprecated option names will continue to work, but causes a warning.
|
- `hardware.pulseaudio` has been renamed to `services.pulseaudio`. The deprecated option names will continue to work, but causes a warning.
|
||||||
|
|
|
@ -90,7 +90,7 @@ let
|
||||||
You have set specialArgs.pkgs, which means that options like nixpkgs.config
|
You have set specialArgs.pkgs, which means that options like nixpkgs.config
|
||||||
and nixpkgs.overlays will be ignored. If you wish to reuse an already created
|
and nixpkgs.overlays will be ignored. If you wish to reuse an already created
|
||||||
pkgs, which you know is configured correctly for this NixOS configuration,
|
pkgs, which you know is configured correctly for this NixOS configuration,
|
||||||
please import the `nixosModules.pkgsReadOnly` module from the nixpkgs flake or
|
please import the `nixosModules.readOnlyPkgs` module from the nixpkgs flake or
|
||||||
`(modulesPath + "/misc/nixpkgs/read-only.nix"), and set `{ nixpkgs.pkgs = <your pkgs>; }`.
|
`(modulesPath + "/misc/nixpkgs/read-only.nix"), and set `{ nixpkgs.pkgs = <your pkgs>; }`.
|
||||||
This properly disables the ignored options to prevent future surprises.
|
This properly disables the ignored options to prevent future surprises.
|
||||||
''
|
''
|
||||||
|
|
|
@ -148,6 +148,7 @@
|
||||||
./programs/_1password.nix
|
./programs/_1password.nix
|
||||||
./programs/adb.nix
|
./programs/adb.nix
|
||||||
./programs/alvr.nix
|
./programs/alvr.nix
|
||||||
|
./programs/amnezia-vpn.nix
|
||||||
./programs/appgate-sdp.nix
|
./programs/appgate-sdp.nix
|
||||||
./programs/appimage.nix
|
./programs/appimage.nix
|
||||||
./programs/arp-scan.nix
|
./programs/arp-scan.nix
|
||||||
|
|
27
nixos/modules/programs/amnezia-vpn.nix
Normal file
27
nixos/modules/programs/amnezia-vpn.nix
Normal file
|
@ -0,0 +1,27 @@
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
cfg = config.programs.amnezia-vpn;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
options.programs.amnezia-vpn = {
|
||||||
|
enable = lib.mkEnableOption "The AmneziaVPN client";
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
environment.systemPackages = [ pkgs.amnezia-vpn ];
|
||||||
|
services.dbus.packages = [ pkgs.amnezia-vpn ];
|
||||||
|
services.resolved.enable = true;
|
||||||
|
|
||||||
|
systemd = {
|
||||||
|
packages = [ pkgs.amnezia-vpn ];
|
||||||
|
services."AmneziaVPN".wantedBy = [ "multi-user.target" ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
meta.maintainers = with lib.maintainers; [ sund3RRR ];
|
||||||
|
}
|
|
@ -1219,7 +1219,10 @@ in
|
||||||
be changed using {option}`security.pam.u2f.authFile` option.
|
be changed using {option}`security.pam.u2f.authFile` option.
|
||||||
|
|
||||||
File format is:
|
File format is:
|
||||||
`username:first_keyHandle,first_public_key: second_keyHandle,second_public_key`
|
```
|
||||||
|
<username1>:<KeyHandle1>,<UserKey1>,<CoseType1>,<Options1>:<KeyHandle2>,<UserKey2>,<CoseType2>,<Options2>:...
|
||||||
|
<username2>:<KeyHandle1>,<UserKey1>,<CoseType1>,<Options1>:<KeyHandle2>,<UserKey2>,<CoseType2>,<Options2>:...
|
||||||
|
```
|
||||||
This file can be generated using {command}`pamu2fcfg` command.
|
This file can be generated using {command}`pamu2fcfg` command.
|
||||||
|
|
||||||
More information can be found [here](https://developers.yubico.com/pam-u2f/).
|
More information can be found [here](https://developers.yubico.com/pam-u2f/).
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
config,
|
config,
|
||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
|
utils,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -20,6 +21,10 @@ let
|
||||||
toString
|
toString
|
||||||
;
|
;
|
||||||
|
|
||||||
|
inherit (utils)
|
||||||
|
escapeSystemdExecArgs
|
||||||
|
;
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|
||||||
{
|
{
|
||||||
|
@ -29,7 +34,7 @@ in
|
||||||
servers = mkOption {
|
servers = mkOption {
|
||||||
default = { };
|
default = { };
|
||||||
description = ''
|
description = ''
|
||||||
Attribute set of faster-whisper instances to spawn.
|
Attribute set of wyoming-faster-whisper instances to spawn.
|
||||||
'';
|
'';
|
||||||
type = types.attrsOf (
|
type = types.attrsOf (
|
||||||
types.submodule (
|
types.submodule (
|
||||||
|
@ -43,9 +48,33 @@ in
|
||||||
default = "tiny-int8";
|
default = "tiny-int8";
|
||||||
example = "Systran/faster-distil-whisper-small.en";
|
example = "Systran/faster-distil-whisper-small.en";
|
||||||
description = ''
|
description = ''
|
||||||
Name of the voice model to use.
|
Name of the voice model to use. Can also be a HuggingFace model ID or a path to
|
||||||
|
a custom model directory.
|
||||||
|
|
||||||
Check the [2.0.0 release notes](https://github.com/rhasspy/wyoming-faster-whisper/releases/tag/v2.0.0) for possible values.
|
Compressed models (`int8`) are slightly less accurate, but smaller and faster.
|
||||||
|
|
||||||
|
Available models:
|
||||||
|
- `tiny-int8` (compressed)
|
||||||
|
- `tiny`
|
||||||
|
- `tiny.en` (English only)
|
||||||
|
- `base-int8` (compressed)
|
||||||
|
- `base`
|
||||||
|
- `base.en` (English only)
|
||||||
|
- `small-int8` (compressed)
|
||||||
|
- `distil-small.en` (distilled, English only)
|
||||||
|
- `small`
|
||||||
|
- `small.en` (English only)
|
||||||
|
- `medium-int8` (compressed)
|
||||||
|
- `distil-medium.en` (distilled, English only)
|
||||||
|
- `medium`
|
||||||
|
- `medium.en` (English only)
|
||||||
|
- `large`
|
||||||
|
- `large-v1`
|
||||||
|
- `distil-large-v2` (distilled, English only)
|
||||||
|
- `large-v2`
|
||||||
|
- `distil-large-v3` (distilled, English only)
|
||||||
|
- `large-v3`
|
||||||
|
- `turbo` (faster than large-v3)
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -171,6 +200,7 @@ in
|
||||||
"uz"
|
"uz"
|
||||||
"vi"
|
"vi"
|
||||||
"yi"
|
"yi"
|
||||||
|
"yue"
|
||||||
"yo"
|
"yo"
|
||||||
"zh"
|
"zh"
|
||||||
];
|
];
|
||||||
|
@ -180,12 +210,26 @@ in
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
initialPrompt = mkOption {
|
||||||
|
type = nullOr str;
|
||||||
|
default = null;
|
||||||
|
example = ''
|
||||||
|
The following conversation takes place in the universe of Wizard of Oz. Key terms include 'Yellow Brick Road' (the path to follow), 'Emerald City' (the ultimate goal), and 'Ruby Slippers' (the magical tools to succeed). Keep these in mind as they guide the journey.
|
||||||
|
'';
|
||||||
|
description = ''
|
||||||
|
Optional text to provide as a prompt for the first window. This can be used to provide, or
|
||||||
|
"prompt-engineer" a context for transcription, e.g. custom vocabularies or proper nouns
|
||||||
|
to make it more likely to predict those word correctly.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
beamSize = mkOption {
|
beamSize = mkOption {
|
||||||
type = ints.unsigned;
|
type = ints.unsigned;
|
||||||
default = 1;
|
default = 0;
|
||||||
example = 5;
|
example = 5;
|
||||||
description = ''
|
description = ''
|
||||||
The number of beams to use in beam search.
|
The number of beams to use in beam search.
|
||||||
|
Use `0` to automatically select a value based on the CPU.
|
||||||
'';
|
'';
|
||||||
apply = toString;
|
apply = toString;
|
||||||
};
|
};
|
||||||
|
@ -233,18 +277,35 @@ in
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
DynamicUser = true;
|
DynamicUser = true;
|
||||||
User = "wyoming-faster-whisper";
|
User = "wyoming-faster-whisper";
|
||||||
StateDirectory = "wyoming/faster-whisper";
|
StateDirectory = [
|
||||||
|
"wyoming/faster-whisper"
|
||||||
|
"wyoming/faster-whisper/models"
|
||||||
|
];
|
||||||
# https://github.com/home-assistant/addons/blob/master/whisper/rootfs/etc/s6-overlay/s6-rc.d/whisper/run
|
# https://github.com/home-assistant/addons/blob/master/whisper/rootfs/etc/s6-overlay/s6-rc.d/whisper/run
|
||||||
ExecStart = ''
|
ExecStart = escapeSystemdExecArgs (
|
||||||
${cfg.package}/bin/wyoming-faster-whisper \
|
[
|
||||||
--data-dir $STATE_DIRECTORY \
|
(lib.getExe cfg.package)
|
||||||
--download-dir $STATE_DIRECTORY \
|
"--data-dir"
|
||||||
--uri ${options.uri} \
|
"/var/lib/wyoming/faster-whisper"
|
||||||
--device ${options.device} \
|
"--download-dir"
|
||||||
--model ${options.model} \
|
"/var/lib/wyoming/faster-whisper/models"
|
||||||
--language ${options.language} \
|
"--uri"
|
||||||
--beam-size ${options.beamSize} ${options.extraArgs}
|
options.uri
|
||||||
'';
|
"--device"
|
||||||
|
options.device
|
||||||
|
"--model"
|
||||||
|
options.model
|
||||||
|
"--language"
|
||||||
|
options.language
|
||||||
|
"--beam-size"
|
||||||
|
options.beamSize
|
||||||
|
]
|
||||||
|
++ lib.optionals (options.initialPrompt != null) [
|
||||||
|
"--initial-prompt"
|
||||||
|
options.initialPrompt
|
||||||
|
]
|
||||||
|
++ options.extraArgs
|
||||||
|
);
|
||||||
CapabilityBoundingSet = "";
|
CapabilityBoundingSet = "";
|
||||||
DeviceAllow =
|
DeviceAllow =
|
||||||
if
|
if
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
config,
|
config,
|
||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
|
utils,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -9,14 +10,11 @@ let
|
||||||
cfg = config.services.wyoming.openwakeword;
|
cfg = config.services.wyoming.openwakeword;
|
||||||
|
|
||||||
inherit (lib)
|
inherit (lib)
|
||||||
concatStringsSep
|
concatMap
|
||||||
concatMapStringsSep
|
|
||||||
escapeShellArgs
|
|
||||||
mkOption
|
mkOption
|
||||||
mkEnableOption
|
mkEnableOption
|
||||||
mkIf
|
mkIf
|
||||||
mkPackageOption
|
mkPackageOption
|
||||||
mkRemovedOptionModule
|
|
||||||
types
|
types
|
||||||
;
|
;
|
||||||
|
|
||||||
|
@ -24,20 +22,12 @@ let
|
||||||
toString
|
toString
|
||||||
;
|
;
|
||||||
|
|
||||||
|
inherit (utils)
|
||||||
|
escapeSystemdExecArgs
|
||||||
|
;
|
||||||
in
|
in
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
|
||||||
(mkRemovedOptionModule [
|
|
||||||
"services"
|
|
||||||
"wyoming"
|
|
||||||
"openwakeword"
|
|
||||||
"models"
|
|
||||||
] "Configuring models has been removed, they are now dynamically discovered and loaded at runtime")
|
|
||||||
];
|
|
||||||
|
|
||||||
meta.buildDocsInSandbox = false;
|
|
||||||
|
|
||||||
options.services.wyoming.openwakeword = with types; {
|
options.services.wyoming.openwakeword = with types; {
|
||||||
enable = mkEnableOption "Wyoming openWakeWord server";
|
enable = mkEnableOption "Wyoming openWakeWord server";
|
||||||
|
|
||||||
|
@ -79,10 +69,10 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
threshold = mkOption {
|
threshold = mkOption {
|
||||||
type = float;
|
type = numbers.between 0.0 1.0;
|
||||||
default = 0.5;
|
default = 0.5;
|
||||||
description = ''
|
description = ''
|
||||||
Activation threshold (0-1), where higher means fewer activations.
|
Activation threshold (0.0-1.0), where higher means fewer activations.
|
||||||
|
|
||||||
See trigger level for the relationship between activations and
|
See trigger level for the relationship between activations and
|
||||||
wake word detections.
|
wake word detections.
|
||||||
|
@ -91,7 +81,7 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
triggerLevel = mkOption {
|
triggerLevel = mkOption {
|
||||||
type = int;
|
type = ints.unsigned;
|
||||||
default = 1;
|
default = 1;
|
||||||
description = ''
|
description = ''
|
||||||
Number of activations before a detection is registered.
|
Number of activations before a detection is registered.
|
||||||
|
@ -107,7 +97,6 @@ in
|
||||||
description = ''
|
description = ''
|
||||||
Extra arguments to pass to the server commandline.
|
Extra arguments to pass to the server commandline.
|
||||||
'';
|
'';
|
||||||
apply = escapeShellArgs;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -127,15 +116,34 @@ in
|
||||||
DynamicUser = true;
|
DynamicUser = true;
|
||||||
User = "wyoming-openwakeword";
|
User = "wyoming-openwakeword";
|
||||||
# https://github.com/home-assistant/addons/blob/master/openwakeword/rootfs/etc/s6-overlay/s6-rc.d/openwakeword/run
|
# https://github.com/home-assistant/addons/blob/master/openwakeword/rootfs/etc/s6-overlay/s6-rc.d/openwakeword/run
|
||||||
ExecStart = concatStringsSep " " [
|
ExecStart = escapeSystemdExecArgs (
|
||||||
"${cfg.package}/bin/wyoming-openwakeword"
|
[
|
||||||
"--uri ${cfg.uri}"
|
(lib.getExe cfg.package)
|
||||||
(concatMapStringsSep " " (model: "--preload-model ${model}") cfg.preloadModels)
|
"--uri"
|
||||||
(concatMapStringsSep " " (dir: "--custom-model-dir ${toString dir}") cfg.customModelsDirectories)
|
cfg.uri
|
||||||
"--threshold ${cfg.threshold}"
|
"--threshold"
|
||||||
"--trigger-level ${cfg.triggerLevel}"
|
cfg.threshold
|
||||||
"${cfg.extraArgs}"
|
"--trigger-level"
|
||||||
];
|
cfg.triggerLevel
|
||||||
|
]
|
||||||
|
++ concatMap (
|
||||||
|
model:
|
||||||
|
[
|
||||||
|
"--preload-model"
|
||||||
|
model
|
||||||
|
]
|
||||||
|
cfg.preloadModels
|
||||||
|
)
|
||||||
|
++ concatMap (
|
||||||
|
dir:
|
||||||
|
[
|
||||||
|
"--custom-model-dir"
|
||||||
|
(toString dir)
|
||||||
|
]
|
||||||
|
cfg.customModelsDirectories
|
||||||
|
)
|
||||||
|
++ cfg.extraArgs
|
||||||
|
);
|
||||||
CapabilityBoundingSet = "";
|
CapabilityBoundingSet = "";
|
||||||
DeviceAllow = "";
|
DeviceAllow = "";
|
||||||
DevicePolicy = "closed";
|
DevicePolicy = "closed";
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
config,
|
config,
|
||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
|
utils,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -9,7 +10,6 @@ let
|
||||||
cfg = config.services.wyoming.piper;
|
cfg = config.services.wyoming.piper;
|
||||||
|
|
||||||
inherit (lib)
|
inherit (lib)
|
||||||
escapeShellArgs
|
|
||||||
mkOption
|
mkOption
|
||||||
mkEnableOption
|
mkEnableOption
|
||||||
mkPackageOption
|
mkPackageOption
|
||||||
|
@ -20,18 +20,19 @@ let
|
||||||
toString
|
toString
|
||||||
;
|
;
|
||||||
|
|
||||||
|
inherit (utils)
|
||||||
|
escapeSystemdExecArgs
|
||||||
|
;
|
||||||
in
|
in
|
||||||
|
|
||||||
{
|
{
|
||||||
meta.buildDocsInSandbox = false;
|
|
||||||
|
|
||||||
options.services.wyoming.piper = with types; {
|
options.services.wyoming.piper = with types; {
|
||||||
package = mkPackageOption pkgs "wyoming-piper" { };
|
package = mkPackageOption pkgs "wyoming-piper" { };
|
||||||
|
|
||||||
servers = mkOption {
|
servers = mkOption {
|
||||||
default = { };
|
default = { };
|
||||||
description = ''
|
description = ''
|
||||||
Attribute set of piper instances to spawn.
|
Attribute set of wyoming-piper instances to spawn.
|
||||||
'';
|
'';
|
||||||
type = types.attrsOf (
|
type = types.attrsOf (
|
||||||
types.submodule (
|
types.submodule (
|
||||||
|
@ -69,7 +70,7 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
noiseScale = mkOption {
|
noiseScale = mkOption {
|
||||||
type = float;
|
type = numbers.between 0.0 1.0;
|
||||||
default = 0.667;
|
default = 0.667;
|
||||||
description = ''
|
description = ''
|
||||||
Generator noise value.
|
Generator noise value.
|
||||||
|
@ -78,7 +79,7 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
noiseWidth = mkOption {
|
noiseWidth = mkOption {
|
||||||
type = float;
|
type = numbers.between 0.0 1.0;
|
||||||
default = 0.333;
|
default = 0.333;
|
||||||
description = ''
|
description = ''
|
||||||
Phoneme width noise value.
|
Phoneme width noise value.
|
||||||
|
@ -87,7 +88,7 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
lengthScale = mkOption {
|
lengthScale = mkOption {
|
||||||
type = float;
|
type = numbers.between 0.0 1.0;
|
||||||
default = 1.0;
|
default = 1.0;
|
||||||
description = ''
|
description = ''
|
||||||
Phoneme length value.
|
Phoneme length value.
|
||||||
|
@ -101,7 +102,6 @@ in
|
||||||
description = ''
|
description = ''
|
||||||
Extra arguments to pass to the server commandline.
|
Extra arguments to pass to the server commandline.
|
||||||
'';
|
'';
|
||||||
apply = escapeShellArgs;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -136,20 +136,35 @@ in
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
DynamicUser = true;
|
DynamicUser = true;
|
||||||
User = "wyoming-piper";
|
User = "wyoming-piper";
|
||||||
StateDirectory = "wyoming/piper";
|
StateDirectory = [
|
||||||
|
"wyoming/piper"
|
||||||
|
"wyoming/piper/models"
|
||||||
|
];
|
||||||
# https://github.com/home-assistant/addons/blob/master/piper/rootfs/etc/s6-overlay/s6-rc.d/piper/run
|
# https://github.com/home-assistant/addons/blob/master/piper/rootfs/etc/s6-overlay/s6-rc.d/piper/run
|
||||||
ExecStart = ''
|
ExecStart = escapeSystemdExecArgs (
|
||||||
${cfg.package}/bin/wyoming-piper \
|
[
|
||||||
--data-dir $STATE_DIRECTORY \
|
(lib.getExe cfg.package)
|
||||||
--download-dir $STATE_DIRECTORY \
|
"--data-dir"
|
||||||
--uri ${options.uri} \
|
"/var/lib/wyoming/piper"
|
||||||
--piper ${options.piper}/bin/piper \
|
"--download-dir"
|
||||||
--voice ${options.voice} \
|
"/var/lib/wyoming/piper/models"
|
||||||
--speaker ${options.speaker} \
|
"--uri"
|
||||||
--length-scale ${options.lengthScale} \
|
options.uri
|
||||||
--noise-scale ${options.noiseScale} \
|
"--piper"
|
||||||
--noise-w ${options.noiseWidth} ${options.extraArgs}
|
(lib.getExe options.piper)
|
||||||
'';
|
"--voice"
|
||||||
|
options.voice
|
||||||
|
"--speaker"
|
||||||
|
options.speaker
|
||||||
|
"--length-scale"
|
||||||
|
options.lengthScale
|
||||||
|
"--noise-scale"
|
||||||
|
options.noiseScale
|
||||||
|
"--noise-w"
|
||||||
|
options.noiseWidth
|
||||||
|
]
|
||||||
|
++ options.extraArgs
|
||||||
|
);
|
||||||
CapabilityBoundingSet = "";
|
CapabilityBoundingSet = "";
|
||||||
DeviceAllow = "";
|
DeviceAllow = "";
|
||||||
DevicePolicy = "closed";
|
DevicePolicy = "closed";
|
||||||
|
|
|
@ -183,7 +183,10 @@ in {
|
||||||
chmod -R u+rwX,g+rwX,o-rwx "${dataDir}"
|
chmod -R u+rwX,g+rwX,o-rwx "${dataDir}"
|
||||||
|
|
||||||
# check whether user setup has already been done
|
# check whether user setup has already been done
|
||||||
if test -f "${dataDir}/config/config.ini.php"; then
|
if test -f "${dataDir}/config/config.ini.php" &&
|
||||||
|
# since matomo-5.2.0, the config.ini.php is already created at first
|
||||||
|
# installer page access https://github.com/matomo-org/matomo/issues/22932
|
||||||
|
grep -q -F "[database]" "${dataDir}/config/config.ini.php"; then
|
||||||
# then execute possibly pending database upgrade
|
# then execute possibly pending database upgrade
|
||||||
matomo-console core:update --yes
|
matomo-console core:update --yes
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -26,6 +26,8 @@ in
|
||||||
options.services.trilium-server = with lib; {
|
options.services.trilium-server = with lib; {
|
||||||
enable = mkEnableOption "trilium-server";
|
enable = mkEnableOption "trilium-server";
|
||||||
|
|
||||||
|
package = mkPackageOption pkgs "trilium-server" {};
|
||||||
|
|
||||||
dataDir = mkOption {
|
dataDir = mkOption {
|
||||||
type = types.str;
|
type = types.str;
|
||||||
default = "/var/lib/trilium";
|
default = "/var/lib/trilium";
|
||||||
|
@ -117,7 +119,7 @@ in
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
environment.TRILIUM_DATA_DIR = cfg.dataDir;
|
environment.TRILIUM_DATA_DIR = cfg.dataDir;
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
ExecStart = "${pkgs.trilium-server}/bin/trilium-server";
|
ExecStart = lib.getExe cfg.package;
|
||||||
User = "trilium";
|
User = "trilium";
|
||||||
Group = "trilium";
|
Group = "trilium";
|
||||||
PrivateTmp = "true";
|
PrivateTmp = "true";
|
||||||
|
|
|
@ -37,11 +37,25 @@ let
|
||||||
machine.wait_for_unit("phpfpm-matomo.service")
|
machine.wait_for_unit("phpfpm-matomo.service")
|
||||||
machine.wait_for_unit("nginx.service")
|
machine.wait_for_unit("nginx.service")
|
||||||
|
|
||||||
|
with subtest("matomo.js reachable via HTTP"):
|
||||||
|
machine.succeed("curl -sSfk http://machine/matomo.js")
|
||||||
|
|
||||||
|
with subtest("js/piwik.js reachable via HTTP"):
|
||||||
|
machine.succeed("curl -sSfk http://machine/js/piwik.js")
|
||||||
|
|
||||||
|
with subtest("matomo.php (API) reachable via HTTP"):
|
||||||
|
machine.succeed("curl -sSfk http://machine/matomo.php")
|
||||||
|
|
||||||
# without the grep the command does not produce valid utf-8 for some reason
|
# without the grep the command does not produce valid utf-8 for some reason
|
||||||
with subtest("welcome screen loads"):
|
with subtest("welcome screen loads"):
|
||||||
machine.succeed(
|
machine.succeed(
|
||||||
"curl -sSfL http://localhost/ | grep '<title>Matomo[^<]*Installation'"
|
"curl -sSfL http://localhost/ | grep '<title>Matomo[^<]*Installation'"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
with subtest("killing the phpfpm process should trigger an automatic restart"):
|
||||||
|
machine.succeed("systemctl kill -s KILL phpfpm-matomo")
|
||||||
|
machine.sleep(1)
|
||||||
|
machine.wait_for_unit("phpfpm-matomo.service")
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
|
|
|
@ -2,7 +2,7 @@ let
|
||||||
cert =
|
cert =
|
||||||
pkgs:
|
pkgs:
|
||||||
pkgs.runCommand "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } ''
|
pkgs.runCommand "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } ''
|
||||||
openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=example.com/CN=muc.example.com' -days 36500
|
openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=example.com/CN=muc.example.com/CN=matrix.example.com' -days 36500
|
||||||
mkdir -p $out
|
mkdir -p $out
|
||||||
cp key.pem cert.pem $out
|
cp key.pem cert.pem $out
|
||||||
'';
|
'';
|
||||||
|
@ -20,12 +20,12 @@ import ../make-test-python.nix (
|
||||||
{
|
{
|
||||||
security.pki.certificateFiles = [ "${cert pkgs}/cert.pem" ];
|
security.pki.certificateFiles = [ "${cert pkgs}/cert.pem" ];
|
||||||
networking.extraHosts = ''
|
networking.extraHosts = ''
|
||||||
${nodes.server.config.networking.primaryIPAddress} example.com
|
${nodes.server.networking.primaryIPAddress} example.com
|
||||||
'';
|
'';
|
||||||
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
(pkgs.callPackage ./xmpp-sendmessage.nix {
|
(pkgs.callPackage ./xmpp-sendmessage.nix {
|
||||||
connectTo = nodes.server.config.networking.primaryIPAddress;
|
connectTo = nodes.server.networking.primaryIPAddress;
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
@ -35,6 +35,7 @@ import ../make-test-python.nix (
|
||||||
security.pki.certificateFiles = [ "${cert pkgs}/cert.pem" ];
|
security.pki.certificateFiles = [ "${cert pkgs}/cert.pem" ];
|
||||||
networking.extraHosts = ''
|
networking.extraHosts = ''
|
||||||
${config.networking.primaryIPAddress} example.com
|
${config.networking.primaryIPAddress} example.com
|
||||||
|
${config.networking.primaryIPAddress} matrix.example.com
|
||||||
'';
|
'';
|
||||||
|
|
||||||
services.ejabberd = {
|
services.ejabberd = {
|
||||||
|
@ -65,6 +66,12 @@ import ../make-test-python.nix (
|
||||||
port: 5269
|
port: 5269
|
||||||
ip: "::"
|
ip: "::"
|
||||||
module: ejabberd_s2s_in
|
module: ejabberd_s2s_in
|
||||||
|
-
|
||||||
|
port: 8448
|
||||||
|
module: ejabberd_http
|
||||||
|
tls: true
|
||||||
|
request_handlers:
|
||||||
|
"/_matrix": mod_matrix_gw
|
||||||
-
|
-
|
||||||
port: 5347
|
port: 5347
|
||||||
ip: "127.0.0.1"
|
ip: "127.0.0.1"
|
||||||
|
@ -275,9 +282,15 @@ import ../make-test-python.nix (
|
||||||
plugins:
|
plugins:
|
||||||
- "pep"
|
- "pep"
|
||||||
mod_push: {}
|
mod_push: {}
|
||||||
|
mod_matrix_gw:
|
||||||
|
key_name: key1
|
||||||
|
key: MATRIX_SECRET
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
systemd.services.ejabberd.serviceConfig.EnvironmentFile = pkgs.writeText "ejabberd.env" ''
|
||||||
|
EJABBERD_MACRO_MATRIX_SECRET=SU4mu/j8b8A1i1EdyxIcKlFlrp+eSRBIlZwGyHP7Mfo=
|
||||||
|
'';
|
||||||
networking.firewall.enable = false;
|
networking.firewall.enable = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -291,6 +304,8 @@ import ../make-test-python.nix (
|
||||||
|
|
||||||
assert "status: started" in server.succeed(ejabberd_prefix + "status")
|
assert "status: started" in server.succeed(ejabberd_prefix + "status")
|
||||||
|
|
||||||
|
server.succeed("curl https://matrix.example.com:8448/_matrix/key/v2/server")
|
||||||
|
|
||||||
server.succeed(
|
server.succeed(
|
||||||
ejabberd_prefix + "register azurediamond example.com hunter2",
|
ejabberd_prefix + "register azurediamond example.com hunter2",
|
||||||
ejabberd_prefix + "register cthon98 example.com nothunter2",
|
ejabberd_prefix + "register cthon98 example.com nothunter2",
|
||||||
|
|
|
@ -13,6 +13,7 @@
|
||||||
libmicrohttpd,
|
libmicrohttpd,
|
||||||
gnutls,
|
gnutls,
|
||||||
libtasn1,
|
libtasn1,
|
||||||
|
libxml2,
|
||||||
p11-kit,
|
p11-kit,
|
||||||
vim,
|
vim,
|
||||||
which,
|
which,
|
||||||
|
@ -24,13 +25,13 @@ with lib.strings;
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
version = "2.74.6";
|
version = "2.77.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "grame-cncm";
|
owner = "grame-cncm";
|
||||||
repo = "faust";
|
repo = "faust";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-0r7DjTrsNKZ5ZmWoA+Y9OXyJFUiUFZiPQb1skXXWYTw=";
|
hash = "sha256-C2EOd85idiSKKnWYcfoUFMuCQHB36d3CkrYVNNYmotw=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -73,6 +74,7 @@ let
|
||||||
libtasn1
|
libtasn1
|
||||||
p11-kit
|
p11-kit
|
||||||
ncurses_static
|
ncurses_static
|
||||||
|
libxml2
|
||||||
];
|
];
|
||||||
|
|
||||||
passthru = { inherit wrap wrapWithBuildEnv faust2ApplBase; };
|
passthru = { inherit wrap wrapWithBuildEnv faust2ApplBase; };
|
||||||
|
|
|
@ -40,13 +40,13 @@ let
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "strawberry";
|
pname = "strawberry";
|
||||||
version = "1.2.3";
|
version = "1.2.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jonaski";
|
owner = "jonaski";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-90gnPw21oBHrRslJmB2hUId0WI7Gf+I4bvdS+dvAHdI=";
|
hash = "sha256-acTFJS8E0hQNbiiOi8DfPyTiUcKjXwg5trk3Q2mYYmQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead
|
# the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead
|
||||||
|
|
|
@ -11713,12 +11713,12 @@ final: prev:
|
||||||
|
|
||||||
snacks-nvim = buildVimPlugin {
|
snacks-nvim = buildVimPlugin {
|
||||||
pname = "snacks.nvim";
|
pname = "snacks.nvim";
|
||||||
version = "2025-01-06";
|
version = "2025-01-15";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "folke";
|
owner = "folke";
|
||||||
repo = "snacks.nvim";
|
repo = "snacks.nvim";
|
||||||
rev = "14e89401da348f5d14509fca164fb7bcec83e597";
|
rev = "e5dd9281ee9402858fb7b7f1ac74ddcef40ebacc";
|
||||||
sha256 = "0z66fiy6mscwrwczgwngnhfcgi6mlr5kmv9k21nfwskrgmp8c71v";
|
sha256 = "147rbp4z58bvm6s2lk1yzis7rjrrppwgchxpiyf9klj2gh08mzwp";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/folke/snacks.nvim/";
|
meta.homepage = "https://github.com/folke/snacks.nvim/";
|
||||||
};
|
};
|
||||||
|
|
|
@ -2853,6 +2853,8 @@ in
|
||||||
"snacks.win"
|
"snacks.win"
|
||||||
"snacks.words"
|
"snacks.words"
|
||||||
"snacks.zen"
|
"snacks.zen"
|
||||||
|
"snacks.picker.config.highlights"
|
||||||
|
"snacks.picker.actions"
|
||||||
# Optional trouble integration
|
# Optional trouble integration
|
||||||
"trouble.sources.profiler"
|
"trouble.sources.profiler"
|
||||||
];
|
];
|
||||||
|
|
|
@ -109,6 +109,9 @@ python3.pkgs.buildPythonApplication {
|
||||||
# copy the patched `/run_electrum` over `/electrum/electrum`
|
# copy the patched `/run_electrum` over `/electrum/electrum`
|
||||||
# so the aiorpcx compatibility patch is used
|
# so the aiorpcx compatibility patch is used
|
||||||
cp run_electrum electrum_ltc/electrum-ltc
|
cp run_electrum electrum_ltc/electrum-ltc
|
||||||
|
|
||||||
|
# refresh stale generated code, per electrum_ltc/paymentrequest.py line 40
|
||||||
|
protoc --proto_path=electrum_ltc/ --python_out=electrum_ltc/ electrum_ltc/paymentrequest.proto
|
||||||
'';
|
'';
|
||||||
|
|
||||||
preBuild =
|
preBuild =
|
||||||
|
|
|
@ -1,26 +1,26 @@
|
||||||
{
|
{
|
||||||
"chromium": {
|
"chromium": {
|
||||||
"version": "131.0.6778.264",
|
"version": "132.0.6834.83",
|
||||||
"chromedriver": {
|
"chromedriver": {
|
||||||
"hash_darwin": "sha256-ibvVBD3q+ed1VffgSEZie7VAmSdBT3CJ9bNnjyYzWis=",
|
"hash_darwin": "sha256-gLpWPzuJXnYatvRFDdssgB7rMSUCFv2GIPaV+YRNiZ0=",
|
||||||
"hash_darwin_aarch64": "sha256-Eup+/qrFxMAU9AoYfd5BYTKM+J7CWE7GLGETiYdYorU="
|
"hash_darwin_aarch64": "sha256-8uhDySh2cWogVFX6LzCRTTHTUHTk+vxdbVxyOIHHLxA="
|
||||||
},
|
},
|
||||||
"deps": {
|
"deps": {
|
||||||
"depot_tools": {
|
"depot_tools": {
|
||||||
"rev": "20b9bdcace7ed561d6a75728c85373503473cb6b",
|
"rev": "41d43a2a2290450aeab946883542f8049b155c87",
|
||||||
"hash": "sha256-vlBENaVTtbwDJtSswuszcUlx+icZYJeP6ew6MO1cAv0="
|
"hash": "sha256-m/6b4VZZTUQOeED1mYvZOQCx8Re+Zd4O8SKDMjJ9Djo="
|
||||||
},
|
},
|
||||||
"gn": {
|
"gn": {
|
||||||
"rev": "95b0f8fe31a992a33c040bbe3867901335c12762",
|
"rev": "feafd1012a32c05ec6095f69ddc3850afb621f3a",
|
||||||
"hash": "sha256-a8yCdBsl0nBMPS+pCLwrkAvQNP/THx/z/GySyOgx4Jk="
|
"hash": "sha256-zZoD5Bx7wIEP2KJkHef6wHrxU3px+8Vseq29QcK32bg="
|
||||||
},
|
},
|
||||||
"npmHash": "sha256-b1l8SwjAfoColoa3zhTMPEF/rRuxzT3ATHE77rWU5EA="
|
"npmHash": "sha256-H1/h3x+Cgp1x94Ze3UPPHxRVpylZDvpMXMOuS+jk2dw="
|
||||||
},
|
},
|
||||||
"DEPS": {
|
"DEPS": {
|
||||||
"src": {
|
"src": {
|
||||||
"url": "https://chromium.googlesource.com/chromium/src.git",
|
"url": "https://chromium.googlesource.com/chromium/src.git",
|
||||||
"rev": "2d05e31515360f4da764174f7c448b33e36da871",
|
"rev": "03d59cf5ecf1d8444838ff9a1e96231304d4ff9c",
|
||||||
"hash": "sha256-aAb+lMefY4+zADsVeyLIhNI4AQfGmzu+7Y8o3t2csmU=",
|
"hash": "sha256-2FuT20iW8Mp4AehdEFT5Ua3La5z8bmT1FdLaUZRL0CE=",
|
||||||
"recompress": true
|
"recompress": true
|
||||||
},
|
},
|
||||||
"src/third_party/clang-format/script": {
|
"src/third_party/clang-format/script": {
|
||||||
|
@ -30,18 +30,23 @@
|
||||||
},
|
},
|
||||||
"src/third_party/libc++/src": {
|
"src/third_party/libc++/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git",
|
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git",
|
||||||
"rev": "6a68fd412b9aecd515a20a7cf84d11b598bfaf96",
|
"rev": "8e31ad42561900383e10dbefc1d3e8f38cedfbe9",
|
||||||
"hash": "sha256-7skqaen0XqbRvAGXQ0/3kea3vRInktdP3DOBeIBiGlQ="
|
"hash": "sha256-kmhTlz/qjvN0Qlra7Wz05O6X058hPPn0nVvAxFXQDC4="
|
||||||
},
|
},
|
||||||
"src/third_party/libc++abi/src": {
|
"src/third_party/libc++abi/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git",
|
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git",
|
||||||
"rev": "9a1d90c3b412d5ebeb97a6e33d98e1d0dd923221",
|
"rev": "cec7f478354a8c8599f264ed8bb6043b5468f72d",
|
||||||
"hash": "sha256-zPm+Rif9fITazDvvm6SvLq8gwcPzPbuaXlRbyYqv7JA="
|
"hash": "sha256-CwiK9Td8aRS08RywItHKFvibzDAUYYd0YNRKxYPLTD8="
|
||||||
},
|
},
|
||||||
"src/third_party/libunwind/src": {
|
"src/third_party/libunwind/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git",
|
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git",
|
||||||
"rev": "efc3baa2d1ece3630fcfa72bef93ed831bcaec4c",
|
"rev": "5b01ea4a6f3b666b7d190e7cb7c31db2ed4d94ce",
|
||||||
"hash": "sha256-0OBelaxkKdajYXrGgz08nyPZhxqpsnFXiF3m8DGQkDo="
|
"hash": "sha256-uA+t5Ecc/iK3mllHR8AMVGRfU/7z1G3yrw0TamPQiOY="
|
||||||
|
},
|
||||||
|
"src/third_party/llvm-libc/src": {
|
||||||
|
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git",
|
||||||
|
"rev": "ca74a72e2b32ad804522bbef04dfe32560a10206",
|
||||||
|
"hash": "sha256-av9JdqLOQbezgRS4P8QXmvfB5l47v04WRagNJJgT5u4="
|
||||||
},
|
},
|
||||||
"src/chrome/test/data/perf/canvas_bench": {
|
"src/chrome/test/data/perf/canvas_bench": {
|
||||||
"url": "https://chromium.googlesource.com/chromium/canvas_bench.git",
|
"url": "https://chromium.googlesource.com/chromium/canvas_bench.git",
|
||||||
|
@ -60,8 +65,8 @@
|
||||||
},
|
},
|
||||||
"src/docs/website": {
|
"src/docs/website": {
|
||||||
"url": "https://chromium.googlesource.com/website.git",
|
"url": "https://chromium.googlesource.com/website.git",
|
||||||
"rev": "4811f9e01c4cfcbf9c6957015063eaaa0d92be91",
|
"rev": "be9c3dfd3781964fc0bab0d6c91d9ad117b71b02",
|
||||||
"hash": "sha256-98wwIeMTF2Wg2sJ07U1OUV83wR9nJOjGubp7Vnk3kj8="
|
"hash": "sha256-CqveHvjPEcRWnzi8w13xr2OainrmABNO8uj0GzKmQqo="
|
||||||
},
|
},
|
||||||
"src/media/cdm/api": {
|
"src/media/cdm/api": {
|
||||||
"url": "https://chromium.googlesource.com/chromium/cdm.git",
|
"url": "https://chromium.googlesource.com/chromium/cdm.git",
|
||||||
|
@ -70,13 +75,13 @@
|
||||||
},
|
},
|
||||||
"src/net/third_party/quiche/src": {
|
"src/net/third_party/quiche/src": {
|
||||||
"url": "https://quiche.googlesource.com/quiche.git",
|
"url": "https://quiche.googlesource.com/quiche.git",
|
||||||
"rev": "e0175250977c2b2b95087afc0857883538a1386c",
|
"rev": "9616efc903b7469161996006c8cf963238e26503",
|
||||||
"hash": "sha256-1O+hnZF73AY44jcmajJlpaQY5PV4+x0hYwqf1TtMahY="
|
"hash": "sha256-Z2uFWfZDYcY0m4R6mFMZJLnnVHu3/hQOAkCPQ5049SQ="
|
||||||
},
|
},
|
||||||
"src/testing/libfuzzer/fuzzers/wasm_corpus": {
|
"src/testing/libfuzzer/fuzzers/wasm_corpus": {
|
||||||
"url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git",
|
"url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git",
|
||||||
"rev": "f650ff816f2ef227f61ea2e9f222aa69708ab367",
|
"rev": "1df5e50a45db9518a56ebb42cb020a94a090258b",
|
||||||
"hash": "sha256-qWsGQNUptbz0jYvUuxP7woNf5QQrfn9k3uvr82Yk0QM="
|
"hash": "sha256-gItDOfNqm1tHlmelz3l2GGdiKi9adu1EpPP6U7+8EQY="
|
||||||
},
|
},
|
||||||
"src/third_party/accessibility_test_framework/src": {
|
"src/third_party/accessibility_test_framework/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/google/Accessibility-Test-Framework-for-Android.git",
|
"url": "https://chromium.googlesource.com/external/github.com/google/Accessibility-Test-Framework-for-Android.git",
|
||||||
|
@ -85,8 +90,8 @@
|
||||||
},
|
},
|
||||||
"src/third_party/angle": {
|
"src/third_party/angle": {
|
||||||
"url": "https://chromium.googlesource.com/angle/angle.git",
|
"url": "https://chromium.googlesource.com/angle/angle.git",
|
||||||
"rev": "ac6cda4cbd716102ded6a965f79573b41581898d",
|
"rev": "ce13a00a2b049a1ef5e0e70a3d333ce70838ef7b",
|
||||||
"hash": "sha256-7Zfc262U42G6BUlxnLp6sQ78VlWBt0pTzkYwXY0rqaE="
|
"hash": "sha256-fMIHpa2QFsQQ19LGyhvV3Ihh6Ls8wwwhqTtpLoTEaf4="
|
||||||
},
|
},
|
||||||
"src/third_party/angle/third_party/glmark2/src": {
|
"src/third_party/angle/third_party/glmark2/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
|
"url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
|
||||||
|
@ -100,8 +105,8 @@
|
||||||
},
|
},
|
||||||
"src/third_party/angle/third_party/VK-GL-CTS/src": {
|
"src/third_party/angle/third_party/VK-GL-CTS/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS",
|
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS",
|
||||||
"rev": "179dd9f858f0f5b0e52b61aefc621dc82e2ad34a",
|
"rev": "f674555ab03e6355e0981a647c115097e9fe5324",
|
||||||
"hash": "sha256-B7X9PTlMQdolsvEfuCNaKnRFcvsPNZtn5FOcJBY6sCA="
|
"hash": "sha256-2ZhG4cJf85zO7x+SGG6RD2qgOxZVosxAIbuZt9GYUKs="
|
||||||
},
|
},
|
||||||
"src/third_party/anonymous_tokens/src": {
|
"src/third_party/anonymous_tokens/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git",
|
"url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git",
|
||||||
|
@ -115,13 +120,13 @@
|
||||||
},
|
},
|
||||||
"src/third_party/dav1d/libdav1d": {
|
"src/third_party/dav1d/libdav1d": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git",
|
"url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git",
|
||||||
"rev": "389450f61ea0b2057fc9ea393d3065859c4ba7f2",
|
"rev": "93f12c117a4e1c0cc2b129dcc52e84dbd9b84200",
|
||||||
"hash": "sha256-FK3tOLq5NcKQuStY5o8Lv2CXpjYHJm7n+NnyLFMOCxo="
|
"hash": "sha256-Q2CaWvDqOmfaPG6a+SUHG5rFHalPEf4Oq/ytT3xuSOk="
|
||||||
},
|
},
|
||||||
"src/third_party/dawn": {
|
"src/third_party/dawn": {
|
||||||
"url": "https://dawn.googlesource.com/dawn.git",
|
"url": "https://dawn.googlesource.com/dawn.git",
|
||||||
"rev": "740d2502dbbd719a76c5a8d3fb4dac1b5363f42e",
|
"rev": "73dbf565079c89a531e6e01c4e8fc048a8a9660b",
|
||||||
"hash": "sha256-R41YVv4uWCU6SsACXPRppeCDguTs+/NVJckvMGGTgJE="
|
"hash": "sha256-6P3Mw60+xZVsFbrhG6UkTlz8xvvEOptV3Ar1sos0CsU="
|
||||||
},
|
},
|
||||||
"src/third_party/dawn/third_party/glfw": {
|
"src/third_party/dawn/third_party/glfw": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
|
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
|
||||||
|
@ -130,8 +135,8 @@
|
||||||
},
|
},
|
||||||
"src/third_party/dawn/third_party/dxc": {
|
"src/third_party/dawn/third_party/dxc": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler",
|
"url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler",
|
||||||
"rev": "080aeb7199e66e4b0a2b6383fd26a9f8d2cccbf5",
|
"rev": "ac36a797d3470e8ee906b98457a59270d01db30d",
|
||||||
"hash": "sha256-YHEBGqfftgK68wWAWVTxtbl1GECBT1qTNe7irYkM/8k="
|
"hash": "sha256-rhUNPA5b0H3PBsOpXbAeRLpS0tNQkiHbjRBWmJycSAY="
|
||||||
},
|
},
|
||||||
"src/third_party/dawn/third_party/dxheaders": {
|
"src/third_party/dawn/third_party/dxheaders": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers",
|
"url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers",
|
||||||
|
@ -155,38 +160,38 @@
|
||||||
},
|
},
|
||||||
"src/third_party/dawn/third_party/webgpu-cts": {
|
"src/third_party/dawn/third_party/webgpu-cts": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts",
|
"url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts",
|
||||||
"rev": "815ff2bb4038144dea89c33021bc4429f22a130f",
|
"rev": "8690defa74b6975c10e85c113f121d4b2a3f2564",
|
||||||
"hash": "sha256-28uZotrv+/MBBo+pcBWY3Csqrdv5Y4DxGbGEwK9Cwdw="
|
"hash": "sha256-ArbHGjkHd1sko7gDPFksYz7XHKNge+e6tVy6oKPuqzg="
|
||||||
},
|
},
|
||||||
"src/third_party/highway/src": {
|
"src/third_party/highway/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/google/highway.git",
|
"url": "https://chromium.googlesource.com/external/github.com/google/highway.git",
|
||||||
"rev": "8295336dd70f1201d42c22ab5b0861de38cf8fbf",
|
"rev": "00fe003dac355b979f36157f9407c7c46448958e",
|
||||||
"hash": "sha256-PXsXIqWB4NNiFhanRjMIFSWYuW/IRuQo8mMPUBEentY="
|
"hash": "sha256-IS7m1wBwpPBUNhx2GttY1fzvmLIeAp3o2gXfrFpRdvY="
|
||||||
},
|
},
|
||||||
"src/third_party/google_benchmark/src": {
|
"src/third_party/google_benchmark/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git",
|
"url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git",
|
||||||
"rev": "344117638c8ff7e239044fd0fa7085839fc03021",
|
"rev": "761305ec3b33abf30e08d50eb829e19a802581cc",
|
||||||
"hash": "sha256-gztnxui9Fe/FTieMjdvfJjWHjkImtlsHn6fM1FruyME="
|
"hash": "sha256-cH8s1gP6kCcojAAfTt5iQCVqiAaSooNk4BdaILujM3w="
|
||||||
},
|
},
|
||||||
"src/third_party/boringssl/src": {
|
"src/third_party/boringssl/src": {
|
||||||
"url": "https://boringssl.googlesource.com/boringssl.git",
|
"url": "https://boringssl.googlesource.com/boringssl.git",
|
||||||
"rev": "cd95210465496ac2337b313cf49f607762abe286",
|
"rev": "571c76e919c0c48219ced35bef83e1fc83b00eed",
|
||||||
"hash": "sha256-172yvjgbFWQyd0PBRl74PJzpY/mDGC85D7PdeogNodU="
|
"hash": "sha256-ib9wbV6S64OFc4zx0wQsQ84+5RxbETK0PS9Wm1BFQ1U="
|
||||||
},
|
},
|
||||||
"src/third_party/breakpad/breakpad": {
|
"src/third_party/breakpad/breakpad": {
|
||||||
"url": "https://chromium.googlesource.com/breakpad/breakpad.git",
|
"url": "https://chromium.googlesource.com/breakpad/breakpad.git",
|
||||||
"rev": "6b0c5b7ee1988a14a4af94564e8ae8bba8a94374",
|
"rev": "47f7823bdf4b1f39e462b2a497a674860e922e38",
|
||||||
"hash": "sha256-kTkwRfaqw5ZCHEvu2YPZ+1vCfekHkY5pY3m9snDN64g="
|
"hash": "sha256-cFXUi2oO/614jF0GV7oW0ss62dXWFHDNWNT8rWHAiQc="
|
||||||
},
|
},
|
||||||
"src/third_party/cast_core/public/src": {
|
"src/third_party/cast_core/public/src": {
|
||||||
"url": "https://chromium.googlesource.com/cast_core/public",
|
"url": "https://chromium.googlesource.com/cast_core/public",
|
||||||
"rev": "71f51fd6fa45fac73848f65421081edd723297cd",
|
"rev": "fbc5e98031e1271a0a566fcd4d9092b2d3275d05",
|
||||||
"hash": "sha256-AalRQhJmornCqmvE2+36J/3LubaA0jr6P1PXy32lX4I="
|
"hash": "sha256-o5/Lbhh6HHSWCVCEyDwDCgs+PLm67si981w0HuIWY7c="
|
||||||
},
|
},
|
||||||
"src/third_party/catapult": {
|
"src/third_party/catapult": {
|
||||||
"url": "https://chromium.googlesource.com/catapult.git",
|
"url": "https://chromium.googlesource.com/catapult.git",
|
||||||
"rev": "44791916611acec1cd74c492c7453e46d9b0dbd2",
|
"rev": "b91cf840ac3255ef03b23cc93621369627422a1a",
|
||||||
"hash": "sha256-SkF+RIIlU8Vl3AmN6kARkLuVz/X5vygNOtGN2K3Sr+M="
|
"hash": "sha256-65cZPyqZUdSnYPJYUMYeJgx3mUC6L/qb9P2bDqd2Zkk="
|
||||||
},
|
},
|
||||||
"src/third_party/ced/src": {
|
"src/third_party/ced/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git",
|
"url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git",
|
||||||
|
@ -195,8 +200,8 @@
|
||||||
},
|
},
|
||||||
"src/third_party/chromium-variations": {
|
"src/third_party/chromium-variations": {
|
||||||
"url": "https://chromium.googlesource.com/chromium-variations.git",
|
"url": "https://chromium.googlesource.com/chromium-variations.git",
|
||||||
"rev": "7d681838b57a25ca6659b9cc0111f879147c416b",
|
"rev": "c170abb48f7715c237f4c06eaed0fe6f8a4c6f8d",
|
||||||
"hash": "sha256-zio8SqKEqOYYjVWZnzfrPqngqym2lZu9M/hgSi3ey0Q="
|
"hash": "sha256-mg5mu2jcy0xyNJ650ywWUMC94keRsqhZQuPZclHmyLI="
|
||||||
},
|
},
|
||||||
"src/third_party/cld_3/src": {
|
"src/third_party/cld_3/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git",
|
"url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git",
|
||||||
|
@ -215,8 +220,8 @@
|
||||||
},
|
},
|
||||||
"src/third_party/cpuinfo/src": {
|
"src/third_party/cpuinfo/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git",
|
"url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git",
|
||||||
"rev": "1e83a2fdd3102f65c6f1fb602c1b320486218a99",
|
"rev": "8df44962d437a0477f07ba6b8843d0b6a48646a4",
|
||||||
"hash": "sha256-28cFACca+NYE8oKlP5aWXNCLeEjhWqJ6gRnFI+VxDvg="
|
"hash": "sha256-FlvmSjY8kt5XHymDLaZdPuZ4k5xcagJk8w/U6adTkWI="
|
||||||
},
|
},
|
||||||
"src/third_party/crc32c/src": {
|
"src/third_party/crc32c/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git",
|
"url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git",
|
||||||
|
@ -225,23 +230,23 @@
|
||||||
},
|
},
|
||||||
"src/third_party/cros_system_api": {
|
"src/third_party/cros_system_api": {
|
||||||
"url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git",
|
"url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git",
|
||||||
"rev": "b08c5ad457bddea2664ba20fb25beb3d1799fed2",
|
"rev": "554629b9242e6ae832ef14e3384654426f7fcc06",
|
||||||
"hash": "sha256-cwpcY8YTXk+VVIFphO5ihc5rvbG3ZY9iHeK81P5DHBs="
|
"hash": "sha256-fvGypRhgl2uX9YE2cwjL7d3pYBa3Imd5p0RLhMYRgrc="
|
||||||
},
|
},
|
||||||
"src/third_party/crossbench": {
|
"src/third_party/crossbench": {
|
||||||
"url": "https://chromium.googlesource.com/crossbench.git",
|
"url": "https://chromium.googlesource.com/crossbench.git",
|
||||||
"rev": "b4d7ae714c548c3e139b95a85582dc15ece1d2f7",
|
"rev": "ae6f165652e0ea983d73f5d04b7470d08c869e4f",
|
||||||
"hash": "sha256-1RDDbvce5WR32if3cFYxiU9HS04x3BYIgOFJPMVJSBo="
|
"hash": "sha256-/K6eM9s+fd2wjCrK0g0CgFNy0zxEN9SxTvmE50hMtXw="
|
||||||
},
|
},
|
||||||
"src/third_party/depot_tools": {
|
"src/third_party/depot_tools": {
|
||||||
"url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git",
|
"url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git",
|
||||||
"rev": "20b9bdcace7ed561d6a75728c85373503473cb6b",
|
"rev": "41d43a2a2290450aeab946883542f8049b155c87",
|
||||||
"hash": "sha256-vlBENaVTtbwDJtSswuszcUlx+icZYJeP6ew6MO1cAv0="
|
"hash": "sha256-m/6b4VZZTUQOeED1mYvZOQCx8Re+Zd4O8SKDMjJ9Djo="
|
||||||
},
|
},
|
||||||
"src/third_party/devtools-frontend/src": {
|
"src/third_party/devtools-frontend/src": {
|
||||||
"url": "https://chromium.googlesource.com/devtools/devtools-frontend",
|
"url": "https://chromium.googlesource.com/devtools/devtools-frontend",
|
||||||
"rev": "5284f1c63b2b08c47b8915ce713a1aace991dfe9",
|
"rev": "f2f3682c9db8ca427f8c64f0402cc2c5152c6c24",
|
||||||
"hash": "sha256-1Nh9SVIAde4jxgwFucbtZpl6rMyPM4Plfi+dhwP0wI8="
|
"hash": "sha256-mBWZdbgZfO01Pt2lZSHX/d5r+8A/+qCZA8MRtZdeTrs="
|
||||||
},
|
},
|
||||||
"src/third_party/dom_distiller_js/dist": {
|
"src/third_party/dom_distiller_js/dist": {
|
||||||
"url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
|
"url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
|
||||||
|
@ -250,8 +255,8 @@
|
||||||
},
|
},
|
||||||
"src/third_party/eigen3/src": {
|
"src/third_party/eigen3/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git",
|
"url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git",
|
||||||
"rev": "7eea0a9213e801ad9479a6499fd0330ec1db8693",
|
"rev": "b396a6fbb2e173f52edb3360485dedf3389ef830",
|
||||||
"hash": "sha256-JkOjOnLrDOcYHi3hptT1BDRvsKpTtOsBHT8YLb1hlJM="
|
"hash": "sha256-UroGjERR5TW9KbyLwR/NBpytXrW1tHfu6ZvQPngROq4="
|
||||||
},
|
},
|
||||||
"src/third_party/farmhash/src": {
|
"src/third_party/farmhash/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git",
|
"url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git",
|
||||||
|
@ -265,8 +270,8 @@
|
||||||
},
|
},
|
||||||
"src/third_party/ffmpeg": {
|
"src/third_party/ffmpeg": {
|
||||||
"url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git",
|
"url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git",
|
||||||
"rev": "686d6944501a6ee9c849581e3fe343273d4af3f6",
|
"rev": "591ae4b02eaff9a03e2ec863da895128b0b49910",
|
||||||
"hash": "sha256-j5mpWn4j+U4rRlXbq8okUUXrRKycZkiV+UntiS90ChM="
|
"hash": "sha256-wwHxNuZe2hBmGBpVg/iQJBoL350jfPYPTPqDn3RiqZE="
|
||||||
},
|
},
|
||||||
"src/third_party/flac": {
|
"src/third_party/flac": {
|
||||||
"url": "https://chromium.googlesource.com/chromium/deps/flac.git",
|
"url": "https://chromium.googlesource.com/chromium/deps/flac.git",
|
||||||
|
@ -300,8 +305,8 @@
|
||||||
},
|
},
|
||||||
"src/third_party/freetype/src": {
|
"src/third_party/freetype/src": {
|
||||||
"url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git",
|
"url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git",
|
||||||
"rev": "f02bffad0fd57f3acfa835c3f2899c5b71ff8be0",
|
"rev": "0ae7e607370cc66218ccfacf5de4db8a35424c2f",
|
||||||
"hash": "sha256-Lc2hbmZnnXQa0vzlJCizNBQ5WCOI5sJglTTe5gWVYUA="
|
"hash": "sha256-+nbRZi3vAMTURhhFVUu5+59fVIv0GH3YZog2JavyVLY="
|
||||||
},
|
},
|
||||||
"src/third_party/freetype-testing/src": {
|
"src/third_party/freetype-testing/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git",
|
"url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git",
|
||||||
|
@ -350,8 +355,8 @@
|
||||||
},
|
},
|
||||||
"src/third_party/googletest/src": {
|
"src/third_party/googletest/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/google/googletest.git",
|
"url": "https://chromium.googlesource.com/external/github.com/google/googletest.git",
|
||||||
"rev": "62df7bdbc10887e094661e07ec2595b7920376fd",
|
"rev": "d144031940543e15423a25ae5a8a74141044862f",
|
||||||
"hash": "sha256-Iv/7r79cKC1pFkxPPHK/IHv/HFx18XZ4YVr+C2CX8+M="
|
"hash": "sha256-n7tiIFAj8AiSCa9Tw+1j+ro9cSt5vagZpkbBBUUtYQY="
|
||||||
},
|
},
|
||||||
"src/third_party/hunspell_dictionaries": {
|
"src/third_party/hunspell_dictionaries": {
|
||||||
"url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git",
|
"url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git",
|
||||||
|
@ -375,8 +380,8 @@
|
||||||
},
|
},
|
||||||
"src/third_party/libFuzzer/src": {
|
"src/third_party/libFuzzer/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git",
|
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git",
|
||||||
"rev": "487e79376394754705984c5de7c4ce7f82f2bd7c",
|
"rev": "a7128317fe7935a43d6c9f39df54f21113951941",
|
||||||
"hash": "sha256-xQXfRIcQmAVP0k2mT7Blv1wBxL6wDaWTbIPGcTiMZRo="
|
"hash": "sha256-jPS+Xi/ia0sMspxSGN38zasmVS/HslxH/qOFsV9TguE="
|
||||||
},
|
},
|
||||||
"src/third_party/fuzztest/src": {
|
"src/third_party/fuzztest/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git",
|
"url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git",
|
||||||
|
@ -395,28 +400,23 @@
|
||||||
},
|
},
|
||||||
"src/third_party/libaom/source/libaom": {
|
"src/third_party/libaom/source/libaom": {
|
||||||
"url": "https://aomedia.googlesource.com/aom.git",
|
"url": "https://aomedia.googlesource.com/aom.git",
|
||||||
"rev": "840f8797871cc587f7113ea9d2483a1156d57c0e",
|
"rev": "be60f06ab420d6a65c477213f04c8b0f2e12ba2e",
|
||||||
"hash": "sha256-2XHqNAmv2L3TEFXu4Q6rnASLmuE93QplSVKNqyhlKUk="
|
"hash": "sha256-9VhEVOG9cReDOGoX+x5G/jJ8Y5RDoQIiLMoZtt5c9pI="
|
||||||
},
|
},
|
||||||
"src/third_party/libavif/src": {
|
"src/third_party/libavif/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git",
|
"url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git",
|
||||||
"rev": "2c36aed375fff68611641b57d919b191f33431d5",
|
"rev": "1cdeff7ecf456492c47cf48fc0cef6591cdc95da",
|
||||||
"hash": "sha256-fApdfzEtQnmio6BVzkcr/VkwojrNs+cx/+Am80H9dXw="
|
"hash": "sha256-lUuVyh2srhWMNUp4lEivyDic3MSZf5s63iAb84We80M="
|
||||||
},
|
},
|
||||||
"src/third_party/crabbyavif/src": {
|
"src/third_party/crabbyavif/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
|
"url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
|
||||||
"rev": "ffad64ff4e349f926ad5ffcc882e205a94156d77",
|
"rev": "c3548280e0a516ed7cad7ff1591b5807cef64aa4",
|
||||||
"hash": "sha256-M2ExAgLm/NZ2soQEv3Ap/qx/B3+nd3NdDqYOL0E/pc8="
|
"hash": "sha256-hO5epHYNYI6pGwVSUv1Hp3qb7qOv8uOs4u+IdhDxd8Q="
|
||||||
},
|
|
||||||
"src/third_party/libavifinfo/src": {
|
|
||||||
"url": "https://aomedia.googlesource.com/libavifinfo.git",
|
|
||||||
"rev": "8d8b58a3f517ef8d1794baa28ca6ae7d19f65514",
|
|
||||||
"hash": "sha256-61OPjdMCIbHvWncmBzNw6sqlHcuc1kyqm9k1j4UTcZ0="
|
|
||||||
},
|
},
|
||||||
"src/third_party/nearby/src": {
|
"src/third_party/nearby/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git",
|
"url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git",
|
||||||
"rev": "1b382075dd1bd545655af7ebef949b3090061b74",
|
"rev": "8e87a6e51c93e7836ecdbcc0a520c7992f3ece13",
|
||||||
"hash": "sha256-kpyJiFXtk8eK8EkgzUbG0GS+znEeqzlB62qy9tPpEC8="
|
"hash": "sha256-DO3FW5Q233ctFKk4K5F8oZec9kfrVl6uxAwMn0niKz4="
|
||||||
},
|
},
|
||||||
"src/third_party/beto-core/src": {
|
"src/third_party/beto-core/src": {
|
||||||
"url": "https://beto-core.googlesource.com/beto-core.git",
|
"url": "https://beto-core.googlesource.com/beto-core.git",
|
||||||
|
@ -440,8 +440,8 @@
|
||||||
},
|
},
|
||||||
"src/third_party/cros-components/src": {
|
"src/third_party/cros-components/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/google3/cros_components.git",
|
"url": "https://chromium.googlesource.com/external/google3/cros_components.git",
|
||||||
"rev": "902e8ca804ae6c05f505e510c16647c32ce4d1cb",
|
"rev": "9129cf4b2a5ca775c280243257a0b4856a93c7fb",
|
||||||
"hash": "sha256-j2m9zVajkAdPF1ehLX0Gxp4LyMunhFDDCzrCm2WzArc="
|
"hash": "sha256-owXaTIj0pbhUeJkirxaRoCmgIN9DwNzY3h771kaN+Fc="
|
||||||
},
|
},
|
||||||
"src/third_party/libdrm/src": {
|
"src/third_party/libdrm/src": {
|
||||||
"url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git",
|
"url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git",
|
||||||
|
@ -490,8 +490,8 @@
|
||||||
},
|
},
|
||||||
"src/third_party/libvpx/source/libvpx": {
|
"src/third_party/libvpx/source/libvpx": {
|
||||||
"url": "https://chromium.googlesource.com/webm/libvpx.git",
|
"url": "https://chromium.googlesource.com/webm/libvpx.git",
|
||||||
"rev": "906334ac1de2b0afa666472dce5545b82c1251fb",
|
"rev": "727319a77ffe68e9aacb08e09ae7151b3a8f70a3",
|
||||||
"hash": "sha256-7GInV/uHuK6bUa1dSBuxJn6adyjfoOqSqfmfTvQbAoc="
|
"hash": "sha256-QGm37X4uid8zv+vRu0pVTvoQd2WcKztrj3tJkDjx82o="
|
||||||
},
|
},
|
||||||
"src/third_party/libwebm/source": {
|
"src/third_party/libwebm/source": {
|
||||||
"url": "https://chromium.googlesource.com/webm/libwebm.git",
|
"url": "https://chromium.googlesource.com/webm/libwebm.git",
|
||||||
|
@ -505,8 +505,8 @@
|
||||||
},
|
},
|
||||||
"src/third_party/libyuv": {
|
"src/third_party/libyuv": {
|
||||||
"url": "https://chromium.googlesource.com/libyuv/libyuv.git",
|
"url": "https://chromium.googlesource.com/libyuv/libyuv.git",
|
||||||
"rev": "a8e59d207483f75b87dd5fc670e937672cdf5776",
|
"rev": "6ac7c8f25170c85265fca69fd1fe5d31baf3344f",
|
||||||
"hash": "sha256-gTNmhYuYmt/JmWSAVbcE4PqG3kW/JaL7XEWXbiNVfMM="
|
"hash": "sha256-vPVq7RzqO7gBUgYuNX0Fwxqok9jtXXJZgbhVFchG5Ws="
|
||||||
},
|
},
|
||||||
"src/third_party/lss": {
|
"src/third_party/lss": {
|
||||||
"url": "https://chromium.googlesource.com/linux-syscall-support.git",
|
"url": "https://chromium.googlesource.com/linux-syscall-support.git",
|
||||||
|
@ -540,8 +540,8 @@
|
||||||
},
|
},
|
||||||
"src/third_party/openscreen/src": {
|
"src/third_party/openscreen/src": {
|
||||||
"url": "https://chromium.googlesource.com/openscreen",
|
"url": "https://chromium.googlesource.com/openscreen",
|
||||||
"rev": "4f27c4f1698522dfcea36dca948a13e2eaf4c26c",
|
"rev": "cb6fd42532fc3a831d6863d5006217e32a67c417",
|
||||||
"hash": "sha256-dosSqpFlvli60ZJ0vexVZOK/FmzOYq5BDrZKZW0lMfc="
|
"hash": "sha256-IlGxfw6Mhc7FYvhU2+Ngt9qflqr4JMC2OcplvksGI+U="
|
||||||
},
|
},
|
||||||
"src/third_party/openscreen/src/buildtools": {
|
"src/third_party/openscreen/src/buildtools": {
|
||||||
"url": "https://chromium.googlesource.com/chromium/src/buildtools",
|
"url": "https://chromium.googlesource.com/chromium/src/buildtools",
|
||||||
|
@ -555,13 +555,13 @@
|
||||||
},
|
},
|
||||||
"src/third_party/pdfium": {
|
"src/third_party/pdfium": {
|
||||||
"url": "https://pdfium.googlesource.com/pdfium.git",
|
"url": "https://pdfium.googlesource.com/pdfium.git",
|
||||||
"rev": "7a8409531fbb58d7d15ae331e645977b113d7ced",
|
"rev": "84a8011ec69d0e2de271c05be7d62979608040d9",
|
||||||
"hash": "sha256-KlqgaOxKJQHHjU1g1VCcJEBhv809DdEUedrxdk8N99I="
|
"hash": "sha256-d8qJECIdq01ct+sS7cHVKFulYJarwahKCEcVf762JNI="
|
||||||
},
|
},
|
||||||
"src/third_party/perfetto": {
|
"src/third_party/perfetto": {
|
||||||
"url": "https://android.googlesource.com/platform/external/perfetto.git",
|
"url": "https://android.googlesource.com/platform/external/perfetto.git",
|
||||||
"rev": "24764a1d9c2fce1e9816ffae691f00353ade330d",
|
"rev": "ea011a2c2d3aecdc4f1674887e107a56d2905edd",
|
||||||
"hash": "sha256-FAaxTuIYExmL3PSWwcvLpnPD4qsGDGr4/CIyi0NSrnI="
|
"hash": "sha256-3vervpsq/QLMrR7RcJMwwh+CdFvSEj8yAzj6s9d1XMo="
|
||||||
},
|
},
|
||||||
"src/third_party/protobuf-javascript/src": {
|
"src/third_party/protobuf-javascript/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript",
|
"url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript",
|
||||||
|
@ -580,8 +580,8 @@
|
||||||
},
|
},
|
||||||
"src/third_party/quic_trace/src": {
|
"src/third_party/quic_trace/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git",
|
"url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git",
|
||||||
"rev": "caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc",
|
"rev": "413da873d93a03d3662f24b881ea459a79f9c589",
|
||||||
"hash": "sha256-Nf9ZDLcE1JunhbpEMHhrY2ROnbgrvVZoRkPwWq1DU0g="
|
"hash": "sha256-N1uFoNd3mz/LH1z06581Ds7BUyc67SNXUPzqomYREr8="
|
||||||
},
|
},
|
||||||
"src/third_party/pywebsocket3/src": {
|
"src/third_party/pywebsocket3/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git",
|
"url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git",
|
||||||
|
@ -600,8 +600,8 @@
|
||||||
},
|
},
|
||||||
"src/third_party/skia": {
|
"src/third_party/skia": {
|
||||||
"url": "https://skia.googlesource.com/skia.git",
|
"url": "https://skia.googlesource.com/skia.git",
|
||||||
"rev": "f14f6b1ab7cf544c0190074488d17821281cfa4d",
|
"rev": "c17fe9bc158c29de3cdd655ac73d14f52c17810a",
|
||||||
"hash": "sha256-0p57otDuIShl6MngYs22XA1QYxptDVa3vCwJsH59H34="
|
"hash": "sha256-mRfkEm+NzEX0DkJejk1THx4G7v0sIFmRrAnt3Zl5uco="
|
||||||
},
|
},
|
||||||
"src/third_party/smhasher/src": {
|
"src/third_party/smhasher/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/smhasher.git",
|
"url": "https://chromium.googlesource.com/external/smhasher.git",
|
||||||
|
@ -620,8 +620,8 @@
|
||||||
},
|
},
|
||||||
"src/third_party/swiftshader": {
|
"src/third_party/swiftshader": {
|
||||||
"url": "https://swiftshader.googlesource.com/SwiftShader.git",
|
"url": "https://swiftshader.googlesource.com/SwiftShader.git",
|
||||||
"rev": "7a9a492a38b7c701f7c96a15a76046aed8f8c0c3",
|
"rev": "d5c4284774115bb1e32c012a2be1b5fbeb1ab1f9",
|
||||||
"hash": "sha256-6uBO4jwPSqhT4j+KTE0Za7B4prrE2kstsHNtHwTJX+Q="
|
"hash": "sha256-h2BHyaOM0oscfX5cu8s4N1yyOkg/yQbvwD1DxF+RAQc="
|
||||||
},
|
},
|
||||||
"src/third_party/text-fragments-polyfill/src": {
|
"src/third_party/text-fragments-polyfill/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git",
|
"url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git",
|
||||||
|
@ -630,18 +630,18 @@
|
||||||
},
|
},
|
||||||
"src/third_party/tflite/src": {
|
"src/third_party/tflite/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git",
|
"url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git",
|
||||||
"rev": "689e8a82f8070a372981b7476fb673e243330d71",
|
"rev": "658227d3b535287dc6859788bde6076c4fe3fe7c",
|
||||||
"hash": "sha256-tImVDNyS5hCN6A1ODeVuB7XLCNr3EdxN8x961nPCM9g="
|
"hash": "sha256-gOUt/NljRK5wMFwy2aLqZ5NHwk4y/GxbQ+AZ3MxM0M8="
|
||||||
},
|
},
|
||||||
"src/third_party/vulkan-deps": {
|
"src/third_party/vulkan-deps": {
|
||||||
"url": "https://chromium.googlesource.com/vulkan-deps",
|
"url": "https://chromium.googlesource.com/vulkan-deps",
|
||||||
"rev": "73fd75175922012f21557239b7743a152ea7f1fd",
|
"rev": "0b56dd5952b25fad65139b64096fcd187048ed38",
|
||||||
"hash": "sha256-D8UIXXQX6dTxbuqFgd6AbmErr1r9839yiN6MrJlsqPw="
|
"hash": "sha256-LVWvbMLjkMyAUM+0UpQ4oRsfcRU5F/xY60wiwxth4Ko="
|
||||||
},
|
},
|
||||||
"src/third_party/glslang/src": {
|
"src/third_party/glslang/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang",
|
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang",
|
||||||
"rev": "2acc4ea0028bc703be2d4e9bc8a4032d015d6516",
|
"rev": "9c644fcb5b9a1a9c975c50a790fd14c5451292b0",
|
||||||
"hash": "sha256-mwcvSRycM8bq3dDWk4yfkL8Tg5bfEap6lrr1Oxemzy4="
|
"hash": "sha256-twWSeJp9bNbLYFszCWv9BCztfbXUBKSWV55/U+hd2hw="
|
||||||
},
|
},
|
||||||
"src/third_party/spirv-cross/src": {
|
"src/third_party/spirv-cross/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross",
|
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross",
|
||||||
|
@ -650,38 +650,38 @@
|
||||||
},
|
},
|
||||||
"src/third_party/spirv-headers/src": {
|
"src/third_party/spirv-headers/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers",
|
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers",
|
||||||
"rev": "50bc4debdc3eec5045edbeb8ce164090e29b91f3",
|
"rev": "996c728cf7dcfb29845cfa15222822318f047810",
|
||||||
"hash": "sha256-Zv5QZ8MmP45MH5e6EBDNPmP0vcjjNXJHKva5MNh5ovA="
|
"hash": "sha256-FrT/kVIMjcu2zv+7kDeNKM77NnOyMBb8pV0w8DBP42A="
|
||||||
},
|
},
|
||||||
"src/third_party/spirv-tools/src": {
|
"src/third_party/spirv-tools/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools",
|
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools",
|
||||||
"rev": "42b315c15b1ff941b46bb3949c105e5386be8717",
|
"rev": "9117e042b93d4ff08d2406542708170f77aaa2a3",
|
||||||
"hash": "sha256-xb0TlPyXP2wu7jMrWZu+z8WC5mk0CbYgvkZEt3r+mww="
|
"hash": "sha256-m/a1i26u8lzpKuQHyAy6ktWWjbLZEaio1awz8VovTGE="
|
||||||
},
|
},
|
||||||
"src/third_party/vulkan-headers/src": {
|
"src/third_party/vulkan-headers/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers",
|
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers",
|
||||||
"rev": "14345dab231912ee9601136e96ca67a6e1f632e7",
|
"rev": "cbcad3c0587dddc768d76641ea00f5c45ab5a278",
|
||||||
"hash": "sha256-ny/UVx4r+Fj39ZEepaWqDPplAJcrBQEQlkqsSofwLJ0="
|
"hash": "sha256-exXzafLgrgxyRvaF+4pCF+OLtPT2gDmcvzazQ4EQ1eA="
|
||||||
},
|
},
|
||||||
"src/third_party/vulkan-loader/src": {
|
"src/third_party/vulkan-loader/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader",
|
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader",
|
||||||
"rev": "bd1c8ea9c6ac51e4c3a6ddb9d602bb204678eb5f",
|
"rev": "b0177a972b8d47e823a4500cf88df88a8c27add7",
|
||||||
"hash": "sha256-Ze/DGiD8Zj3mY+5Pi+tf6xMrX2YBqfl4Nc37b/JgmnI="
|
"hash": "sha256-NDp2TLeMLAHb92R+PjaPDTx8ckIlpSsS3BNx3lerB68="
|
||||||
},
|
},
|
||||||
"src/third_party/vulkan-tools/src": {
|
"src/third_party/vulkan-tools/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools",
|
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools",
|
||||||
"rev": "c9a5acda16dc2759457dc856b5d7df00ac5bf4a2",
|
"rev": "15f2de809304aba619ee327f3273425418ca83de",
|
||||||
"hash": "sha256-0JzqUW6XbhPbLGs/smuNG6zQoWP8iaAO5VglGSyN94g="
|
"hash": "sha256-PiWKL045DAOGm+Hl/UyO6vmD4fVfuf2fSvXK6gSYbwo="
|
||||||
},
|
},
|
||||||
"src/third_party/vulkan-utility-libraries/src": {
|
"src/third_party/vulkan-utility-libraries/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries",
|
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries",
|
||||||
"rev": "8c907ea21fe0147f791d79051b18e21bc8c4ede0",
|
"rev": "87ab6b39a97d084a2ef27db85e3cbaf5d2622a09",
|
||||||
"hash": "sha256-2abhzNt/rKbAhGQZhUhQ2LoemtU1Yh1fx9rrijOtjy4="
|
"hash": "sha256-luDw6g/EMSK67Et2wNta74PHGQU6Y7IRpDlSpgDYV6Q="
|
||||||
},
|
},
|
||||||
"src/third_party/vulkan-validation-layers/src": {
|
"src/third_party/vulkan-validation-layers/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers",
|
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers",
|
||||||
"rev": "cbb4ab171fc7cd0b636a76ee542e238a8734f4be",
|
"rev": "bc2c38412f739c298d6f5c076c064e6b5696959f",
|
||||||
"hash": "sha256-nKpS0ddAsN2KhOg6J/SwB8ZlVXrJTVixD4DuUkyxb6c="
|
"hash": "sha256-WWV+P++0Czeqg5p2UTqIP81pY8oz7cS7E7Z/sc0km6g="
|
||||||
},
|
},
|
||||||
"src/third_party/vulkan_memory_allocator": {
|
"src/third_party/vulkan_memory_allocator": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
|
"url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
|
||||||
|
@ -720,13 +720,13 @@
|
||||||
},
|
},
|
||||||
"src/third_party/webgpu-cts/src": {
|
"src/third_party/webgpu-cts/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git",
|
"url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git",
|
||||||
"rev": "ae8b3ca40fbeee0bc67ef41a6c5b6dd5af839344",
|
"rev": "b9f32fd2943dd2b3d0033bf938c9d843f4b5c9a9",
|
||||||
"hash": "sha256-7u5Ay43GtcVTt3Cwg/5OaYQdG6SXXYtUun7DVN+XChE="
|
"hash": "sha256-Dd5uWNtnBIc2jiMkh9KjI5O1tJtmMvdlMA2nf+VOkQQ="
|
||||||
},
|
},
|
||||||
"src/third_party/webrtc": {
|
"src/third_party/webrtc": {
|
||||||
"url": "https://webrtc.googlesource.com/src.git",
|
"url": "https://webrtc.googlesource.com/src.git",
|
||||||
"rev": "79aff54b0fa9238ce3518dd9eaf9610cd6f22e82",
|
"rev": "afaf497805cbb502da89991c2dcd783201efdd08",
|
||||||
"hash": "sha256-xkMnUduSG88EWiwq6PITN0KgAKjFd4QOis3dgxedK30="
|
"hash": "sha256-S8kGTd3+lf5OTayCMOqqrjxH4tcbT0NLZBpKmTCysMs="
|
||||||
},
|
},
|
||||||
"src/third_party/wuffs/src": {
|
"src/third_party/wuffs/src": {
|
||||||
"url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
|
"url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
|
||||||
|
@ -745,8 +745,8 @@
|
||||||
},
|
},
|
||||||
"src/third_party/xnnpack/src": {
|
"src/third_party/xnnpack/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git",
|
"url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git",
|
||||||
"rev": "3986629de01e518a3f2359bf5629ef2b7ef72330",
|
"rev": "d1d33679661a34f03a806af2b813f699db3004f9",
|
||||||
"hash": "sha256-x8GQUj75mQXswI3b29tS9u25Zx3peYqDM8v1/wkC9cs="
|
"hash": "sha256-aDPlmLxNY9M5+Qb8VtdfxphHXU/X6JwYhkUSXkLh/FE="
|
||||||
},
|
},
|
||||||
"src/tools/page_cycler/acid3": {
|
"src/tools/page_cycler/acid3": {
|
||||||
"url": "https://chromium.googlesource.com/chromium/deps/acid3.git",
|
"url": "https://chromium.googlesource.com/chromium/deps/acid3.git",
|
||||||
|
@ -755,13 +755,13 @@
|
||||||
},
|
},
|
||||||
"src/third_party/zstd/src": {
|
"src/third_party/zstd/src": {
|
||||||
"url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git",
|
"url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git",
|
||||||
"rev": "20707e3718ee14250fb8a44b3bf023ea36bd88df",
|
"rev": "7fb5347e88f10472226c9aa1962a148e55d8c480",
|
||||||
"hash": "sha256-/IUfh0De9m7ACrisqKlpxZsb+asoAWGXCaK6L+s24Q8="
|
"hash": "sha256-4J/F2v2W3mMdhqQ4q35gYkGaqTKlcG6OxUt3vQ8pcLs="
|
||||||
},
|
},
|
||||||
"src/v8": {
|
"src/v8": {
|
||||||
"url": "https://chromium.googlesource.com/v8/v8.git",
|
"url": "https://chromium.googlesource.com/v8/v8.git",
|
||||||
"rev": "9c09e7876ff830e1f9a731aa930040d1028ff5a1",
|
"rev": "e51f1d7dbd113aa01ddfb30890c8a89b11fcd96c",
|
||||||
"hash": "sha256-OKa0W4s3VfaQ/MBHkrkZ8/LeRGqjGh9hTaqet7S4o58="
|
"hash": "sha256-KJirPTvmC6vRTvrl6Nl0SQSieX/OhgfIiTblMxgoAvU="
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
@ -417,11 +417,11 @@
|
||||||
"vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw="
|
"vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw="
|
||||||
},
|
},
|
||||||
"equinix": {
|
"equinix": {
|
||||||
"hash": "sha256-PiAJ5Rw9qOmxNIsgayNJAC3EATu24OsDvonuqegSS7U=",
|
"hash": "sha256-G1ZgklICoKoH339/ipKJXZD9ftM5fTy99kFh62FqfrI=",
|
||||||
"homepage": "https://registry.terraform.io/providers/equinix/equinix",
|
"homepage": "https://registry.terraform.io/providers/equinix/equinix",
|
||||||
"owner": "equinix",
|
"owner": "equinix",
|
||||||
"repo": "terraform-provider-equinix",
|
"repo": "terraform-provider-equinix",
|
||||||
"rev": "v3.1.0",
|
"rev": "v3.1.1",
|
||||||
"spdx": "MIT",
|
"spdx": "MIT",
|
||||||
"vendorHash": "sha256-wcrrSdSfL/hqA2Z2h1lTTCWWERfIdmsbOLY2H4SdVv0="
|
"vendorHash": "sha256-wcrrSdSfL/hqA2Z2h1lTTCWWERfIdmsbOLY2H4SdVv0="
|
||||||
},
|
},
|
||||||
|
@ -705,13 +705,13 @@
|
||||||
"vendorHash": "sha256-rGujp6FsQnkznRfjrSSB+4lLC3wAv6yvL/jAoWOiST0="
|
"vendorHash": "sha256-rGujp6FsQnkznRfjrSSB+4lLC3wAv6yvL/jAoWOiST0="
|
||||||
},
|
},
|
||||||
"keycloak": {
|
"keycloak": {
|
||||||
"hash": "sha256-2Z7nQ5NKS18OtoXXLm/P1n64NAxLR8nfMGyS2y17lag=",
|
"hash": "sha256-hdTZ+UEpmv4T8Kxk8cf1QACUKyOoRbD1X3OxwhmrRiI=",
|
||||||
"homepage": "https://registry.terraform.io/providers/mrparkers/keycloak",
|
"homepage": "https://registry.terraform.io/providers/keycloak/keycloak",
|
||||||
"owner": "mrparkers",
|
"owner": "keycloak",
|
||||||
"repo": "terraform-provider-keycloak",
|
"repo": "terraform-provider-keycloak",
|
||||||
"rev": "v4.4.0",
|
"rev": "v5.0.0",
|
||||||
"spdx": "MIT",
|
"spdx": "Apache-2.0",
|
||||||
"vendorHash": "sha256-F78OR8EG0Vy3WVJWTOlAsIBazsSXGD6KeceYuGnBqjQ="
|
"vendorHash": "sha256-51sFU6P4Ynyu9NpQxlbSV7EoB/Lk1da4O0bOuoeMujI="
|
||||||
},
|
},
|
||||||
"kubectl": {
|
"kubectl": {
|
||||||
"hash": "sha256-UQ/xvhs7II+EGH5bKdrVC47hp5dhLqQZeqSBz06ho1s=",
|
"hash": "sha256-UQ/xvhs7II+EGH5bKdrVC47hp5dhLqQZeqSBz06ho1s=",
|
||||||
|
@ -1192,13 +1192,13 @@
|
||||||
"vendorHash": "sha256-c3R/7k7y7XS2Qli00nSj7gh/3Mj88PY4WybBTq/+pPs="
|
"vendorHash": "sha256-c3R/7k7y7XS2Qli00nSj7gh/3Mj88PY4WybBTq/+pPs="
|
||||||
},
|
},
|
||||||
"spotinst": {
|
"spotinst": {
|
||||||
"hash": "sha256-odW3iNfCrl6VLWZGjwZoVfwWHJXCJXzfbjoh+QitbTo=",
|
"hash": "sha256-ovrWtOJe5AVF1oneb+9It4MMkT8uL3bBdiXJNjahYRY=",
|
||||||
"homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
|
"homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
|
||||||
"owner": "spotinst",
|
"owner": "spotinst",
|
||||||
"repo": "terraform-provider-spotinst",
|
"repo": "terraform-provider-spotinst",
|
||||||
"rev": "v1.204.0",
|
"rev": "v1.207.0",
|
||||||
"spdx": "MPL-2.0",
|
"spdx": "MPL-2.0",
|
||||||
"vendorHash": "sha256-m2WVp5FdEl1yyvdAqAe0tqbH7GC6M5WkxJxXevXxCL4="
|
"vendorHash": "sha256-mVZbO2AH+mQeOj3I1FH2poQnQNGJUzxQNGmIv8nOqNw="
|
||||||
},
|
},
|
||||||
"ssh": {
|
"ssh": {
|
||||||
"hash": "sha256-1UN5QJyjCuxs2vQYlSuz2jsu/HgGTxOoWWRcv4qcwow=",
|
"hash": "sha256-1UN5QJyjCuxs2vQYlSuz2jsu/HgGTxOoWWRcv4qcwow=",
|
||||||
|
|
|
@ -3,16 +3,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "discordo";
|
pname = "discordo";
|
||||||
version = "0-unstable-2024-12-22";
|
version = "0-unstable-2025-01-12";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ayn2op";
|
owner = "ayn2op";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "9f15a6342413f68531402b8aeb5ed272159fc370";
|
rev = "2f071695146188c65b51f7030a89addfa845469a";
|
||||||
hash = "sha256-8VBw7DsX/xnNkfiIe8jiG2oXjIp1tNT6wy6eTDBZxUg=";
|
hash = "sha256-k2wwFx0Wi60xpdiS7qGoHdS6TfXFlI6yDeXXfOp1ivc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-UTZIx4zXIMdQBQXfzk3+j43yx7vlitw4Mwmon8oYjd8=";
|
vendorHash = "sha256-FsZRh4k9ucmAruJa1MZ4kVVryrEuHy9StgXHvgBiWSg=";
|
||||||
|
|
||||||
env.CGO_ENABLED = 0;
|
env.CGO_ENABLED = 0;
|
||||||
|
|
||||||
|
|
|
@ -94,7 +94,6 @@ stdenv.mkDerivation rec {
|
||||||
license = licenses.gpl3Plus;
|
license = licenses.gpl3Plus;
|
||||||
mainProgram = "rsync";
|
mainProgram = "rsync";
|
||||||
maintainers = with lib.maintainers; [
|
maintainers = with lib.maintainers; [
|
||||||
ehmry
|
|
||||||
kampfschlaefer
|
kampfschlaefer
|
||||||
ivan
|
ivan
|
||||||
];
|
];
|
||||||
|
|
|
@ -8,13 +8,13 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
pname = "mendeley";
|
pname = "mendeley";
|
||||||
version = "2.128.0";
|
version = "2.129.0";
|
||||||
|
|
||||||
executableName = "${pname}-reference-manager";
|
executableName = "${pname}-reference-manager";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage";
|
url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage";
|
||||||
hash = "sha256-V0UF52EVvxqFtBWOshiLO923osiKd0KJPc4gDadkta0=";
|
hash = "sha256-lA3ald0pgNd6az7nP5MPMrs12EEvJaHpEypXFfCvKCQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
appimageContents = appimageTools.extractType2 {
|
appimageContents = appimageTools.extractType2 {
|
||||||
|
|
|
@ -294,9 +294,9 @@ rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
docker_27 = callPackage dockerGen rec {
|
docker_27 = callPackage dockerGen rec {
|
||||||
version = "27.4.1";
|
version = "27.5.0";
|
||||||
cliRev = "v${version}";
|
cliRev = "v${version}";
|
||||||
cliHash = "sha256-/lIp32ArtI8FGPepXnUqmkQ03YTC8SfK44+onAvHFnE=";
|
cliHash = "sha256-PbdT1CL8jSHHPV2iygTXNwoY0qcNF2XUDEAHHsM4fPM=";
|
||||||
mobyRev = "v${version}";
|
mobyRev = "v${version}";
|
||||||
mobyHash = "sha256-OSkI8F8bUjsCUT/pRWWbfTq9Fno5z35hW9OnLXHrIiQ=";
|
mobyHash = "sha256-OSkI8F8bUjsCUT/pRWWbfTq9Fno5z35hW9OnLXHrIiQ=";
|
||||||
runcRev = "v1.2.3";
|
runcRev = "v1.2.3";
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
, copyDesktopItems
|
, copyDesktopItems
|
||||||
, electron
|
, electron
|
||||||
, nodejs
|
, nodejs
|
||||||
, pnpm
|
, pnpm_9
|
||||||
, makeDesktopItem
|
, makeDesktopItem
|
||||||
, autoSignDarwinBinariesHook
|
, autoSignDarwinBinariesHook
|
||||||
, nix-update-script
|
, nix-update-script
|
||||||
|
@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
sha256 = "sha256-07lf9jy22JUT+Vc5y9Tu1nkWaXU5RTdu3GibcvQsSs8=";
|
sha256 = "sha256-07lf9jy22JUT+Vc5y9Tu1nkWaXU5RTdu3GibcvQsSs8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
pnpmDeps = pnpm.fetchDeps {
|
pnpmDeps = pnpm_9.fetchDeps {
|
||||||
inherit (finalAttrs) pname version src;
|
inherit (finalAttrs) pname version src;
|
||||||
hash = "sha256-LPsNRd1c/cQeyBn3LZKnKeAsZ981sOkLYTnXIZL82LA=";
|
hash = "sha256-LPsNRd1c/cQeyBn3LZKnKeAsZ981sOkLYTnXIZL82LA=";
|
||||||
};
|
};
|
||||||
|
@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
makeWrapper nodejs pnpm.configHook
|
makeWrapper nodejs pnpm_9.configHook
|
||||||
] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||||
copyDesktopItems
|
copyDesktopItems
|
||||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||||
|
|
|
@ -22,6 +22,7 @@
|
||||||
wayland,
|
wayland,
|
||||||
xdg-utils,
|
xdg-utils,
|
||||||
|
|
||||||
|
nix-update-script,
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
rpathLibs =
|
rpathLibs =
|
||||||
|
@ -43,16 +44,16 @@ let
|
||||||
in
|
in
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "alacritty";
|
pname = "alacritty";
|
||||||
version = "0.14.0";
|
version = "0.15.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "alacritty";
|
owner = "alacritty";
|
||||||
repo = pname;
|
repo = "alacritty";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-ZhkuuxTx2y8vOfxfpDpJAyNyDdRWab0pqyDdbOCQ2XE=";
|
hash = "sha256-CAxf0ltvYXYTdjQmLQnRwRRJUBgABbHSB8DxfAbgBdo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-T+/G2z7H/egJ/IlP3KA31jydg1CmFdLW8bLYSf/yWck=";
|
cargoHash = "sha256-pVwPo9O3ortTtVzZn1p1grFGLBA2gVTOatdNFqNQ5zc=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
|
@ -121,7 +122,10 @@ rustPlatform.buildRustPackage rec {
|
||||||
|
|
||||||
dontPatchELF = true;
|
dontPatchELF = true;
|
||||||
|
|
||||||
passthru.tests.test = nixosTests.terminal-emulators.alacritty;
|
passthru = {
|
||||||
|
tests.test = nixosTests.terminal-emulators.alacritty;
|
||||||
|
updateScript = nix-update-script { };
|
||||||
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Cross-platform, GPU-accelerated terminal emulator";
|
description = "Cross-platform, GPU-accelerated terminal emulator";
|
||||||
|
@ -130,7 +134,7 @@ rustPlatform.buildRustPackage rec {
|
||||||
mainProgram = "alacritty";
|
mainProgram = "alacritty";
|
||||||
maintainers = with maintainers; [
|
maintainers = with maintainers; [
|
||||||
Br1ght0ne
|
Br1ght0ne
|
||||||
mic92
|
rvdp
|
||||||
];
|
];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
changelog = "https://github.com/alacritty/alacritty/blob/v${version}/CHANGELOG.md";
|
changelog = "https://github.com/alacritty/alacritty/blob/v${version}/CHANGELOG.md";
|
||||||
|
|
157
pkgs/by-name/am/amnezia-vpn/package.nix
Normal file
157
pkgs/by-name/am/amnezia-vpn/package.nix
Normal file
|
@ -0,0 +1,157 @@
|
||||||
|
{
|
||||||
|
lib,
|
||||||
|
stdenv,
|
||||||
|
fetchFromGitHub,
|
||||||
|
cmake,
|
||||||
|
pkg-config,
|
||||||
|
kdePackages,
|
||||||
|
qt6,
|
||||||
|
libsecret,
|
||||||
|
xdg-utils,
|
||||||
|
amneziawg-go,
|
||||||
|
openvpn,
|
||||||
|
shadowsocks-rust,
|
||||||
|
cloak-pt,
|
||||||
|
wireguard-tools,
|
||||||
|
procps,
|
||||||
|
iproute2,
|
||||||
|
sudo,
|
||||||
|
libssh,
|
||||||
|
zlib,
|
||||||
|
tun2socks,
|
||||||
|
xray,
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
amnezia-tun2socks = tun2socks.overrideAttrs (
|
||||||
|
finalAttrs: prevAttrs: {
|
||||||
|
pname = "amnezia-tun2socks";
|
||||||
|
version = "2.5.4";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "amnezia-vpn";
|
||||||
|
repo = "amnezia-tun2socks";
|
||||||
|
tag = "v${finalAttrs.version}";
|
||||||
|
hash = "sha256-lHo7WtcqccBSHly6neuksh1gC7RCKxbFNX9KSKNNeK8=";
|
||||||
|
};
|
||||||
|
|
||||||
|
vendorHash = "sha256-VvOaTJ6dBFlbGZGxnHy2sCtds1tyhu6VsPewYpsDBiM=";
|
||||||
|
|
||||||
|
ldflags = [
|
||||||
|
"-w"
|
||||||
|
"-s"
|
||||||
|
"-X github.com/amnezia-vpn/amnezia-tun2socks/v2/internal/version.Version=v${finalAttrs.version}"
|
||||||
|
"-X github.com/amnezia-vpn/amnezia-tun2socks/v2/internal/version.GitCommit=v${finalAttrs.version}"
|
||||||
|
];
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
amnezia-xray = xray.overrideAttrs (
|
||||||
|
finalAttrs: prevAttrs: {
|
||||||
|
pname = "amnezia-xray";
|
||||||
|
version = "1.8.13";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "amnezia-vpn";
|
||||||
|
repo = "amnezia-xray-core";
|
||||||
|
tag = "v${finalAttrs.version}";
|
||||||
|
hash = "sha256-7XYdogoUEv3kTPTOQwRCohsPtfSDf+aRdI28IkTjvPk=";
|
||||||
|
};
|
||||||
|
|
||||||
|
vendorHash = "sha256-zArdGj5yeRxU0X4jNgT5YBI9SJUyrANDaqNPAPH3d5M=";
|
||||||
|
}
|
||||||
|
);
|
||||||
|
in
|
||||||
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
|
pname = "amnezia-vpn";
|
||||||
|
version = "4.8.2.3";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "amnezia-vpn";
|
||||||
|
repo = "amnezia-client";
|
||||||
|
tag = finalAttrs.version;
|
||||||
|
hash = "sha256-bCWPyRW2xnnopcwfPHgQrdP85Ct0CDufJRQ1PvCAiDE=";
|
||||||
|
fetchSubmodules = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
patches = [ ./router.patch ];
|
||||||
|
|
||||||
|
postPatch =
|
||||||
|
''
|
||||||
|
substituteInPlace client/platforms/linux/daemon/wireguardutilslinux.cpp \
|
||||||
|
--replace-fail 'm_tunnel.start(appPath.filePath("../../client/bin/wireguard-go"), wgArgs);' 'm_tunnel.start("${amneziawg-go}/bin/amneziawg-go", wgArgs);'
|
||||||
|
substituteInPlace client/utilities.cpp \
|
||||||
|
--replace-fail 'return Utils::executable("../../client/bin/openvpn", true);' 'return Utils::executable("${openvpn}/bin/openvpn", false);' \
|
||||||
|
--replace-fail 'return Utils::executable("../../client/bin/tun2socks", true);' 'return Utils::executable("${amnezia-tun2socks}/bin/amnezia-tun2socks", false);' \
|
||||||
|
--replace-fail 'return Utils::usrExecutable("wg-quick");' 'return Utils::executable("${wireguard-tools}/bin/wg-quick", false);' \
|
||||||
|
--replace-fail 'QProcess::execute(QString("pkill %1").arg(name));' 'return QProcess::execute(QString("pkill -f %1").arg(name)) == 0;'
|
||||||
|
substituteInPlace client/protocols/xrayprotocol.cpp \
|
||||||
|
--replace-fail 'return Utils::executable(QString("xray"), true);' 'return Utils::executable(QString("${amnezia-xray}/bin/xray"), false);'
|
||||||
|
substituteInPlace client/protocols/openvpnovercloakprotocol.cpp \
|
||||||
|
--replace-fail 'return Utils::executable(QString("/ck-client"), true);' 'return Utils::executable(QString("${cloak-pt}/bin/ck-client"), false);'
|
||||||
|
substituteInPlace client/protocols/shadowsocksvpnprotocol.cpp \
|
||||||
|
--replace-fail 'return Utils::executable(QString("/ss-local"), true);' 'return Utils::executable(QString("${shadowsocks-rust}/bin/sslocal"), false);'
|
||||||
|
substituteInPlace client/configurators/openvpn_configurator.cpp \
|
||||||
|
--replace-fail ".arg(qApp->applicationDirPath());" ".arg(\"$out/local/bin\");"
|
||||||
|
substituteInPlace client/ui/qautostart.cpp \
|
||||||
|
--replace-fail "/usr/share/pixmaps/AmneziaVPN.png" "$out/share/pixmaps/AmneziaVPN.png"
|
||||||
|
substituteInPlace deploy/installer/config/AmneziaVPN.desktop.in \
|
||||||
|
--replace-fail "#!/usr/bin/env xdg-open" "#!${xdg-utils}/bin/xdg-open" \
|
||||||
|
--replace-fail "/usr/share/pixmaps/AmneziaVPN.png" "$out/share/pixmaps/AmneziaVPN.png"
|
||||||
|
substituteInPlace deploy/data/linux/AmneziaVPN.service \
|
||||||
|
--replace-fail "ExecStart=/opt/AmneziaVPN/service/AmneziaVPN-service.sh" "ExecStart=$out/bin/AmneziaVPN-service" \
|
||||||
|
--replace-fail "Environment=LD_LIBRARY_PATH=/opt/AmneziaVPN/client/lib" ""
|
||||||
|
''
|
||||||
|
+ (lib.optionalString (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) ''
|
||||||
|
substituteInPlace client/cmake/3rdparty.cmake \
|
||||||
|
--replace-fail 'set(LIBSSH_LIB_PATH "''${LIBSSH_ROOT_DIR}/linux/x86_64/libssh.a")' 'set(LIBSSH_LIB_PATH "${libssh}/lib/libssh.so")' \
|
||||||
|
--replace-fail 'set(ZLIB_LIB_PATH "''${LIBSSH_ROOT_DIR}/linux/x86_64/libz.a")' 'set(ZLIB_LIB_PATH "${zlib}/lib/libz.so")' \
|
||||||
|
--replace-fail 'set(OPENSSL_LIB_SSL_PATH "''${OPENSSL_ROOT_DIR}/linux/x86_64/libssl.a")' 'set(OPENSSL_LIB_SSL_PATH "''${OPENSSL_ROOT_DIR}/linux/arm64/libssl.a")' \
|
||||||
|
--replace-fail 'set(OPENSSL_LIB_CRYPTO_PATH "''${OPENSSL_ROOT_DIR}/linux/x86_64/libcrypto.a")' 'set(OPENSSL_LIB_CRYPTO_PATH "''${OPENSSL_ROOT_DIR}/linux/arm64/libcrypto.a")'
|
||||||
|
'');
|
||||||
|
|
||||||
|
strictDeps = true;
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
cmake
|
||||||
|
pkg-config
|
||||||
|
qt6.wrapQtAppsHook
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
libsecret
|
||||||
|
qt6.qtbase
|
||||||
|
qt6.qttools
|
||||||
|
kdePackages.qtremoteobjects
|
||||||
|
kdePackages.qtsvg
|
||||||
|
kdePackages.qt5compat
|
||||||
|
];
|
||||||
|
|
||||||
|
qtWrapperArgs = [
|
||||||
|
''--prefix PATH : ${
|
||||||
|
lib.makeBinPath [
|
||||||
|
procps
|
||||||
|
iproute2
|
||||||
|
sudo
|
||||||
|
]
|
||||||
|
}''
|
||||||
|
];
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
mkdir -p $out/bin $out/local/bin $out/share/applications $out/share/pixmaps $out/lib/systemd/system
|
||||||
|
cp client/AmneziaVPN service/server/AmneziaVPN-service $out/bin/
|
||||||
|
cp ../deploy/data/linux/client/bin/update-resolv-conf.sh $out/local/bin/
|
||||||
|
cp ../AppDir/AmneziaVPN.desktop $out/share/applications/
|
||||||
|
cp ../deploy/data/linux/AmneziaVPN.png $out/share/pixmaps/
|
||||||
|
cp ../deploy/data/linux/AmneziaVPN.service $out/lib/systemd/system/
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Amnezia VPN Client";
|
||||||
|
downloadPage = "https://amnezia.org/en/downloads";
|
||||||
|
homepage = "https://amnezia.org/en";
|
||||||
|
license = licenses.gpl3;
|
||||||
|
mainProgram = "AmneziaVPN";
|
||||||
|
maintainers = with maintainers; [ sund3RRR ];
|
||||||
|
platforms = platforms.unix;
|
||||||
|
};
|
||||||
|
})
|
54
pkgs/by-name/am/amnezia-vpn/router.patch
Normal file
54
pkgs/by-name/am/amnezia-vpn/router.patch
Normal file
|
@ -0,0 +1,54 @@
|
||||||
|
--- a/service/server/router_linux.cpp 2025-01-01 11:36:27.615658613 +0300
|
||||||
|
+++ b/service/server/router_linux.cpp 2025-01-01 18:07:57.300178080 +0300
|
||||||
|
@@ -19,9 +19,27 @@
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <QFileInfo>
|
||||||
|
+#include <QStringList>
|
||||||
|
+#include <QString>
|
||||||
|
|
||||||
|
#include <core/networkUtilities.h>
|
||||||
|
|
||||||
|
+bool isServiceActive(const QString &serviceName) {
|
||||||
|
+ QProcess process;
|
||||||
|
+ process.start("systemctl", { "list-units", "--type=service", "--state=running", "--no-legend" });
|
||||||
|
+ process.waitForFinished();
|
||||||
|
+
|
||||||
|
+ QString output = process.readAllStandardOutput();
|
||||||
|
+ QStringList services = output.split('\n', Qt::SkipEmptyParts);
|
||||||
|
+
|
||||||
|
+ for (const QString &service : services) {
|
||||||
|
+ if (service.contains(serviceName)) {
|
||||||
|
+ return true;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ return false;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
RouterLinux &RouterLinux::Instance()
|
||||||
|
{
|
||||||
|
static RouterLinux s;
|
||||||
|
@@ -158,15 +176,14 @@
|
||||||
|
p.setProcessChannelMode(QProcess::MergedChannels);
|
||||||
|
|
||||||
|
//check what the dns manager use
|
||||||
|
- if (QFileInfo::exists("/usr/bin/nscd")
|
||||||
|
- || QFileInfo::exists("/usr/sbin/nscd")
|
||||||
|
- || QFileInfo::exists("/usr/lib/systemd/system/nscd.service"))
|
||||||
|
- {
|
||||||
|
- p.start("systemctl restart nscd");
|
||||||
|
- }
|
||||||
|
- else
|
||||||
|
- {
|
||||||
|
- p.start("systemctl restart systemd-resolved");
|
||||||
|
+ if (isServiceActive("nscd.service")) {
|
||||||
|
+ qDebug() << "Restarting nscd.service";
|
||||||
|
+ p.start("systemctl", { "restart", "nscd" });
|
||||||
|
+ } else if (isServiceActive("systemd-resolved.service")) {
|
||||||
|
+ qDebug() << "Restarting systemd-resolved.service";
|
||||||
|
+ p.start("systemctl", { "restart", "systemd-resolved" });
|
||||||
|
+ } else {
|
||||||
|
+ qDebug() << "No suitable DNS manager found.";
|
||||||
|
}
|
||||||
|
|
||||||
|
p.waitForFinished();
|
|
@ -2,7 +2,7 @@
|
||||||
buildGoModule,
|
buildGoModule,
|
||||||
lib,
|
lib,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
pnpm,
|
pnpm_9,
|
||||||
nodejs,
|
nodejs,
|
||||||
fetchpatch,
|
fetchpatch,
|
||||||
stdenv,
|
stdenv,
|
||||||
|
@ -25,14 +25,14 @@ buildGoModule rec {
|
||||||
|
|
||||||
sourceRoot = "${src.name}/ui";
|
sourceRoot = "${src.name}/ui";
|
||||||
|
|
||||||
pnpmDeps = pnpm.fetchDeps {
|
pnpmDeps = pnpm_9.fetchDeps {
|
||||||
inherit src version pname;
|
inherit src version pname;
|
||||||
sourceRoot = "${src.name}/ui";
|
sourceRoot = "${src.name}/ui";
|
||||||
hash = "sha256-/se6IWeHdazqS7PzOpgtT4IxCJ1WptqBzZ/BdmGb4BA=";
|
hash = "sha256-/se6IWeHdazqS7PzOpgtT4IxCJ1WptqBzZ/BdmGb4BA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pnpm.configHook
|
pnpm_9.configHook
|
||||||
nodejs
|
nodejs
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
46
pkgs/by-name/ar/arp-scan-rs/package.nix
Normal file
46
pkgs/by-name/ar/arp-scan-rs/package.nix
Normal file
|
@ -0,0 +1,46 @@
|
||||||
|
{
|
||||||
|
lib,
|
||||||
|
fetchFromGitHub,
|
||||||
|
gitUpdater,
|
||||||
|
rustPlatform,
|
||||||
|
versionCheckHook,
|
||||||
|
}:
|
||||||
|
|
||||||
|
rustPlatform.buildRustPackage rec {
|
||||||
|
pname = "arp-scan-rs";
|
||||||
|
version = "0.14.0";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "kongbytes";
|
||||||
|
repo = "arp-scan-rs";
|
||||||
|
tag = "v${version}";
|
||||||
|
hash = "sha256-CLxeT2olrxRCJ12IZ1PvLW7ZuX0HPsoNuFyxmGBhB8w=";
|
||||||
|
};
|
||||||
|
|
||||||
|
cargoHash = "sha256-+Ph5k3qaK4USggTnZqyOdH6oKv5Xr2/NeQ9C0Q6g5sQ=";
|
||||||
|
|
||||||
|
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||||
|
|
||||||
|
preCheck = ''
|
||||||
|
# Test fails
|
||||||
|
substituteInPlace src/network.rs \
|
||||||
|
--replace-fail 'Some("one.one.one.one".to_string())' 'None'
|
||||||
|
'';
|
||||||
|
|
||||||
|
versionCheckProgram = [ "${placeholder "out"}/bin/arp-scan" ];
|
||||||
|
|
||||||
|
versionCheckProgramArg = "--version";
|
||||||
|
|
||||||
|
doInstallCheck = true;
|
||||||
|
|
||||||
|
passthru.updateScript = gitUpdater { };
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "ARP scan tool for fast local network scans";
|
||||||
|
homepage = "https://github.com/kongbytes/arp-scan-rs";
|
||||||
|
changelog = "https://github.com/kongbytes/arp-scan-rs/releases/tag/v${version}";
|
||||||
|
license = lib.licenses.agpl3Only;
|
||||||
|
maintainers = with lib.maintainers; [ fab ];
|
||||||
|
mainProgram = "arp-scan";
|
||||||
|
};
|
||||||
|
}
|
|
@ -2,7 +2,7 @@
|
||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
pnpm,
|
pnpm_9,
|
||||||
nodejs_22,
|
nodejs_22,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
hash = "sha256-NBLUeg1WqxTXtu8eg1fihQSfm8koYAEWhfXAj/fIdC8=";
|
hash = "sha256-NBLUeg1WqxTXtu8eg1fihQSfm8koYAEWhfXAj/fIdC8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
pnpmDeps = pnpm.fetchDeps {
|
pnpmDeps = pnpm_9.fetchDeps {
|
||||||
inherit (finalAttrs)
|
inherit (finalAttrs)
|
||||||
pname
|
pname
|
||||||
version
|
version
|
||||||
|
@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
nodejs_22
|
nodejs_22
|
||||||
pnpm.configHook
|
pnpm_9.configHook
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [ nodejs_22 ];
|
buildInputs = [ nodejs_22 ];
|
||||||
|
|
56
pkgs/by-name/as/astroterm/package.nix
Normal file
56
pkgs/by-name/as/astroterm/package.nix
Normal file
|
@ -0,0 +1,56 @@
|
||||||
|
{
|
||||||
|
stdenv,
|
||||||
|
lib,
|
||||||
|
fetchurl,
|
||||||
|
fetchFromGitHub,
|
||||||
|
xxd,
|
||||||
|
meson,
|
||||||
|
ninja,
|
||||||
|
ncurses,
|
||||||
|
argtable,
|
||||||
|
versionCheckHook,
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
|
pname = "astroterm";
|
||||||
|
version = "1.0.4";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "da-luce";
|
||||||
|
repo = "astroterm";
|
||||||
|
tag = "v${finalAttrs.version}";
|
||||||
|
hash = "sha256-CYKW/RAQ3a5238cojbpGfTenMQApfaZOHnQMrZ6LWzA=";
|
||||||
|
};
|
||||||
|
|
||||||
|
bsc5File = fetchurl {
|
||||||
|
url = "https://web.archive.org/web/20231007085824/http://tdc-www.harvard.edu/catalogs/BSC5";
|
||||||
|
hash = "sha256-5HHQLq9O7LYcEvh5octkMrqde2ipqMVlSh60KgyMw0A=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
meson
|
||||||
|
ninja
|
||||||
|
xxd
|
||||||
|
versionCheckHook
|
||||||
|
];
|
||||||
|
buildInputs = [
|
||||||
|
argtable
|
||||||
|
ncurses
|
||||||
|
];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
mkdir -p data
|
||||||
|
ln -s ${finalAttrs.bsc5File} data/bsc5
|
||||||
|
'';
|
||||||
|
|
||||||
|
doCheck = true;
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Celestial viewer for the terminal, written in C";
|
||||||
|
homepage = "https://github.com/da-luce/astroterm/";
|
||||||
|
license = lib.licenses.mit;
|
||||||
|
maintainers = [ lib.maintainers.da-luce ];
|
||||||
|
mainProgram = "astroterm";
|
||||||
|
platforms = lib.platforms.unix;
|
||||||
|
};
|
||||||
|
})
|
|
@ -5,16 +5,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "automatic-timezoned";
|
pname = "automatic-timezoned";
|
||||||
version = "2.0.44";
|
version = "2.0.45";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "maxbrunet";
|
owner = "maxbrunet";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-+DLuvB6jOgZwZVjztsTpZ5z8tQDlpWDQvtM6yW1y/O0=";
|
sha256 = "sha256-8fgOhmjFXC0nMs7oTfJWbn1DOmOU9RtTgR+xmV/nZ9g=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-73aBnRdcxdcYBuk8oe8AvAQ1T9GELniHqBMsuF3PJog=";
|
cargoHash = "sha256-4WytstmBjd0FCSxY4omrZZhcSq1xSPQKFz7S4jZukVA=";
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Automatically update system timezone based on location";
|
description = "Automatically update system timezone based on location";
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
python3.pkgs.buildPythonApplication rec {
|
python3.pkgs.buildPythonApplication rec {
|
||||||
pname = "autosuspend";
|
pname = "autosuspend";
|
||||||
version = "7.0.3";
|
version = "7.1.0";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = python3.pythonOlder "3.10";
|
disabled = python3.pythonOlder "3.10";
|
||||||
|
@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
owner = "languitar";
|
owner = "languitar";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-ePQiP7NeRBPVHkd8rvbxno/NBX95e9d97F8TIazCUH4=";
|
hash = "sha256-Sug42L4D9lgtc7AWIOcgC+e9WCHfmqB4O1Gez/sR6jE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = with python3.pkgs; [
|
build-system = with python3.pkgs; [
|
||||||
|
|
|
@ -1,20 +1,23 @@
|
||||||
{
|
{
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
buildGo122Module,
|
buildGoModule,
|
||||||
lib,
|
lib,
|
||||||
versionCheckHook,
|
versionCheckHook,
|
||||||
}:
|
}:
|
||||||
buildGo122Module rec {
|
|
||||||
|
buildGoModule rec {
|
||||||
pname = "baidupcs-go";
|
pname = "baidupcs-go";
|
||||||
version = "3.9.5-unstable-2024-06-23";
|
version = "3.9.7";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "qjfoidnh";
|
owner = "qjfoidnh";
|
||||||
repo = "BaiduPCS-Go";
|
repo = "BaiduPCS-Go";
|
||||||
rev = "5612fc337b9556ed330274987a2f876961639cff";
|
rev = "v${version}";
|
||||||
hash = "sha256-4mCJ5gVHjjvR6HNo47NTJvQEu7cdZZMfO8qQA7Kqzqo=";
|
hash = "sha256-C88q2tNNuX+tIvYKHbRE76xfPe81UHqfezyRXzrxzlc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-msTlXtidxLTe3xjxTOWCqx/epFT0XPdwGPantDJUGpc=";
|
vendorHash = "sha256-msTlXtidxLTe3xjxTOWCqx/epFT0XPdwGPantDJUGpc=";
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
ldflags = [
|
ldflags = [
|
||||||
|
|
1394
pkgs/by-name/bi/binwalk/Cargo.lock
generated
1394
pkgs/by-name/bi/binwalk/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
@ -1,11 +1,39 @@
|
||||||
{
|
{
|
||||||
lib,
|
|
||||||
rustPlatform,
|
|
||||||
fetchFromGitHub,
|
|
||||||
pkg-config,
|
|
||||||
fontconfig,
|
|
||||||
bzip2,
|
bzip2,
|
||||||
|
cabextract,
|
||||||
|
dmg2img,
|
||||||
|
dtc,
|
||||||
|
dumpifs,
|
||||||
|
enableUnfree ? false,
|
||||||
|
fetchFromGitHub,
|
||||||
|
fontconfig,
|
||||||
|
gnutar,
|
||||||
|
jefferson,
|
||||||
|
lib,
|
||||||
|
lzfse,
|
||||||
|
lzo,
|
||||||
|
lzop,
|
||||||
|
lz4,
|
||||||
|
openssl_3,
|
||||||
|
pkg-config,
|
||||||
|
python3,
|
||||||
|
rustPlatform,
|
||||||
|
sasquatch,
|
||||||
|
sleuthkit,
|
||||||
|
srec2bin,
|
||||||
stdenv,
|
stdenv,
|
||||||
|
ubi_reader,
|
||||||
|
ucl,
|
||||||
|
uefi-firmware-parser,
|
||||||
|
unrar,
|
||||||
|
unyaffs,
|
||||||
|
unzip,
|
||||||
|
versionCheckHook,
|
||||||
|
vmlinux-to-elf,
|
||||||
|
xz,
|
||||||
|
zlib,
|
||||||
|
zstd,
|
||||||
|
_7zz,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
|
@ -15,20 +43,44 @@ rustPlatform.buildRustPackage rec {
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ReFirmLabs";
|
owner = "ReFirmLabs";
|
||||||
repo = "binwalk";
|
repo = "binwalk";
|
||||||
rev = "refs/tags/v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-em+jOnhCZH5EEJrhXTHmxiwpMcBr5oNU1+5IJ1H/oco=";
|
hash = "sha256-em+jOnhCZH5EEJrhXTHmxiwpMcBr5oNU1+5IJ1H/oco=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoLock = {
|
cargoHash = "sha256-7+2TdlfCHJHXn0+q74JhmY3/lC0WfCG2FFmQFQNf4k8=";
|
||||||
lockFile = ./Cargo.lock;
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
||||||
|
# https://github.com/ReFirmLabs/binwalk/commits/master/dependencies
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
fontconfig
|
|
||||||
bzip2
|
bzip2
|
||||||
];
|
cabextract
|
||||||
|
dmg2img
|
||||||
|
dtc
|
||||||
|
dumpifs
|
||||||
|
fontconfig
|
||||||
|
gnutar
|
||||||
|
jefferson
|
||||||
|
lzfse
|
||||||
|
lzo
|
||||||
|
lzop
|
||||||
|
lz4
|
||||||
|
openssl_3
|
||||||
|
python3.pkgs.python-lzo
|
||||||
|
sasquatch
|
||||||
|
sleuthkit
|
||||||
|
srec2bin
|
||||||
|
ubi_reader
|
||||||
|
ucl
|
||||||
|
uefi-firmware-parser
|
||||||
|
unyaffs
|
||||||
|
unzip
|
||||||
|
vmlinux-to-elf
|
||||||
|
xz
|
||||||
|
zlib
|
||||||
|
zstd
|
||||||
|
_7zz
|
||||||
|
] ++ lib.optionals enableUnfree [ unrar ];
|
||||||
|
|
||||||
# skip broken tests
|
# skip broken tests
|
||||||
checkFlags =
|
checkFlags =
|
||||||
|
@ -53,14 +105,20 @@ rustPlatform.buildRustPackage rec {
|
||||||
"--skip=extractors::common::Chroot::make_executable"
|
"--skip=extractors::common::Chroot::make_executable"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||||
|
doInstallCheck = true;
|
||||||
|
versionCheckProgramArg = "-V";
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Firmware Analysis Tool";
|
description = "Firmware Analysis Tool";
|
||||||
homepage = "https://github.com/ReFirmLabs/binwalk";
|
homepage = "https://github.com/ReFirmLabs/binwalk";
|
||||||
changelog = "https://github.com/ReFirmLabs/binwalk/releases/tag/${src.rev}";
|
changelog = "https://github.com/ReFirmLabs/binwalk/releases/tag/v${version}";
|
||||||
license = lib.licenses.mit;
|
license = lib.licenses.mit;
|
||||||
|
platforms = lib.platforms.unix;
|
||||||
maintainers = with lib.maintainers; [
|
maintainers = with lib.maintainers; [
|
||||||
koral
|
koral
|
||||||
felbinger
|
felbinger
|
||||||
];
|
];
|
||||||
|
mainProgram = "binwalk";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,24 +4,28 @@
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
flutter324,
|
flutter324,
|
||||||
mpv,
|
mpv,
|
||||||
pkg-config,
|
|
||||||
makeDesktopItem,
|
makeDesktopItem,
|
||||||
wrapGAppsHook3,
|
|
||||||
copyDesktopItems,
|
copyDesktopItems,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
flutter324.buildFlutterApplication rec {
|
flutter324.buildFlutterApplication rec {
|
||||||
pname = "bloomeetunes";
|
pname = "bloomeetunes";
|
||||||
version = "2.10.9";
|
version = "2.10.13";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "HemantKArya";
|
owner = "HemantKArya";
|
||||||
repo = "BloomeeTunes";
|
repo = "BloomeeTunes";
|
||||||
rev = "v${version}+152";
|
tag = "v${version}+157";
|
||||||
hash = "sha256-Yv0aSq2eBcHKpy4PPjAhx194UW8Gm0UJlE+F+onZYFM=";
|
hash = "sha256-cLhcuk4rLHFg3al+MkZnOWMG8n6r61idBSmDyP6ez+g=";
|
||||||
};
|
};
|
||||||
|
|
||||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
autoPatchelfHook
|
||||||
|
copyDesktopItems
|
||||||
|
];
|
||||||
|
|
||||||
desktopItems = [
|
desktopItems = [
|
||||||
(makeDesktopItem {
|
(makeDesktopItem {
|
||||||
name = "bloomeetunes";
|
name = "bloomeetunes";
|
||||||
|
@ -32,25 +36,20 @@ flutter324.buildFlutterApplication rec {
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
|
||||||
pkg-config
|
|
||||||
autoPatchelfHook
|
|
||||||
wrapGAppsHook3
|
|
||||||
copyDesktopItems
|
|
||||||
];
|
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
install -Dm644 ./assets/icons/bloomee_new_logo_c.png $out/share/pixmaps/bloomeetunes.png
|
install -Dm644 assets/icons/bloomee_new_logo_c.png $out/share/pixmaps/bloomeetunes.png
|
||||||
'';
|
'';
|
||||||
|
|
||||||
extraWrapProgramArgs = ''
|
extraWrapProgramArgs = ''
|
||||||
--prefix LD_LIBRARY_PATH : "$out/app/bloomeetunes/lib:${
|
--prefix LD_LIBRARY_PATH : $out/app/bloomeetunes/lib:${
|
||||||
lib.makeLibraryPath [
|
lib.makeLibraryPath [
|
||||||
mpv
|
mpv
|
||||||
]
|
]
|
||||||
}"
|
}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
passthru.updateScript = ./update.sh;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Cross-platform music app designed to bring you ad-free tunes from various sources";
|
description = "Cross-platform music app designed to bring you ad-free tunes from various sources";
|
||||||
homepage = "https://github.com/HemantKArya/BloomeeTunes";
|
homepage = "https://github.com/HemantKArya/BloomeeTunes";
|
||||||
|
|
|
@ -54,31 +54,31 @@
|
||||||
"dependency": "direct main",
|
"dependency": "direct main",
|
||||||
"description": {
|
"description": {
|
||||||
"name": "audio_service",
|
"name": "audio_service",
|
||||||
"sha256": "9dd5ba7e77567b290c35908b1950d61485b4dfdd3a0ac398e98cfeec04651b75",
|
"sha256": "f6c8191bef6b843da34675dd0731ad11d06094c36b691ffcf3148a4feb2e585f",
|
||||||
"url": "https://pub.dev"
|
"url": "https://pub.dev"
|
||||||
},
|
},
|
||||||
"source": "hosted",
|
"source": "hosted",
|
||||||
"version": "0.18.15"
|
"version": "0.18.16"
|
||||||
},
|
},
|
||||||
"audio_service_mpris": {
|
"audio_service_mpris": {
|
||||||
"dependency": "direct main",
|
"dependency": "direct main",
|
||||||
"description": {
|
"description": {
|
||||||
"name": "audio_service_mpris",
|
"name": "audio_service_mpris",
|
||||||
"sha256": "b16db3584a4b2464c0bfd575c1a21765723d257931222f8adfcb0511f940d352",
|
"sha256": "fdab1ae1f659c6db36d5cc396e46e4ee9663caefa6153f8453fcd01d57567c08",
|
||||||
"url": "https://pub.dev"
|
"url": "https://pub.dev"
|
||||||
},
|
},
|
||||||
"source": "hosted",
|
"source": "hosted",
|
||||||
"version": "0.1.5"
|
"version": "0.2.0"
|
||||||
},
|
},
|
||||||
"audio_service_platform_interface": {
|
"audio_service_platform_interface": {
|
||||||
"dependency": "transitive",
|
"dependency": "transitive",
|
||||||
"description": {
|
"description": {
|
||||||
"name": "audio_service_platform_interface",
|
"name": "audio_service_platform_interface",
|
||||||
"sha256": "8431a455dac9916cc9ee6f7da5620a666436345c906ad2ebb7fa41d18b3c1bf4",
|
"sha256": "6283782851f6c8b501b60904a32fc7199dc631172da0629d7301e66f672ab777",
|
||||||
"url": "https://pub.dev"
|
"url": "https://pub.dev"
|
||||||
},
|
},
|
||||||
"source": "hosted",
|
"source": "hosted",
|
||||||
"version": "0.1.1"
|
"version": "0.1.3"
|
||||||
},
|
},
|
||||||
"audio_service_web": {
|
"audio_service_web": {
|
||||||
"dependency": "transitive",
|
"dependency": "transitive",
|
||||||
|
@ -94,11 +94,11 @@
|
||||||
"dependency": "direct main",
|
"dependency": "direct main",
|
||||||
"description": {
|
"description": {
|
||||||
"name": "audio_session",
|
"name": "audio_session",
|
||||||
"sha256": "343e83bc7809fbda2591a49e525d6b63213ade10c76f15813be9aed6657b3261",
|
"sha256": "b2a26ba8b7efa1790d6460e82971fde3e398cfbe2295df9dea22f3499d2c12a7",
|
||||||
"url": "https://pub.dev"
|
"url": "https://pub.dev"
|
||||||
},
|
},
|
||||||
"source": "hosted",
|
"source": "hosted",
|
||||||
"version": "0.1.21"
|
"version": "0.1.23"
|
||||||
},
|
},
|
||||||
"audio_video_progress_bar": {
|
"audio_video_progress_bar": {
|
||||||
"dependency": "direct main",
|
"dependency": "direct main",
|
||||||
|
@ -464,11 +464,11 @@
|
||||||
"dependency": "direct main",
|
"dependency": "direct main",
|
||||||
"description": {
|
"description": {
|
||||||
"name": "equatable",
|
"name": "equatable",
|
||||||
"sha256": "c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2",
|
"sha256": "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7",
|
||||||
"url": "https://pub.dev"
|
"url": "https://pub.dev"
|
||||||
},
|
},
|
||||||
"source": "hosted",
|
"source": "hosted",
|
||||||
"version": "2.0.5"
|
"version": "2.0.7"
|
||||||
},
|
},
|
||||||
"extended_image": {
|
"extended_image": {
|
||||||
"dependency": "direct main",
|
"dependency": "direct main",
|
||||||
|
@ -882,21 +882,21 @@
|
||||||
"dependency": "direct main",
|
"dependency": "direct main",
|
||||||
"description": {
|
"description": {
|
||||||
"name": "just_audio",
|
"name": "just_audio",
|
||||||
"sha256": "d8e8aaf417d33e345299c17f6457f72bd4ba0c549dc34607abb5183a354edc4d",
|
"sha256": "1a1eb86e7d81e69a1d36943f2b3efd62dece3dad2cafd9ec2e62e6db7c04d9b7",
|
||||||
"url": "https://pub.dev"
|
"url": "https://pub.dev"
|
||||||
},
|
},
|
||||||
"source": "hosted",
|
"source": "hosted",
|
||||||
"version": "0.9.40"
|
"version": "0.9.43"
|
||||||
},
|
},
|
||||||
"just_audio_media_kit": {
|
"just_audio_media_kit": {
|
||||||
"dependency": "direct main",
|
"dependency": "direct main",
|
||||||
"description": {
|
"description": {
|
||||||
"name": "just_audio_media_kit",
|
"name": "just_audio_media_kit",
|
||||||
"sha256": "7f57d317fafa04cb3e70b924e8f632ffb7eca7a97a369e1e44738ed89fbd5da1",
|
"sha256": "9f3517213dfc7bbaf6980656feb66c35600f114c7efc0b5b3f4476cd5c18b45e",
|
||||||
"url": "https://pub.dev"
|
"url": "https://pub.dev"
|
||||||
},
|
},
|
||||||
"source": "hosted",
|
"source": "hosted",
|
||||||
"version": "2.0.5"
|
"version": "2.0.6"
|
||||||
},
|
},
|
||||||
"just_audio_platform_interface": {
|
"just_audio_platform_interface": {
|
||||||
"dependency": "transitive",
|
"dependency": "transitive",
|
||||||
|
@ -922,11 +922,11 @@
|
||||||
"dependency": "direct main",
|
"dependency": "direct main",
|
||||||
"description": {
|
"description": {
|
||||||
"name": "just_audio_windows",
|
"name": "just_audio_windows",
|
||||||
"sha256": "48ab2dec79cf6097550602fe07b1a644f341450e138dc8fdc23e42ce0ed2d928",
|
"sha256": "b1ba5305d841c0e3883644e20fc11aaa23f28cfdd43ec20236d1e119a402ef29",
|
||||||
"url": "https://pub.dev"
|
"url": "https://pub.dev"
|
||||||
},
|
},
|
||||||
"source": "hosted",
|
"source": "hosted",
|
||||||
"version": "0.2.1"
|
"version": "0.2.2"
|
||||||
},
|
},
|
||||||
"leak_tracker": {
|
"leak_tracker": {
|
||||||
"dependency": "transitive",
|
"dependency": "transitive",
|
||||||
|
@ -968,6 +968,16 @@
|
||||||
"source": "hosted",
|
"source": "hosted",
|
||||||
"version": "2.1.1"
|
"version": "2.1.1"
|
||||||
},
|
},
|
||||||
|
"lists": {
|
||||||
|
"dependency": "transitive",
|
||||||
|
"description": {
|
||||||
|
"name": "lists",
|
||||||
|
"sha256": "4ca5c19ae4350de036a7e996cdd1ee39c93ac0a2b840f4915459b7d0a7d4ab27",
|
||||||
|
"url": "https://pub.dev"
|
||||||
|
},
|
||||||
|
"source": "hosted",
|
||||||
|
"version": "1.0.1"
|
||||||
|
},
|
||||||
"logging": {
|
"logging": {
|
||||||
"dependency": "direct main",
|
"dependency": "direct main",
|
||||||
"description": {
|
"description": {
|
||||||
|
@ -1012,11 +1022,11 @@
|
||||||
"dependency": "transitive",
|
"dependency": "transitive",
|
||||||
"description": {
|
"description": {
|
||||||
"name": "media_kit",
|
"name": "media_kit",
|
||||||
"sha256": "3289062540e3b8b9746e5c50d95bd78a9289826b7227e253dff806d002b9e67a",
|
"sha256": "1f1deee148533d75129a6f38251ff8388e33ee05fc2d20a6a80e57d6051b7b62",
|
||||||
"url": "https://pub.dev"
|
"url": "https://pub.dev"
|
||||||
},
|
},
|
||||||
"source": "hosted",
|
"source": "hosted",
|
||||||
"version": "1.1.10+1"
|
"version": "1.1.11"
|
||||||
},
|
},
|
||||||
"media_kit_libs_linux": {
|
"media_kit_libs_linux": {
|
||||||
"dependency": "direct main",
|
"dependency": "direct main",
|
||||||
|
@ -1644,6 +1654,16 @@
|
||||||
"source": "hosted",
|
"source": "hosted",
|
||||||
"version": "1.3.2"
|
"version": "1.3.2"
|
||||||
},
|
},
|
||||||
|
"unicode": {
|
||||||
|
"dependency": "transitive",
|
||||||
|
"description": {
|
||||||
|
"name": "unicode",
|
||||||
|
"sha256": "0f69e46593d65245774d4f17125c6084d2c20b4e473a983f6e21b7d7762218f1",
|
||||||
|
"url": "https://pub.dev"
|
||||||
|
},
|
||||||
|
"source": "hosted",
|
||||||
|
"version": "0.3.1"
|
||||||
|
},
|
||||||
"universal_platform": {
|
"universal_platform": {
|
||||||
"dependency": "transitive",
|
"dependency": "transitive",
|
||||||
"description": {
|
"description": {
|
||||||
|
@ -1898,11 +1918,11 @@
|
||||||
"dependency": "direct main",
|
"dependency": "direct main",
|
||||||
"description": {
|
"description": {
|
||||||
"name": "youtube_explode_dart",
|
"name": "youtube_explode_dart",
|
||||||
"sha256": "28dca07fefb4b6518beab95f0c1ef81031f921ed0fe87ebcd9c51378546edfee",
|
"sha256": "51ca5b2c03bf56060143d4f87df90ec3227592d7ae8a8003532533ae019d4291",
|
||||||
"url": "https://pub.dev"
|
"url": "https://pub.dev"
|
||||||
},
|
},
|
||||||
"source": "hosted",
|
"source": "hosted",
|
||||||
"version": "2.2.3"
|
"version": "2.3.6"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"sdks": {
|
"sdks": {
|
||||||
|
|
24
pkgs/by-name/bl/bloomeetunes/update.sh
Executable file
24
pkgs/by-name/bl/bloomeetunes/update.sh
Executable file
|
@ -0,0 +1,24 @@
|
||||||
|
#!/usr/bin/env nix-shell
|
||||||
|
#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq yq nix bash coreutils common-updater-scripts
|
||||||
|
|
||||||
|
set -eou pipefail
|
||||||
|
|
||||||
|
ROOT="$(dirname "$(readlink -f "$0")")"
|
||||||
|
|
||||||
|
latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/HemantKArya/BloomeeTunes/releases/latest | jq --raw-output .tag_name)
|
||||||
|
latestVersion=$(echo "$latestTag" | sed 's/^v//' | grep -o '^[^+]*')
|
||||||
|
RunNumber=$(echo "$latestTag" | grep -o '[^+]*$')
|
||||||
|
|
||||||
|
currentVersion=$(nix-instantiate --eval -E "with import ./. {}; bloomeetunes.version or (lib.getVersion bloomeetunes)" | tr -d '"')
|
||||||
|
|
||||||
|
if [[ "$currentVersion" == "$latestVersion" ]]; then
|
||||||
|
echo "package is up-to-date: $currentVersion"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
sed -i "s/\(tag = \"v\${version}+\)[0-9]\+/\1${RunNumber}/" "$ROOT/package.nix"
|
||||||
|
|
||||||
|
hash=$(nix hash convert --hash-algo sha256 --to sri $(nix-prefetch-url --unpack "https://github.com/HemantKArya/BloomeeTunes/archive/refs/tags/${latestTag}.tar.gz"))
|
||||||
|
update-source-version bloomeetunes $latestVersion $hash
|
||||||
|
|
||||||
|
curl https://raw.githubusercontent.com/HemantKArya/BloomeeTunes/${latestTag}/pubspec.lock | yq . >$ROOT/pubspec.lock.json
|
|
@ -13,17 +13,17 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "tauri";
|
pname = "tauri";
|
||||||
version = "2.2.1";
|
version = "2.2.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "tauri-apps";
|
owner = "tauri-apps";
|
||||||
repo = "tauri";
|
repo = "tauri";
|
||||||
tag = "tauri-v${version}";
|
tag = "tauri-v${version}";
|
||||||
hash = "sha256-v9o+oqs6OZWhHv+PExo9juzTt7W80YOTkynzwvxpHGM=";
|
hash = "sha256-agmY/39tkz71kCSksIyrbxDrvnOJpBSYCdygjd4rOBY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
useFetchCargoVendor = true;
|
useFetchCargoVendor = true;
|
||||||
cargoHash = "sha256-SmM3G0WpNcb+B5uo+2Nczg/Htx5eY5JnxF0Tkwz8k0M=";
|
cargoHash = "sha256-i4ACVFWVEs866kJHNE49fnFj87GZbJIg5p1J3eVLRwE=";
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
version,
|
version,
|
||||||
src,
|
src,
|
||||||
pname,
|
pname,
|
||||||
pnpm,
|
pnpm_9,
|
||||||
nodejs,
|
nodejs,
|
||||||
stdenv,
|
stdenv,
|
||||||
meta,
|
meta,
|
||||||
|
@ -11,14 +11,14 @@
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
inherit version src meta;
|
inherit version src meta;
|
||||||
pname = "${pname}-webui";
|
pname = "${pname}-webui";
|
||||||
pnpmDeps = pnpm.fetchDeps {
|
pnpmDeps = pnpm_9.fetchDeps {
|
||||||
inherit pname version src;
|
inherit pname version src;
|
||||||
hash = npm-hash;
|
hash = npm-hash;
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
nodejs
|
nodejs
|
||||||
pnpm.configHook
|
pnpm_9.configHook
|
||||||
];
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
|
stdenvNoCC,
|
||||||
appimageTools,
|
appimageTools,
|
||||||
fetchurl,
|
fetchurl,
|
||||||
|
makeWrapper,
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
pname = "clickup";
|
pname = "clickup";
|
||||||
|
@ -13,24 +15,42 @@ let
|
||||||
hash = "sha256-jAOYDX9j+ZTqWsSg0rEckKZnErgsIV6+CtUv3M3wNqM=";
|
hash = "sha256-jAOYDX9j+ZTqWsSg0rEckKZnErgsIV6+CtUv3M3wNqM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
appimage = appimageTools.wrapType2 {
|
||||||
|
inherit pname version src;
|
||||||
|
extraPkgs = pkgs: [ pkgs.xorg.libxkbfile ];
|
||||||
|
};
|
||||||
|
|
||||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||||
in
|
in
|
||||||
appimageTools.wrapType2 {
|
stdenvNoCC.mkDerivation {
|
||||||
inherit pname version src;
|
inherit pname version;
|
||||||
|
|
||||||
extraPkgs = pkgs: [ pkgs.xorg.libxkbfile ];
|
src = appimage;
|
||||||
|
|
||||||
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
|
||||||
|
mkdir -p $out/
|
||||||
|
cp -r bin $out/bin
|
||||||
|
|
||||||
|
mkdir -p $out/share/${pname}
|
||||||
|
cp -r ${appimageContents}/locales $out/share/${pname}
|
||||||
|
cp -r ${appimageContents}/resources $out/share/${pname}
|
||||||
|
cp -r --no-preserve=mode ${appimageContents}/usr/share/icons $out/share/
|
||||||
|
find $out/share/icons -name desktop.png -execdir mv {} clickup.png \;
|
||||||
|
|
||||||
extraInstallCommands = ''
|
|
||||||
install -m 444 -D ${appimageContents}/desktop.desktop $out/share/applications/clickup.desktop
|
install -m 444 -D ${appimageContents}/desktop.desktop $out/share/applications/clickup.desktop
|
||||||
|
|
||||||
substituteInPlace $out/share/applications/clickup.desktop \
|
substituteInPlace $out/share/applications/clickup.desktop \
|
||||||
--replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=clickup' \
|
--replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=clickup' \
|
||||||
--replace-fail 'Icon=desktop' 'Icon=clickup'
|
--replace-fail 'Icon=desktop' 'Icon=clickup'
|
||||||
|
|
||||||
for size in 16 32 64 128 256 512 1024; do
|
wrapProgram $out/bin/${pname} \
|
||||||
install -Dm444 ${appimageContents}/usr/share/icons/hicolor/''${size}x''${size}/apps/desktop.png \
|
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}} --no-update"
|
||||||
-t $out/share/icons/hicolor/''${size}x''${size}/apps/clickup.png
|
|
||||||
done
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
|
|
@ -7,16 +7,16 @@
|
||||||
}:
|
}:
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "cloudflare-dynamic-dns";
|
pname = "cloudflare-dynamic-dns";
|
||||||
version = "4.3.13";
|
version = "4.3.14";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "zebradil";
|
owner = "zebradil";
|
||||||
repo = "cloudflare-dynamic-dns";
|
repo = "cloudflare-dynamic-dns";
|
||||||
tag = version;
|
tag = version;
|
||||||
hash = "sha256-MeVLDgr332B9KWvahlhRz7Yf3R/j2KwR9ROhU3eQnwA=";
|
hash = "sha256-inxDeATTu2nbKUQ1hUMuVE4Pnn9nY74HnjMg56n5tCg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-FzEPvLI6tvyQ/nMgCBXPc1RR8YwDU1cC5f/LSZfF3Bc=";
|
vendorHash = "sha256-i/hPoBurDv/ya7JCnpmx3NHVcNzakdM65DDueBr5Hh4=";
|
||||||
|
|
||||||
subPackages = ".";
|
subPackages = ".";
|
||||||
|
|
||||||
|
|
|
@ -12,17 +12,17 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "cosmic-bg";
|
pname = "cosmic-bg";
|
||||||
version = "1.0.0-alpha.2";
|
version = "1.0.0-alpha.5.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "pop-os";
|
owner = "pop-os";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "epoch-${version}";
|
rev = "epoch-${version}";
|
||||||
hash = "sha256-lAFAZBo5FnXgJV3MrZhaYmBxqtH1E7+Huj53ho/hPik=";
|
hash = "sha256-bmcMZIURozlptsR4si62NTmexqaCX1Yj5bYj49GDehQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
useFetchCargoVendor = true;
|
useFetchCargoVendor = true;
|
||||||
cargoHash = "sha256-up3yNsKxTC9YrRuTPsGlCHTp9S/woDXPc5HcYcEY9Xc=";
|
cargoHash = "sha256-GLXooTjcGq4MsBNnlpHBBUJGNs5UjKMQJGJuj9UO2wk=";
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"
|
substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"
|
||||||
|
|
|
@ -9,13 +9,13 @@
|
||||||
}:
|
}:
|
||||||
stdenvNoCC.mkDerivation {
|
stdenvNoCC.mkDerivation {
|
||||||
pname = "cosmic-icons";
|
pname = "cosmic-icons";
|
||||||
version = "1.0.0-alpha.3";
|
version = "1.0.0-alpha.5.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "pop-os";
|
owner = "pop-os";
|
||||||
repo = "cosmic-icons";
|
repo = "cosmic-icons";
|
||||||
rev = "epoch-1.0.0-alpha.3";
|
rev = "epoch-1.0.0-alpha.5.1";
|
||||||
hash = "sha256-7gWCRBiE+XJX1JSjopyPN4bIIgZih6ZKGVSA7wBq3i0=";
|
hash = "sha256-j5H2+BOWxq2jShN15QCvj9rY6OK+vlUbyR9R07Ka2rA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ just ];
|
nativeBuildInputs = [ just ];
|
||||||
|
|
|
@ -10,17 +10,17 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "cosmic-randr";
|
pname = "cosmic-randr";
|
||||||
version = "1.0.0-alpha.3";
|
version = "1.0.0-alpha.5.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "pop-os";
|
owner = "pop-os";
|
||||||
repo = "cosmic-randr";
|
repo = "cosmic-randr";
|
||||||
rev = "epoch-${version}";
|
rev = "epoch-${version}";
|
||||||
hash = "sha256-xakK4APhlNKuWbCMP6nJXLyOaQ0hFCvzOht3P8CkV/0=";
|
hash = "sha256-mPi6TVUWKlHqLzGL84vSBZYuCjdThVVYc7hv9vq7zho=";
|
||||||
};
|
};
|
||||||
|
|
||||||
useFetchCargoVendor = true;
|
useFetchCargoVendor = true;
|
||||||
cargoHash = "sha256-S5zvh/pJA3JMwQ3K5RPPHuHKLQA9g1Ae7NLWgy9b5FA=";
|
cargoHash = "sha256-3I4ZyZvV9ELBNCvYVYBUHbh9bGw7B/RrwUlam5fdLxU=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
just
|
just
|
||||||
|
|
|
@ -9,16 +9,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "cosmic-screenshot";
|
pname = "cosmic-screenshot";
|
||||||
version = "1.0.0-alpha.2";
|
version = "1.0.0-alpha.5.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "pop-os";
|
owner = "pop-os";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "epoch-${version}";
|
rev = "epoch-${version}";
|
||||||
hash = "sha256-+yHpRbK+AWnpcGrC5U0wKbt0u8tm3CFGjKTCDQpb3G0=";
|
hash = "sha256-/sGYF+XWmPraNGlBVUcN/nokDB9JwWViEAL9gVH3ZaI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-fzIVyxzNknEjGJoR9sgXkY+gyuTC0T4Sy513X8umbWA=";
|
cargoHash = "sha256-E03MeHSEjVAlKiqW7UQh0cZ5UHKfMtXVwUynpUHexbs=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
just
|
just
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
pnpm,
|
pnpm_9,
|
||||||
nodejs,
|
nodejs,
|
||||||
stdenv,
|
stdenv,
|
||||||
clang,
|
clang,
|
||||||
|
@ -22,14 +22,14 @@ let
|
||||||
web = stdenv.mkDerivation {
|
web = stdenv.mkDerivation {
|
||||||
inherit pname version src;
|
inherit pname version src;
|
||||||
|
|
||||||
pnpmDeps = pnpm.fetchDeps {
|
pnpmDeps = pnpm_9.fetchDeps {
|
||||||
inherit pname version src;
|
inherit pname version src;
|
||||||
hash = "sha256-vqkiZzd5WOeJem0zUyMsJd6/aHHAjlsIQMkNf+SUvHY=";
|
hash = "sha256-vqkiZzd5WOeJem0zUyMsJd6/aHHAjlsIQMkNf+SUvHY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
nodejs
|
nodejs
|
||||||
pnpm.configHook
|
pnpm_9.configHook
|
||||||
];
|
];
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
|
|
|
@ -8,16 +8,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "dumbpipe";
|
pname = "dumbpipe";
|
||||||
version = "0.22.0";
|
version = "0.23.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "n0-computer";
|
owner = "n0-computer";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-NNSR8qAikwXC0bJ4jGQQ2gZZmgPin5M6xAaY2YhuBvw=";
|
hash = "sha256-ZIPvdlE/oBmtdTpWm5GU53wGGYWCc74a9w5Kqpi8tBg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-yAz/VjdS4FeKKM9vjOPcASGByNQp2StvrFHwJnk2YUg=";
|
cargoHash = "sha256-pyVmBGqdWrZ+4Ycg0Cf6sMC6mzPA6/pHMn49/OPYZ/Y=";
|
||||||
|
|
||||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
|
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
|
||||||
with darwin.apple_sdk.frameworks;
|
with darwin.apple_sdk.frameworks;
|
||||||
|
|
|
@ -6,16 +6,16 @@
|
||||||
|
|
||||||
buildNpmPackage rec {
|
buildNpmPackage rec {
|
||||||
pname = "eask-cli";
|
pname = "eask-cli";
|
||||||
version = "0.10.2";
|
version = "0.10.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "emacs-eask";
|
owner = "emacs-eask";
|
||||||
repo = "cli";
|
repo = "cli";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-G6bJoNKEz0Lpp3vfJJ86r942dWdMhQLJn10YXjUKJtI=";
|
hash = "sha256-PDWPamX3Jp28VLvyx5ZXtQ8sNTlYcwP3TlVPOgwnek8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
npmDepsHash = "sha256-xZBnjhLHceLvYD9uPz5G9EupBBUAkBghxo5au0GxdWg=";
|
npmDepsHash = "sha256-1VWTL4BzvSHmVIyteHkjVqLPtbrhD2MMg/I+4mnPBIw=";
|
||||||
|
|
||||||
dontBuild = true;
|
dontBuild = true;
|
||||||
|
|
||||||
|
|
|
@ -19,6 +19,7 @@
|
||||||
gawk,
|
gawk,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
fetchgit,
|
fetchgit,
|
||||||
|
fetchpatch2,
|
||||||
beamPackages,
|
beamPackages,
|
||||||
nixosTests,
|
nixosTests,
|
||||||
withMysql ? false,
|
withMysql ? false,
|
||||||
|
@ -172,6 +173,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
hash = "sha256-9TyIgsinUpUbirwqg61EYnPB/OyE5vhl3MBMRihqAtE=";
|
hash = "sha256-9TyIgsinUpUbirwqg61EYnPB/OyE5vhl3MBMRihqAtE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Fix json_encode_with_kv_list used in mod_matrix_gw
|
||||||
|
(fetchpatch2 {
|
||||||
|
url = "https://github.com/processone/ejabberd/commit/056635119c8b9f169f1c59cccbf81faab88a6712.patch?full_index=1";
|
||||||
|
hash = "sha256-53NMT/SwPtaeo8zaJ1JHW6HUZrxkITi731UOdsFAlJ4=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
passthru.tests = {
|
passthru.tests = {
|
||||||
inherit (nixosTests) ejabberd;
|
inherit (nixosTests) ejabberd;
|
||||||
};
|
};
|
||||||
|
|
|
@ -7,13 +7,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "extism-cli";
|
pname = "extism-cli";
|
||||||
version = "1.6.1";
|
version = "1.6.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "extism";
|
owner = "extism";
|
||||||
repo = "cli";
|
repo = "cli";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-txwpFc1FQlZLAxbpO92Ei7z3vhXBrpdIJHAqnrKp9Bg=";
|
hash = "sha256-VxQ8qj/prGecssbggSKhj0vkZ75/GD73u/g21hUVkSs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-51/fzq2j55GHmEx2twb0DSi0AmBS4DbViZzo1c5Xn1M=";
|
vendorHash = "sha256-51/fzq2j55GHmEx2twb0DSi0AmBS4DbViZzo1c5Xn1M=";
|
||||||
|
|
|
@ -2,59 +2,65 @@
|
||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
makeRustPlatform,
|
|
||||||
rustc,
|
|
||||||
cargo,
|
|
||||||
llvmPackages,
|
|
||||||
cmake,
|
cmake,
|
||||||
gcc,
|
gcc,
|
||||||
|
rust-bindgen,
|
||||||
# gcc compile error at deps: aws-lc-sys, function 'memcpy' inlined from 'OPENSSL_memcpy'
|
rustPlatform,
|
||||||
# error: '__builtin_memcpy' specified bound exceeds maximum object size
|
|
||||||
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91397
|
|
||||||
useRustPlatform ? makeRustPlatform {
|
|
||||||
inherit rustc cargo;
|
|
||||||
inherit (llvmPackages) stdenv;
|
|
||||||
},
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
useRustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "firecracker";
|
pname = "firecracker";
|
||||||
version = "1.9.1";
|
version = "1.10.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "firecracker-microvm";
|
owner = "firecracker-microvm";
|
||||||
repo = "firecracker";
|
repo = "firecracker";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-NgT06Xfb6j+d5EcqFjQeaiY08uJJjmrddzdwSoqpKbQ=";
|
hash = "sha256-kLQPAHbj8Q425Z5zdwofyHz+sd3bf7zGmcMjKn9yTKc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoLock = {
|
useFetchCargoVendor = true;
|
||||||
lockFile = ./Cargo.lock;
|
cargoHash = "sha256-TnEPNTeeX1KP+9HLD/oGF0sZGcXDHpc1Q1wCWw3L6mU=";
|
||||||
outputHashes = {
|
|
||||||
"micro_http-0.1.0" = "sha256-bso39jUUyhlNutUxHw8uHtKWQIHmoikfQ5O3RIePboo=";
|
# For aws-lc-sys@0.22.0: use external bindgen.
|
||||||
};
|
AWS_LC_SYS_EXTERNAL_BINDGEN = "true";
|
||||||
};
|
|
||||||
|
# For aws-lc-sys@0.22.0: fix gcc error:
|
||||||
|
# In function 'memcpy',
|
||||||
|
# inlined from 'OPENSSL_memcpy' at aws-lc/crypto/asn1/../internal.h
|
||||||
|
# inlined from 'aws_lc_0_22_0_i2c_ASN1_BIT_STRING' at aws-lc/crypto/asn1/a_bitstr.c
|
||||||
|
# glibc/.../string_fortified.h: error: '__builtin_memcpy' specified bound exceeds maximum object size [-Werror=stringop-overflow=]
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace $cargoDepsCopy/aws-lc-sys-*/aws-lc/crypto/asn1/a_bitstr.c \
|
||||||
|
--replace-warn '(len > INT_MAX - 1)' '(len < 0 || len > INT_MAX - 1)'
|
||||||
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
gcc
|
gcc
|
||||||
useRustPlatform.bindgenHook
|
rust-bindgen # for aws-lc-sys@0.22.0
|
||||||
|
rustPlatform.bindgenHook
|
||||||
];
|
];
|
||||||
|
|
||||||
cargoBuildFlags = [ "--workspace" ];
|
cargoBuildFlags = [ "--workspace" ];
|
||||||
|
cargoTestFlags = [ "--package" "firecracker" "--package" "jailer" ];
|
||||||
|
|
||||||
checkFlags = [
|
checkFlags = [
|
||||||
# requires /sys/devices/virtual/dmi
|
# basic tests to skip in sandbox
|
||||||
"--skip=fingerprint::dump::tests::test_read_valid_sysfs_file"
|
"--skip=fingerprint::dump::tests::test_read_valid_sysfs_file"
|
||||||
# requires /dev/kvm
|
|
||||||
"--skip=template::dump::tests::test_dump"
|
"--skip=template::dump::tests::test_dump"
|
||||||
|
"--skip=tests::test_filter_apply"
|
||||||
"--skip=tests::test_fingerprint_dump_command"
|
"--skip=tests::test_fingerprint_dump_command"
|
||||||
"--skip=tests::test_template_dump_command"
|
"--skip=tests::test_template_dump_command"
|
||||||
"--skip=tests::test_template_verify_command"
|
"--skip=tests::test_template_verify_command"
|
||||||
"--skip=utils::tests::test_build_microvm"
|
"--skip=utils::tests::test_build_microvm"
|
||||||
# requires seccomp == 0
|
# more tests to skip in sandbox
|
||||||
"--skip=tests::test_filter_apply"
|
"--skip=env::tests::test_copy_cache_info"
|
||||||
|
"--skip=env::tests::test_dup2"
|
||||||
|
"--skip=env::tests::test_mknod_and_own_dev"
|
||||||
|
"--skip=env::tests::test_setup_jailed_folder"
|
||||||
|
"--skip=env::tests::test_userfaultfd_dev"
|
||||||
|
"--skip=resource_limits::tests::test_set_resource_limits"
|
||||||
];
|
];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
, buildNpmPackage
|
, buildNpmPackage
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, nixosTests
|
, nixosTests
|
||||||
, pnpm
|
, pnpm_9
|
||||||
, nix-update-script
|
, nix-update-script
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -17,9 +17,9 @@ buildNpmPackage rec {
|
||||||
hash = "sha256-lm+vPo7V99OSUAVEvdiTNMlD/+iHGPIyPLc1WzO1aTU=";
|
hash = "sha256-lm+vPo7V99OSUAVEvdiTNMlD/+iHGPIyPLc1WzO1aTU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
npmConfigHook = pnpm.configHook;
|
npmConfigHook = pnpm_9.configHook;
|
||||||
npmDeps = pnpmDeps;
|
npmDeps = pnpmDeps;
|
||||||
pnpmDeps = pnpm.fetchDeps {
|
pnpmDeps = pnpm_9.fetchDeps {
|
||||||
inherit pname version src;
|
inherit pname version src;
|
||||||
hash = "sha256-NuU9O3bEboxmuEuk1WSUeZRNgVK5cwFiUAN3+7vACGw=";
|
hash = "sha256-NuU9O3bEboxmuEuk1WSUeZRNgVK5cwFiUAN3+7vACGw=";
|
||||||
};
|
};
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
makeDesktopItem,
|
makeDesktopItem,
|
||||||
makeWrapper,
|
makeWrapper,
|
||||||
nodejs,
|
nodejs,
|
||||||
pnpm,
|
pnpm_9,
|
||||||
stdenv,
|
stdenv,
|
||||||
}:
|
}:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -23,12 +23,12 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
nodejs
|
nodejs
|
||||||
pnpm.configHook
|
pnpm_9.configHook
|
||||||
makeWrapper
|
makeWrapper
|
||||||
imagemagick
|
imagemagick
|
||||||
];
|
];
|
||||||
|
|
||||||
pnpmDeps = pnpm.fetchDeps {
|
pnpmDeps = pnpm_9.fetchDeps {
|
||||||
inherit pname version src;
|
inherit pname version src;
|
||||||
hash = "sha256-FzMjN0rIjYxexf6tix4qi3mnuPkadjKihhN0Pj5y2nU=";
|
hash = "sha256-FzMjN0rIjYxexf6tix4qi3mnuPkadjKihhN0Pj5y2nU=";
|
||||||
};
|
};
|
||||||
|
|
|
@ -6,16 +6,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "frei";
|
pname = "frei";
|
||||||
version = "0.1.0";
|
version = "0.1.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "alexcoder04";
|
owner = "alexcoder04";
|
||||||
repo = "frei";
|
repo = "frei";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-9CV6B7fRHXl73uI2JRv3RiaFczLHHBOd7/8UoCAwK6w=";
|
sha256 = "sha256-289idsn/PhLK2FOUTQj6eS4O73LgX5v5qn3ZRvn/XRo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = null;
|
vendorHash = "sha256-N5k/2wB46oRfM4ShjVQ23tAgCMmyBaGfIslUqYUJYrc=";
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Modern replacement for free";
|
description = "Modern replacement for free";
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
makeWrapper,
|
makeWrapper,
|
||||||
gdal,
|
gdal,
|
||||||
geos,
|
geos,
|
||||||
pnpm,
|
pnpm_9,
|
||||||
nodejs,
|
nodejs,
|
||||||
postgresql,
|
postgresql,
|
||||||
postgresqlTestHook,
|
postgresqlTestHook,
|
||||||
|
@ -42,7 +42,7 @@ python.pkgs.buildPythonApplication rec {
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
makeWrapper
|
makeWrapper
|
||||||
nodejs
|
nodejs
|
||||||
pnpm.configHook
|
pnpm_9.configHook
|
||||||
];
|
];
|
||||||
|
|
||||||
dependencies = with python.pkgs; [
|
dependencies = with python.pkgs; [
|
||||||
|
@ -99,7 +99,7 @@ python.pkgs.buildPythonApplication rec {
|
||||||
websockets
|
websockets
|
||||||
];
|
];
|
||||||
|
|
||||||
pnpmDeps = pnpm.fetchDeps {
|
pnpmDeps = pnpm_9.fetchDeps {
|
||||||
inherit pname version src;
|
inherit pname version src;
|
||||||
hash = "sha256-DMoaXNm5S64XBERHFnFM6IKBkzXRGDEYWSTruccK9Hc=";
|
hash = "sha256-DMoaXNm5S64XBERHFnFM6IKBkzXRGDEYWSTruccK9Hc=";
|
||||||
};
|
};
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
pnpm,
|
pnpm_9,
|
||||||
nodejs,
|
nodejs,
|
||||||
electron,
|
electron,
|
||||||
makeDesktopItem,
|
makeDesktopItem,
|
||||||
|
@ -25,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
nodejs
|
nodejs
|
||||||
pnpm.configHook
|
pnpm_9.configHook
|
||||||
copyDesktopItems
|
copyDesktopItems
|
||||||
imagemagick
|
imagemagick
|
||||||
makeWrapper
|
makeWrapper
|
||||||
];
|
];
|
||||||
|
|
||||||
pnpmDeps = pnpm.fetchDeps {
|
pnpmDeps = pnpm_9.fetchDeps {
|
||||||
inherit (finalAttrs) pname version src;
|
inherit (finalAttrs) pname version src;
|
||||||
hash = "sha256-I78AvOBdDd59eVJJ51xxNwVvMnNvLdJJpFEtE/I1H8U=";
|
hash = "sha256-I78AvOBdDd59eVJJ51xxNwVvMnNvLdJJpFEtE/I1H8U=";
|
||||||
};
|
};
|
||||||
|
|
|
@ -34,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
gettext
|
gettext
|
||||||
|
glib # glib-compile-resources
|
||||||
itstool
|
itstool
|
||||||
pkg-config
|
pkg-config
|
||||||
libxml2
|
libxml2
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
stdenv,
|
stdenv,
|
||||||
lib,
|
lib,
|
||||||
substituteAll,
|
substituteAll,
|
||||||
|
buildPackages,
|
||||||
fetchurl,
|
fetchurl,
|
||||||
meson,
|
meson,
|
||||||
ninja,
|
ninja,
|
||||||
|
@ -59,12 +60,18 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
|
depsBuildBuild = [
|
||||||
|
buildPackages.stdenv.cc
|
||||||
|
pkg-config
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
meson
|
meson
|
||||||
ninja
|
ninja
|
||||||
pkg-config
|
pkg-config
|
||||||
perl
|
perl
|
||||||
gettext
|
gettext
|
||||||
|
glib
|
||||||
libxml2
|
libxml2
|
||||||
libxslt
|
libxslt
|
||||||
docbook_xsl
|
docbook_xsl
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
pnpm,
|
pnpm_9,
|
||||||
nodejs_22,
|
nodejs_22,
|
||||||
nix-update-script,
|
nix-update-script,
|
||||||
electron,
|
electron,
|
||||||
|
@ -14,7 +14,7 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
pnpm' = pnpm.override { nodejs = nodejs_22; };
|
pnpm' = pnpm_9.override { nodejs = nodejs_22; };
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "goofcord";
|
pname = "goofcord";
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
stdenv,
|
stdenv,
|
||||||
nodejs,
|
nodejs,
|
||||||
pnpm,
|
pnpm_9,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
buildGoModule,
|
buildGoModule,
|
||||||
lib,
|
lib,
|
||||||
|
@ -30,10 +30,10 @@ let
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
nodejs
|
nodejs
|
||||||
pnpm.configHook
|
pnpm_9.configHook
|
||||||
];
|
];
|
||||||
|
|
||||||
pnpmDeps = pnpm.fetchDeps {
|
pnpmDeps = pnpm_9.fetchDeps {
|
||||||
inherit (finalAttrs) pname version src;
|
inherit (finalAttrs) pname version src;
|
||||||
sourceRoot = "${finalAttrs.src.name}/frontend";
|
sourceRoot = "${finalAttrs.src.name}/frontend";
|
||||||
hash = "sha256-mG8b16PP876EyaX3Sc4WM41Yc/oDGZDiilZPaxPvvuQ=";
|
hash = "sha256-mG8b16PP876EyaX3Sc4WM41Yc/oDGZDiilZPaxPvvuQ=";
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
stdenv,
|
stdenv,
|
||||||
nodejs,
|
nodejs,
|
||||||
pnpm,
|
pnpm_9,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
buildGoModule,
|
buildGoModule,
|
||||||
lib,
|
lib,
|
||||||
|
@ -30,10 +30,10 @@ let
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
nodejs
|
nodejs
|
||||||
pnpm.configHook
|
pnpm_9.configHook
|
||||||
];
|
];
|
||||||
|
|
||||||
pnpmDeps = pnpm.fetchDeps {
|
pnpmDeps = pnpm_9.fetchDeps {
|
||||||
inherit (finalAttrs) pname version src;
|
inherit (finalAttrs) pname version src;
|
||||||
sourceRoot = "${finalAttrs.src.name}/frontend";
|
sourceRoot = "${finalAttrs.src.name}/frontend";
|
||||||
hash = "sha256-dLI1YMzs9lLk9lJBkBgc6cpirM79khy0g5VaOVEzUAc=";
|
hash = "sha256-dLI1YMzs9lLk9lJBkBgc6cpirM79khy0g5VaOVEzUAc=";
|
||||||
|
|
|
@ -1,60 +0,0 @@
|
||||||
{
|
|
||||||
lib,
|
|
||||||
python3,
|
|
||||||
fetchFromGitHub,
|
|
||||||
}:
|
|
||||||
|
|
||||||
python3.pkgs.buildPythonApplication rec {
|
|
||||||
pname = "homeassistant-satellite";
|
|
||||||
version = "2.3.0";
|
|
||||||
pyproject = true;
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "synesthesiam";
|
|
||||||
repo = "homeassistant-satellite";
|
|
||||||
rev = "v${version}";
|
|
||||||
hash = "sha256-iosutOpkpt0JJIMyALuQSDLj4jk57ITShVyPYlQgMFg=";
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = with python3.pkgs; [
|
|
||||||
setuptools
|
|
||||||
];
|
|
||||||
|
|
||||||
pythonRelaxDeps = [
|
|
||||||
"aiohttp"
|
|
||||||
];
|
|
||||||
|
|
||||||
propagatedBuildInputs = with python3.pkgs; [
|
|
||||||
aiohttp
|
|
||||||
];
|
|
||||||
|
|
||||||
optional-dependencies = {
|
|
||||||
pulseaudio = with python3.pkgs; [
|
|
||||||
pasimple
|
|
||||||
pulsectl
|
|
||||||
];
|
|
||||||
silerovad = with python3.pkgs; [
|
|
||||||
numpy
|
|
||||||
onnxruntime
|
|
||||||
];
|
|
||||||
webrtc = with python3.pkgs; [
|
|
||||||
webrtc-noise-gain
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
pythonImportsCheck = [
|
|
||||||
"homeassistant_satellite"
|
|
||||||
];
|
|
||||||
|
|
||||||
# no tests
|
|
||||||
doCheck = false;
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
changelog = "https://github.com/synesthesiam/homeassistant-satellite/blob/v${version}/CHANGELOG.md";
|
|
||||||
description = "Streaming audio satellite for Home Assistant";
|
|
||||||
homepage = "https://github.com/synesthesiam/homeassistant-satellite";
|
|
||||||
license = licenses.mit;
|
|
||||||
maintainers = with maintainers; [ hexa ];
|
|
||||||
mainProgram = "homeassistant-satellite";
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -2,7 +2,7 @@
|
||||||
lib,
|
lib,
|
||||||
buildGo123Module,
|
buildGo123Module,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
pnpm,
|
pnpm_9,
|
||||||
nodejs,
|
nodejs,
|
||||||
go_1_23,
|
go_1_23,
|
||||||
git,
|
git,
|
||||||
|
@ -35,7 +35,7 @@ buildGo123Module {
|
||||||
preBuild = "";
|
preBuild = "";
|
||||||
};
|
};
|
||||||
|
|
||||||
pnpmDeps = pnpm.fetchDeps {
|
pnpmDeps = pnpm_9.fetchDeps {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
src = "${src}/frontend";
|
src = "${src}/frontend";
|
||||||
hash = "sha256-x7sWSH84UJEXNRLCgEgXc4NrTRsn6OplANi+XGtIN9Y=";
|
hash = "sha256-x7sWSH84UJEXNRLCgEgXc4NrTRsn6OplANi+XGtIN9Y=";
|
||||||
|
@ -56,8 +56,8 @@ buildGo123Module {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pnpm
|
pnpm_9
|
||||||
pnpm.configHook
|
pnpm_9.configHook
|
||||||
nodejs
|
nodejs
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
lib,
|
lib,
|
||||||
stdenvNoCC,
|
stdenvNoCC,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
pnpm,
|
pnpm_9,
|
||||||
nodejs,
|
nodejs,
|
||||||
dart-sass,
|
dart-sass,
|
||||||
nix-update-script,
|
nix-update-script,
|
||||||
|
@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec {
|
||||||
hash = "sha256-nOhovVqWlHPunwruJrgqFhhDxccKBp/iEyB3Y3C5Cz8=";
|
hash = "sha256-nOhovVqWlHPunwruJrgqFhhDxccKBp/iEyB3Y3C5Cz8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
pnpmDeps = pnpm.fetchDeps {
|
pnpmDeps = pnpm_9.fetchDeps {
|
||||||
inherit
|
inherit
|
||||||
pname
|
pname
|
||||||
version
|
version
|
||||||
|
@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation rec {
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
nodejs
|
nodejs
|
||||||
dart-sass
|
dart-sass
|
||||||
pnpm.configHook
|
pnpm_9.configHook
|
||||||
];
|
];
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
|
|
|
@ -9,13 +9,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "ignite-cli";
|
pname = "ignite-cli";
|
||||||
version = "28.6.1";
|
version = "28.7.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
repo = "cli";
|
repo = "cli";
|
||||||
owner = "ignite";
|
owner = "ignite";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-Ps4OxOPyBYdiW0y1L6z0ymc2/0dIQgsNinuhlRLpGDk=";
|
hash = "sha256-/gBykwBlZsHUWCJ01rdluU10xuEEmPmCfzSWlO6znW8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-ks9wZUIwN0dOcXxxRk1Amxd0TPJBbLfKC9lzV4IMdjk=";
|
vendorHash = "sha256-ks9wZUIwN0dOcXxxRk1Amxd0TPJBbLfKC9lzV4IMdjk=";
|
||||||
|
|
|
@ -25,13 +25,13 @@ let
|
||||||
in
|
in
|
||||||
buildNpmPackage rec {
|
buildNpmPackage rec {
|
||||||
pname = "jitsi-meet-electron";
|
pname = "jitsi-meet-electron";
|
||||||
version = "2024.6.0";
|
version = "2025.1.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jitsi";
|
owner = "jitsi";
|
||||||
repo = "jitsi-meet-electron";
|
repo = "jitsi-meet-electron";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-jnt+aHkCnIj4GGFbAk6AlVhg0rvzFhGCELAaYMCZx88=";
|
hash = "sha256-o65UPPyGgmFe8+HANmnyVgPITk8gY7uvIzx7QZUluBU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs =
|
nativeBuildInputs =
|
||||||
|
@ -58,7 +58,7 @@ buildNpmPackage rec {
|
||||||
OpenGL
|
OpenGL
|
||||||
];
|
];
|
||||||
|
|
||||||
npmDepsHash = "sha256-zmnxNJdalspZib1PGZN0YBIauJ+gaxs6Iir94cPRNtU=";
|
npmDepsHash = "sha256-16yWCI408tkkzvrx2fBPSNSUa9dRej9LrnNpqobwfl8=";
|
||||||
|
|
||||||
makeCacheWritable = true;
|
makeCacheWritable = true;
|
||||||
|
|
||||||
|
|
|
@ -9,16 +9,25 @@
|
||||||
libiconv,
|
libiconv,
|
||||||
mdbook,
|
mdbook,
|
||||||
nix-update-script,
|
nix-update-script,
|
||||||
|
# run the compiled `just` to build the completions
|
||||||
|
installShellCompletions ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
|
||||||
|
# run the compiled `just` to build the man pages
|
||||||
|
installManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
|
||||||
|
# run the compiled `generate-book` utility to prepare the files for mdbook
|
||||||
|
withDocumentation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "just";
|
pname = "just";
|
||||||
version = "1.38.0";
|
version = "1.38.0";
|
||||||
outputs = [
|
outputs =
|
||||||
"out"
|
[
|
||||||
"man"
|
"out"
|
||||||
"doc"
|
]
|
||||||
];
|
++ lib.optionals installManPages [
|
||||||
|
"man"
|
||||||
|
]
|
||||||
|
++ lib.optionals withDocumentation [ "doc" ];
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "casey";
|
owner = "casey";
|
||||||
|
@ -29,10 +38,9 @@ rustPlatform.buildRustPackage rec {
|
||||||
|
|
||||||
cargoHash = "sha256-JHLkjMy5b1spJrAqFCCzqgnlYTAKA1Z9Tx4w1WWuiAI=";
|
cargoHash = "sha256-JHLkjMy5b1spJrAqFCCzqgnlYTAKA1Z9Tx4w1WWuiAI=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs =
|
||||||
installShellFiles
|
lib.optionals (installShellCompletions || installManPages) [ installShellFiles ]
|
||||||
mdbook
|
++ lib.optionals withDocumentation [ mdbook ];
|
||||||
];
|
|
||||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
|
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
|
||||||
|
|
||||||
preCheck = ''
|
preCheck = ''
|
||||||
|
@ -61,22 +69,9 @@ rustPlatform.buildRustPackage rec {
|
||||||
./fix-just-path-in-tests.patch
|
./fix-just-path-in-tests.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
postBuild = ''
|
cargoBuildFlags = [
|
||||||
cargo run --package generate-book
|
"--package=just"
|
||||||
|
] ++ (lib.optionals withDocumentation [ "--package=generate-book" ]);
|
||||||
mkdir -p completions man
|
|
||||||
|
|
||||||
cargo run -- --man > man/just.1
|
|
||||||
|
|
||||||
for shell in bash fish zsh; do
|
|
||||||
cargo run -- --completions $shell > completions/just.$shell
|
|
||||||
done
|
|
||||||
|
|
||||||
# No linkcheck in sandbox
|
|
||||||
echo 'optional = true' >> book/en/book.toml
|
|
||||||
mdbook build book/en
|
|
||||||
find .
|
|
||||||
'';
|
|
||||||
|
|
||||||
checkFlags = [
|
checkFlags = [
|
||||||
"--skip=backticks::trailing_newlines_are_stripped" # Wants to use python3 as alternate shell
|
"--skip=backticks::trailing_newlines_are_stripped" # Wants to use python3 as alternate shell
|
||||||
|
@ -87,16 +82,26 @@ rustPlatform.buildRustPackage rec {
|
||||||
"--skip=shebang::run_shebang" # test case very rarely fails with "Text file busy"
|
"--skip=shebang::run_shebang" # test case very rarely fails with "Text file busy"
|
||||||
];
|
];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall =
|
||||||
mkdir -p $doc/share/doc/$name
|
lib.optionalString withDocumentation ''
|
||||||
mv ./book/en/build/html $doc/share/doc/$name
|
$out/bin/generate-book
|
||||||
installManPage man/just.1
|
rm $out/bin/generate-book
|
||||||
|
# No linkcheck in sandbox
|
||||||
installShellCompletion --cmd just \
|
echo 'optional = true' >> book/en/book.toml
|
||||||
--bash completions/just.bash \
|
mdbook build book/en
|
||||||
--fish completions/just.fish \
|
mkdir -p $doc/share/doc/$name
|
||||||
--zsh completions/just.zsh
|
mv ./book/en/build/html $doc/share/doc/$name
|
||||||
'';
|
''
|
||||||
|
+ lib.optionalString installManPages ''
|
||||||
|
$out/bin/just --man > ./just.1
|
||||||
|
installManPage ./just.1
|
||||||
|
''
|
||||||
|
+ lib.optionalString installShellCompletions ''
|
||||||
|
installShellCompletion --cmd just \
|
||||||
|
--bash <($out/bin/just --completions bash) \
|
||||||
|
--fish <($out/bin/just --completions fish) \
|
||||||
|
--zsh <($out/bin/just --completions zsh)
|
||||||
|
'';
|
||||||
|
|
||||||
setupHook = ./setup-hook.sh;
|
setupHook = ./setup-hook.sh;
|
||||||
|
|
||||||
|
|
|
@ -14,13 +14,13 @@
|
||||||
}:
|
}:
|
||||||
flutter327.buildFlutterApplication rec {
|
flutter327.buildFlutterApplication rec {
|
||||||
pname = "kazumi";
|
pname = "kazumi";
|
||||||
version = "1.5.0";
|
version = "1.5.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Predidit";
|
owner = "Predidit";
|
||||||
repo = "Kazumi";
|
repo = "Kazumi";
|
||||||
tag = version;
|
tag = version;
|
||||||
hash = "sha256-YYg8DpW/O517R9YZ9jpikNIy2MfLQdiLsdhO3uhCusc=";
|
hash = "sha256-JEVZptPD3PZqaIRmzYAaz6HHfNQqAQX6F/K/5bnLyl4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||||
|
|
|
@ -230,11 +230,11 @@
|
||||||
"dependency": "direct main",
|
"dependency": "direct main",
|
||||||
"description": {
|
"description": {
|
||||||
"name": "card_settings_ui",
|
"name": "card_settings_ui",
|
||||||
"sha256": "36bd1bb8e3d18612e2654e722da0f1ed9bc7a412339b906205107ece72b8e14b",
|
"sha256": "3c0677c31b68ac654e7efc85a4adfec4375445f8c67a1dbe88aa8cf115e52533",
|
||||||
"url": "https://pub.dev"
|
"url": "https://pub.dev"
|
||||||
},
|
},
|
||||||
"source": "hosted",
|
"source": "hosted",
|
||||||
"version": "1.0.0"
|
"version": "1.1.1"
|
||||||
},
|
},
|
||||||
"characters": {
|
"characters": {
|
||||||
"dependency": "transitive",
|
"dependency": "transitive",
|
||||||
|
|
|
@ -24,11 +24,11 @@ let
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "keycloak";
|
pname = "keycloak";
|
||||||
version = "26.0.8";
|
version = "26.1.0";
|
||||||
|
|
||||||
src = fetchzip {
|
src = fetchzip {
|
||||||
url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip";
|
url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip";
|
||||||
hash = "sha256-o4Yken4PlitebEBNI+BrQqYM+RtsURj0LvYFBSjuQIE=";
|
hash = "sha256-5Us/cBH10SnO6wiggmwg6V7u4FKoLd1V0x8Z4GNDaXc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -25,16 +25,22 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkg-config
|
pkg-config
|
||||||
rubberband
|
|
||||||
scons
|
scons
|
||||||
];
|
];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
rubberband
|
||||||
libsamplerate
|
libsamplerate
|
||||||
libsndfile
|
libsndfile
|
||||||
liblo
|
liblo
|
||||||
libjack2
|
libjack2
|
||||||
boost
|
boost
|
||||||
];
|
];
|
||||||
|
|
||||||
|
preBuild = ''
|
||||||
|
substituteInPlace SConstruct \
|
||||||
|
--replace-fail 'pkg-config' "${stdenv.cc.targetPrefix}pkg-config"
|
||||||
|
'';
|
||||||
|
|
||||||
prefixKey = "PREFIX=";
|
prefixKey = "PREFIX=";
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
|
|
@ -7,15 +7,15 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "klog-rs";
|
pname = "klog-rs";
|
||||||
version = "0.3.2";
|
version = "0.4.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "tobifroe";
|
owner = "tobifroe";
|
||||||
repo = "klog";
|
repo = "klog";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-E9sVFVb+wmhkdGmzkQQGhTh9+MExuq/ftfeI07f906o=";
|
hash = "sha256-AlXyCDjs5xFqM0TmaBGfzvYn/ZDWAgBzLV/mDPQHflI=";
|
||||||
};
|
};
|
||||||
cargoHash = "sha256-BpSLfJTsUpf64sXNgVxX7BtT65+qGVmmFG052sC7AOY=";
|
cargoHash = "sha256-rJrOCDtWdvrvvQxC49g1wkW9/CrAGkGJQUuPZ2a6+bw=";
|
||||||
checkFlags = [
|
checkFlags = [
|
||||||
# this integration test depends on a running kubernetes cluster
|
# this integration test depends on a running kubernetes cluster
|
||||||
"--skip=k8s::tests::test_get_pod_list"
|
"--skip=k8s::tests::test_get_pod_list"
|
||||||
|
|
|
@ -14,13 +14,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "labwc-tweaks-gtk";
|
pname = "labwc-tweaks-gtk";
|
||||||
version = "0-unstable-2025-01-03";
|
version = "0-unstable-2025-01-11";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "labwc";
|
owner = "labwc";
|
||||||
repo = "labwc-tweaks-gtk";
|
repo = "labwc-tweaks-gtk";
|
||||||
rev = "ac8623a24d7490bbdbe7850adc8d242c1aca92fe";
|
rev = "d954bc6bce2e86893c0470de36beae0542eceaad";
|
||||||
hash = "sha256-yAH+iq/YtUOnrS0ydxz0gQuGXue6zQWfpx3FIAUYEDA=";
|
hash = "sha256-c+6AolglEF/+voa5mDwm3JLIA4btFOBI8e2/ZxCApGg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
pnpm,
|
pnpm_9,
|
||||||
nodejs,
|
nodejs,
|
||||||
electron_32,
|
electron_32,
|
||||||
makeWrapper,
|
makeWrapper,
|
||||||
|
@ -22,13 +22,13 @@ stdenv.mkDerivation rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pnpm.configHook
|
pnpm_9.configHook
|
||||||
nodejs
|
nodejs
|
||||||
makeWrapper
|
makeWrapper
|
||||||
copyDesktopItems
|
copyDesktopItems
|
||||||
];
|
];
|
||||||
|
|
||||||
pnpmDeps = pnpm.fetchDeps {
|
pnpmDeps = pnpm_9.fetchDeps {
|
||||||
inherit pname version src;
|
inherit pname version src;
|
||||||
hash = "sha256-QTePf/QE85OzXIcnwLJsCJJyRxwoV+FNef2Z9nAt35E=";
|
hash = "sha256-QTePf/QE85OzXIcnwLJsCJJyRxwoV+FNef2Z9nAt35E=";
|
||||||
};
|
};
|
||||||
|
|
|
@ -14,13 +14,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "libdatachannel";
|
pname = "libdatachannel";
|
||||||
version = "0.22.3";
|
version = "0.22.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "paullouisageneau";
|
owner = "paullouisageneau";
|
||||||
repo = "libdatachannel";
|
repo = "libdatachannel";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-hGqqHMBC0dSF4J2SNjFTNen0iIUEvENcdLWPM3/X2xM=";
|
hash = "sha256-mnBB2UyeQ73NckE3uF91RhezJDKMQeoOKn8515ygrU0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
|
|
|
@ -7,16 +7,16 @@
|
||||||
}:
|
}:
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "limbo";
|
pname = "limbo";
|
||||||
version = "0.0.11";
|
version = "0.0.12";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "tursodatabase";
|
owner = "tursodatabase";
|
||||||
repo = "limbo";
|
repo = "limbo";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-bX56aiL7Eqa3jLd1u9h6u583q0S9VZfJ+cVPB+8R1eU=";
|
hash = "sha256-Lmtvn7hWdrqumtTpiYK0sTsESeKo4Mfao32K0DfHmrc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-GspyWOxwAQvjNzN0yZvj3WpADR3VUO0MjSKiq9wbLOw=";
|
cargoHash = "sha256-hOKTN41yqMPh/Zo8jVRiOSL331py9QRzLhkTL2Jz0yI=";
|
||||||
|
|
||||||
cargoBuildFlags = [
|
cargoBuildFlags = [
|
||||||
"-p"
|
"-p"
|
||||||
|
@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
|
||||||
meta = {
|
meta = {
|
||||||
description = "Interactive SQL shell for Limbo";
|
description = "Interactive SQL shell for Limbo";
|
||||||
homepage = "https://github.com/tursodatabase/limbo";
|
homepage = "https://github.com/tursodatabase/limbo";
|
||||||
changelog = "https://github.com/tursodatabase/limbo/blob/${src.tag}/CHANGELOG.md";
|
changelog = "https://github.com/tursodatabase/limbo/blob/v${version}/CHANGELOG.md";
|
||||||
license = lib.licenses.mit;
|
license = lib.licenses.mit;
|
||||||
maintainers = with lib.maintainers; [ nartsiss ];
|
maintainers = with lib.maintainers; [ nartsiss ];
|
||||||
mainProgram = "limbo";
|
mainProgram = "limbo";
|
||||||
|
|
|
@ -1,50 +1 @@
|
||||||
{
|
{ python3Packages }: with python3Packages; toPythonApplication mcdreforged
|
||||||
lib,
|
|
||||||
fetchFromGitHub,
|
|
||||||
python3,
|
|
||||||
testers,
|
|
||||||
mcdreforged,
|
|
||||||
}:
|
|
||||||
|
|
||||||
python3.pkgs.buildPythonApplication rec {
|
|
||||||
pname = "mcdreforged";
|
|
||||||
version = "2.13.2";
|
|
||||||
pyproject = true;
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "MCDReforged";
|
|
||||||
repo = "MCDReforged";
|
|
||||||
tag = "v${version}";
|
|
||||||
hash = "sha256-4podJ3InBnNc+t4BpCQrg2QbJ9ZJr5fmroXyzo7JrZw=";
|
|
||||||
};
|
|
||||||
|
|
||||||
build-system = [ python3.pkgs.setuptools ];
|
|
||||||
|
|
||||||
dependencies = with python3.pkgs; [
|
|
||||||
colorama
|
|
||||||
colorlog
|
|
||||||
packaging
|
|
||||||
parse
|
|
||||||
prompt-toolkit
|
|
||||||
psutil
|
|
||||||
requests
|
|
||||||
resolvelib
|
|
||||||
ruamel-yaml
|
|
||||||
typing-extensions
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeCheckInputs = [ python3.pkgs.pytestCheckHook ];
|
|
||||||
|
|
||||||
passthru.tests = {
|
|
||||||
version = testers.testVersion { package = mcdreforged; };
|
|
||||||
};
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
description = "Rewritten version of MCDaemon, a python tool to control your Minecraft server";
|
|
||||||
homepage = "https://mcdreforged.com";
|
|
||||||
changelog = "https://github.com/MCDReforged/MCDReforged/releases/tag/v${version}";
|
|
||||||
license = lib.licenses.lgpl3Only;
|
|
||||||
maintainers = with lib.maintainers; [ moraxyc ];
|
|
||||||
mainProgram = "mcdreforged";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
|
@ -8,23 +8,23 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
hlsJs = fetchurl {
|
hlsJs = fetchurl {
|
||||||
url = "https://cdn.jsdelivr.net/npm/hls.js@v1.5.18/dist/hls.min.js";
|
url = "https://cdn.jsdelivr.net/npm/hls.js@v1.5.19/dist/hls.min.js";
|
||||||
hash = "sha256-X/LXFN4wvkKPx3sT4B25pLTPAV6bTWs+iGS2XT19Ptc=";
|
hash = "sha256-KTlFB7LXpglQPzIzKajKy3DJRGDURwP4hcmRm7Oy/a8=";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "mediamtx";
|
pname = "mediamtx";
|
||||||
# check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION
|
# check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION
|
||||||
version = "1.11.0";
|
version = "1.11.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "bluenviron";
|
owner = "bluenviron";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-WpMFP88MLpftfPn6DP2QM7oSRNwDAIC35/imrznLVA8=";
|
hash = "sha256-8/RTdcq8r5yMu586iDNyC/Cfi0PydX7QkU52noQR18Y=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-yOeenOYV2MztEfhwxIkmbxn40XhYNZMMTm+kcR7TAtc=";
|
vendorHash = "sha256-Laos5sTQjtweC4GLuQuK2J/trObPlCmoHSUw4shVP4k=";
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
cp ${hlsJs} internal/servers/hls/hls.min.js
|
cp ${hlsJs} internal/servers/hls/hls.min.js
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
nix-update-script,
|
nix-update-script,
|
||||||
nodejs,
|
nodejs,
|
||||||
pnpm,
|
pnpm_9,
|
||||||
stdenv,
|
stdenv,
|
||||||
}:
|
}:
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
|
@ -18,11 +18,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pnpm.configHook
|
pnpm_9.configHook
|
||||||
nodejs
|
nodejs
|
||||||
];
|
];
|
||||||
|
|
||||||
pnpmDeps = pnpm.fetchDeps {
|
pnpmDeps = pnpm_9.fetchDeps {
|
||||||
inherit (finalAttrs) pname version src;
|
inherit (finalAttrs) pname version src;
|
||||||
hash = "sha256-aw8Sh4BecQ09rC0OLWebdWc7D/LE8vPs9uqh6w5G/FM=";
|
hash = "sha256-aw8Sh4BecQ09rC0OLWebdWc7D/LE8vPs9uqh6w5G/FM=";
|
||||||
};
|
};
|
||||||
|
|
|
@ -10,13 +10,13 @@
|
||||||
|
|
||||||
stdenvNoCC.mkDerivation rec {
|
stdenvNoCC.mkDerivation rec {
|
||||||
pname = "mint-y-icons";
|
pname = "mint-y-icons";
|
||||||
version = "1.8.1";
|
version = "1.8.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "linuxmint";
|
owner = "linuxmint";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-hVPDuDhmYhc+m+W703T9VdSHB5z0e6lMPDHYkcoB6nM=";
|
hash = "sha256-xGPihqXUraJy9lDCSVjQlNxrhETEcjBTYhyFsZGJRGo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
nixosTests,
|
nixosTests,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
nodejs,
|
nodejs,
|
||||||
pnpm,
|
pnpm_9,
|
||||||
makeWrapper,
|
makeWrapper,
|
||||||
python3,
|
python3,
|
||||||
bash,
|
bash,
|
||||||
|
@ -30,13 +30,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
nodejs
|
nodejs
|
||||||
pnpm.configHook
|
pnpm_9.configHook
|
||||||
makeWrapper
|
makeWrapper
|
||||||
python3
|
python3
|
||||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcrun ];
|
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcrun ];
|
||||||
|
|
||||||
# https://nixos.org/manual/nixpkgs/unstable/#javascript-pnpm
|
# https://nixos.org/manual/nixpkgs/unstable/#javascript-pnpm
|
||||||
pnpmDeps = pnpm.fetchDeps {
|
pnpmDeps = pnpm_9.fetchDeps {
|
||||||
inherit (finalAttrs) pname version src;
|
inherit (finalAttrs) pname version src;
|
||||||
hash = "sha256-YWZhm5eKjB6JGP45WC3UrIkr7vuBUI4Q3oiK8Lst3dI=";
|
hash = "sha256-YWZhm5eKjB6JGP45WC3UrIkr7vuBUI4Q3oiK8Lst3dI=";
|
||||||
};
|
};
|
||||||
|
@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
# Otherwise, maybe somehow bindmount a writable directory into <package>/data/files.
|
# Otherwise, maybe somehow bindmount a writable directory into <package>/data/files.
|
||||||
ln -s /var/lib/misskey $out/data/files
|
ln -s /var/lib/misskey $out/data/files
|
||||||
|
|
||||||
makeWrapper ${pnpm}/bin/pnpm $out/bin/misskey \
|
makeWrapper ${pnpm_9}/bin/pnpm $out/bin/misskey \
|
||||||
--run "${checkEnvVarScript} || exit" \
|
--run "${checkEnvVarScript} || exit" \
|
||||||
--chdir $out/data \
|
--chdir $out/data \
|
||||||
--add-flags run \
|
--add-flags run \
|
||||||
|
@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
--prefix PATH : ${
|
--prefix PATH : ${
|
||||||
lib.makeBinPath [
|
lib.makeBinPath [
|
||||||
nodejs
|
nodejs
|
||||||
pnpm
|
pnpm_9
|
||||||
bash
|
bash
|
||||||
]
|
]
|
||||||
} \
|
} \
|
||||||
|
|
|
@ -16,15 +16,15 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "mixxc";
|
pname = "mixxc";
|
||||||
version = "0.2.3";
|
version = "0.2.4";
|
||||||
|
|
||||||
src = fetchCrate {
|
src = fetchCrate {
|
||||||
pname = "mixxc";
|
pname = "mixxc";
|
||||||
inherit version;
|
inherit version;
|
||||||
hash = "sha256-d/bMDqDR+sBtsI3ToCcByDxqd+aE6rDPRvGBcodU6iA=";
|
hash = "sha256-9ZQjNhmQKMfEJsMMpUBI8C6ebfl9UI4yBt6f331tFXU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-RoVqQaSlIvAb8mWJNOyALjCHejFEfxjJADQfHZ5EiOs=";
|
cargoHash = "sha256-EmASy5AHPECyV0mRQV9wjqdDSfFzfMTiL0Hf3/9gR8g=";
|
||||||
|
|
||||||
cargoBuildFlags = [ "--locked" ];
|
cargoBuildFlags = [ "--locked" ];
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
moonfire-nvr,
|
moonfire-nvr,
|
||||||
darwin,
|
darwin,
|
||||||
nodejs,
|
nodejs,
|
||||||
pnpm,
|
pnpm_9,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -28,9 +28,9 @@ let
|
||||||
sourceRoot = "${src.name}/ui";
|
sourceRoot = "${src.name}/ui";
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
nodejs
|
nodejs
|
||||||
pnpm.configHook
|
pnpm_9.configHook
|
||||||
];
|
];
|
||||||
pnpmDeps = pnpm.fetchDeps {
|
pnpmDeps = pnpm_9.fetchDeps {
|
||||||
inherit (finalAttrs) pname version src;
|
inherit (finalAttrs) pname version src;
|
||||||
sourceRoot = "${finalAttrs.src.name}/ui";
|
sourceRoot = "${finalAttrs.src.name}/ui";
|
||||||
hash = "sha256-7fMhUFlV5lz+A9VG8IdWoc49C2CTdLYQlEgBSBqJvtw=";
|
hash = "sha256-7fMhUFlV5lz+A9VG8IdWoc49C2CTdLYQlEgBSBqJvtw=";
|
||||||
|
|
|
@ -14,16 +14,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "mpris-timer";
|
pname = "mpris-timer";
|
||||||
version = "2.0.3";
|
version = "2.0.5";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "efogdev";
|
owner = "efogdev";
|
||||||
repo = "mpris-timer";
|
repo = "mpris-timer";
|
||||||
tag = version;
|
tag = version;
|
||||||
hash = "sha256-N2F7eTNDHL9ABIq6ExjIj7uhYBkrRXDAeKwy1f4arYE=";
|
hash = "sha256-LNaf+nTQHpHOvUXdNzKexXGa0petWp+26UeLqfmjpZw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-BYOmlV3x+SXMOyAfBktVThG4vog0mWSsIU2caOFYc5A=";
|
vendorHash = "sha256-vCzQiQsljNyI7nBYvq+C/dv0T186Lsj7rOq5xHMs3c0=";
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
nixosTests,
|
nixosTests,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
nodejs,
|
nodejs,
|
||||||
pnpm,
|
pnpm_9,
|
||||||
python3,
|
python3,
|
||||||
node-gyp,
|
node-gyp,
|
||||||
xcbuild,
|
xcbuild,
|
||||||
|
@ -25,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
hash = "sha256-gPdJKVOZlizdS0o+2nBgCImnIhtHzRjE2xk0zJA52go=";
|
hash = "sha256-gPdJKVOZlizdS0o+2nBgCImnIhtHzRjE2xk0zJA52go=";
|
||||||
};
|
};
|
||||||
|
|
||||||
pnpmDeps = pnpm.fetchDeps {
|
pnpmDeps = pnpm_9.fetchDeps {
|
||||||
inherit (finalAttrs) pname version src;
|
inherit (finalAttrs) pname version src;
|
||||||
hash = "sha256-Am9R2rfQiw1IPd22/UraqzEqvVeB5XuSrrLSYXWsWfU=";
|
hash = "sha256-Am9R2rfQiw1IPd22/UraqzEqvVeB5XuSrrLSYXWsWfU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pnpm.configHook
|
pnpm_9.configHook
|
||||||
python3 # required to build sqlite3 bindings
|
python3 # required to build sqlite3 bindings
|
||||||
node-gyp # required to build sqlite3 bindings
|
node-gyp # required to build sqlite3 bindings
|
||||||
makeWrapper
|
makeWrapper
|
||||||
|
|
|
@ -12,16 +12,17 @@
|
||||||
pkg-config,
|
pkg-config,
|
||||||
python3,
|
python3,
|
||||||
tbb_2021_11,
|
tbb_2021_11,
|
||||||
|
buildPackages,
|
||||||
}:
|
}:
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "naja";
|
pname = "naja";
|
||||||
version = "0-unstable-2024-08-27";
|
version = "0-unstable-2025-01-13";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "najaeda";
|
owner = "najaeda";
|
||||||
repo = "naja";
|
repo = "naja";
|
||||||
rev = "ca7a544d16abb31d6992e702ccbd97be3a644c08";
|
rev = "ffc29daa22e02565b2a0a108f8e65236cdee413a";
|
||||||
hash = "sha256-lmgXv2nmmjKph0Tf9ZvV3kQBtbiGXYA7jrE77cgM+KU=";
|
hash = "sha256-XGlgSUHSpHxNrms50pOQ9eoGZ6y79Rbm/sDYW2C4qsg=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -31,17 +32,32 @@ stdenv.mkDerivation {
|
||||||
"dev"
|
"dev"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# disable building tests for cross build
|
||||||
|
postPatch =
|
||||||
|
lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||||
|
substituteInPlace CMakeLists.txt \
|
||||||
|
--replace-fail 'enable_testing()' "" \
|
||||||
|
--replace-fail 'add_subdirectory(test)' ""
|
||||||
|
substituteInPlace thirdparty/yosys-liberty/CMakeLists.txt \
|
||||||
|
--replace-fail 'add_subdirectory(test)' ""
|
||||||
|
''
|
||||||
|
+ lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||||
|
patchShebangs --build test/test_utils/diff_files.py
|
||||||
|
'';
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs =
|
||||||
bison
|
[
|
||||||
capnproto
|
bison
|
||||||
cmake
|
cmake
|
||||||
doxygen
|
doxygen
|
||||||
flex
|
flex
|
||||||
pkg-config
|
pkg-config
|
||||||
python3
|
]
|
||||||
];
|
++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
|
||||||
|
python3 # test scripts
|
||||||
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
boost
|
boost
|
||||||
|
@ -49,15 +65,25 @@ stdenv.mkDerivation {
|
||||||
flex # include dir
|
flex # include dir
|
||||||
libdwarf-lite
|
libdwarf-lite
|
||||||
tbb_2021_11
|
tbb_2021_11
|
||||||
|
python3
|
||||||
];
|
];
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
(lib.cmakeBool "CPPTRACE_USE_EXTERNAL_LIBDWARF" true)
|
(lib.cmakeBool "CPPTRACE_USE_EXTERNAL_LIBDWARF" true)
|
||||||
(lib.cmakeBool "CPPTRACE_USE_EXTERNAL_ZSTD" true)
|
(lib.cmakeBool "CPPTRACE_USE_EXTERNAL_ZSTD" true)
|
||||||
|
# provide correct executables for cross
|
||||||
|
(lib.cmakeFeature "Python3_EXECUTABLE" (lib.getExe python3.pythonOnBuildForHost))
|
||||||
|
# TODO: remove these once capnp cross is fixed properly
|
||||||
|
(lib.cmakeFeature "CAPNP_EXECUTABLE" (lib.getExe' buildPackages.capnproto "capnp"))
|
||||||
|
(lib.cmakeFeature "CAPNPC_CXX_EXECUTABLE" (lib.getExe' buildPackages.capnproto "capnpc-c++"))
|
||||||
];
|
];
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
moveToOutput lib/libnaja_bne.so $lib
|
||||||
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Structural Netlist API (and more) for EDA post synthesis flow development";
|
description = "Structural Netlist API (and more) for EDA post synthesis flow development";
|
||||||
homepage = "https://github.com/najaeda/naja";
|
homepage = "https://github.com/najaeda/naja";
|
||||||
|
|
|
@ -4,25 +4,31 @@
|
||||||
fetchurl,
|
fetchurl,
|
||||||
unzip,
|
unzip,
|
||||||
nix-update-script,
|
nix-update-script,
|
||||||
|
makeBinaryWrapper,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenvNoCC.mkDerivation rec {
|
stdenvNoCC.mkDerivation rec {
|
||||||
pname = "net-news-wire";
|
pname = "net-news-wire";
|
||||||
version = "6.1.8";
|
version = "6.1.9";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/Ranchero-Software/NetNewsWire/releases/download/mac-${version}/NetNewsWire${version}.zip";
|
url = "https://github.com/Ranchero-Software/NetNewsWire/releases/download/mac-${version}/NetNewsWire${version}.zip";
|
||||||
hash = "sha256-/xhy0gF2YHYBVPUAlwySH0/yIelMNeFlU7Ya/ADx1NI=";
|
hash = "sha256-wG1/EpsK1CMXDTM/WlNFBBUVq6IUSj0GEkqY5Azf/ls=";
|
||||||
};
|
};
|
||||||
|
|
||||||
sourceRoot = ".";
|
sourceRoot = ".";
|
||||||
|
|
||||||
nativeBuildInputs = [ unzip ];
|
nativeBuildInputs = [
|
||||||
|
unzip
|
||||||
|
makeBinaryWrapper
|
||||||
|
];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
mkdir -p $out/Applications
|
mkdir -p $out/Applications
|
||||||
cp -R NetNewsWire.app $out/Applications/
|
cp -R NetNewsWire.app $out/Applications/
|
||||||
|
mkdir -p $out/bin
|
||||||
|
makeWrapper $out/Applications/NetNewsWire.app/Contents/MacOS/NetNewsWire $out/bin/net-news-wire
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "nfs-ganesha";
|
pname = "nfs-ganesha";
|
||||||
version = "6.4";
|
version = "6.5";
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
"out"
|
"out"
|
||||||
|
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||||
owner = "nfs-ganesha";
|
owner = "nfs-ganesha";
|
||||||
repo = "nfs-ganesha";
|
repo = "nfs-ganesha";
|
||||||
rev = "V${version}";
|
rev = "V${version}";
|
||||||
hash = "sha256-iT/6p4T4xrGsK2zBs5TDfEIhcCwNfUalQFLlCOODp24=";
|
hash = "sha256-OHGmEzHu8y/TPQ70E2sicaLtNgvlf/bRq8JRs6S1tpY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
preConfigure = "cd src";
|
preConfigure = "cd src";
|
||||||
|
|
|
@ -1,55 +1,49 @@
|
||||||
{
|
{
|
||||||
mkDerivation,
|
|
||||||
lib,
|
lib,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
qmake,
|
qt5,
|
||||||
qttools,
|
|
||||||
qtx11extras,
|
|
||||||
stdenv,
|
stdenv,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
mkDerivation rec {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "notepad-next";
|
pname = "notepad-next";
|
||||||
version = "0.9";
|
version = "0.10";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "dail8859";
|
owner = "dail8859";
|
||||||
repo = "NotepadNext";
|
repo = "NotepadNext";
|
||||||
rev = "v${version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-3BCLPY104zxALd3wFH8e9PitjmFbPcOfKsLqXowXqnY=";
|
hash = "sha256-DpqFu7Nt7l1rmQoJ7aQnFEGPxo8NDrowHxmyLdKIX4A=";
|
||||||
# External dependencies - https://github.com/dail8859/NotepadNext/issues/135
|
# External dependencies - https://github.com/dail8859/NotepadNext/issues/135
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
qmake
|
qt5.qmake
|
||||||
qttools
|
qt5.qttools
|
||||||
|
qt5.wrapQtAppsHook
|
||||||
];
|
];
|
||||||
buildInputs = [ qtx11extras ];
|
buildInputs = [ qt5.qtx11extras ];
|
||||||
|
|
||||||
qmakeFlags = [
|
qmakeFlags = [
|
||||||
"PREFIX=${placeholder "out"}"
|
"PREFIX=${placeholder "out"}"
|
||||||
"src/NotepadNext.pro"
|
"src/NotepadNext.pro"
|
||||||
];
|
];
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
substituteInPlace src/i18n.pri \
|
|
||||||
--replace 'EXTRA_TRANSLATIONS = \' "" \
|
|
||||||
--replace '$$[QT_INSTALL_TRANSLATIONS]/qt_zh_CN.qm' ""
|
|
||||||
'';
|
|
||||||
|
|
||||||
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||||
mv $out/bin $out/Applications
|
mv $out/bin $out/Applications
|
||||||
rm -fr $out/share
|
rm -fr $out/share
|
||||||
|
mkdir -p $out/bin
|
||||||
|
ln -s $out/Applications/NotepadNext.app/Contents/MacOS/NotepadNext $out/bin/NotepadNext
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = {
|
||||||
homepage = "https://github.com/dail8859/NotepadNext";
|
homepage = "https://github.com/dail8859/NotepadNext";
|
||||||
description = "Cross-platform, reimplementation of Notepad++";
|
description = "Cross-platform, reimplementation of Notepad++";
|
||||||
license = licenses.gpl3Plus;
|
license = lib.licenses.gpl3Plus;
|
||||||
platforms = platforms.unix;
|
platforms = lib.platforms.unix;
|
||||||
maintainers = [ maintainers.sebtm ];
|
maintainers = with lib.maintainers; [ sebtm ];
|
||||||
broken = stdenv.hostPlatform.isAarch64;
|
broken = stdenv.hostPlatform.isAarch64;
|
||||||
mainProgram = "NotepadNext";
|
mainProgram = "NotepadNext";
|
||||||
};
|
};
|
||||||
}
|
})
|
|
@ -5,7 +5,7 @@
|
||||||
buildGoModule,
|
buildGoModule,
|
||||||
callPackage,
|
callPackage,
|
||||||
gnumake,
|
gnumake,
|
||||||
pnpm,
|
pnpm_9,
|
||||||
nodejs,
|
nodejs,
|
||||||
ocis,
|
ocis,
|
||||||
}:
|
}:
|
||||||
|
@ -44,10 +44,10 @@ buildGoModule rec {
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
gnumake
|
gnumake
|
||||||
nodejs
|
nodejs
|
||||||
pnpm.configHook
|
pnpm_9.configHook
|
||||||
];
|
];
|
||||||
|
|
||||||
pnpmDeps = pnpm.fetchDeps {
|
pnpmDeps = pnpm_9.fetchDeps {
|
||||||
inherit pname version src;
|
inherit pname version src;
|
||||||
sourceRoot = "${src.name}/services/idp";
|
sourceRoot = "${src.name}/services/idp";
|
||||||
hash = "sha256-gNlN+u/bobnTsXrsOmkDcWs67D/trH3inT5AVQs3Brs=";
|
hash = "sha256-gNlN+u/bobnTsXrsOmkDcWs67D/trH3inT5AVQs3Brs=";
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
lib,
|
lib,
|
||||||
stdenvNoCC,
|
stdenvNoCC,
|
||||||
nodejs,
|
nodejs,
|
||||||
pnpm,
|
pnpm_9,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
}:
|
}:
|
||||||
stdenvNoCC.mkDerivation rec {
|
stdenvNoCC.mkDerivation rec {
|
||||||
|
@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation rec {
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
nodejs
|
nodejs
|
||||||
pnpm.configHook
|
pnpm_9.configHook
|
||||||
];
|
];
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
|
@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation rec {
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
pnpmDeps = pnpm.fetchDeps {
|
pnpmDeps = pnpm_9.fetchDeps {
|
||||||
inherit pname version src;
|
inherit pname version src;
|
||||||
hash = "sha256-3Erva6srdkX1YQ727trx34Ufx524nz19MUyaDQToz6M=";
|
hash = "sha256-3Erva6srdkX1YQ727trx34Ufx524nz19MUyaDQToz6M=";
|
||||||
};
|
};
|
||||||
|
|
|
@ -31,13 +31,13 @@ assert (blas.isILP64 == arpack.isILP64);
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "octopus";
|
pname = "octopus";
|
||||||
version = "14.1";
|
version = "15.1";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "octopus-code";
|
owner = "octopus-code";
|
||||||
repo = "octopus";
|
repo = "octopus";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-8wZR+bYdxJFsUPMWbIGYxRdNzjLgHm+KFLjY7fSN7io=";
|
hash = "sha256-vG1HUkuNUZkhBumoJJy3AyFU6cZOo1YGmaOYcU6bPOM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue