mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-21 22:43:01 +00:00
Merge remote-tracking branch 'origin/master' into staging-next
This commit is contained in:
K900
commit
23b4832da0
13
.github/CODEOWNERS
vendored
13
.github/CODEOWNERS
vendored
@ -14,9 +14,10 @@
|
||||
# CI
|
||||
/.github/workflows @NixOS/Security @Mic92 @zowoq
|
||||
/.github/workflows/check-nix-format.yml @infinisil
|
||||
/ci @infinisil @NixOS/Security
|
||||
/.github/workflows/nixpkgs-vet.yml @infinisil @philiptaron
|
||||
/ci @infinisil @philiptaron @NixOS/Security
|
||||
|
||||
# Develompent support
|
||||
# Development support
|
||||
/.editorconfig @Mic92 @zowoq
|
||||
/shell.nix @infinisil @NixOS/Security
|
||||
|
||||
@ -43,6 +44,7 @@
|
||||
/pkgs/top-level/stage.nix @Ericson2314
|
||||
/pkgs/top-level/splice.nix @Ericson2314
|
||||
/pkgs/top-level/release-cross.nix @Ericson2314
|
||||
/pkgs/top-level/by-name-overlay.nix @infinisil @philiptaron
|
||||
/pkgs/stdenv @philiptaron
|
||||
/pkgs/stdenv/generic @Ericson2314
|
||||
/pkgs/stdenv/generic/check-meta.nix @Ericson2314
|
||||
@ -58,12 +60,6 @@
|
||||
/pkgs/pkgs-lib/formats/libconfig @h7x4
|
||||
/pkgs/pkgs-lib/formats/hocon @h7x4
|
||||
|
||||
# pkgs/by-name
|
||||
/pkgs/test/check-by-name @infinisil
|
||||
/pkgs/by-name/README.md @infinisil
|
||||
/pkgs/top-level/by-name-overlay.nix @infinisil
|
||||
/.github/workflows/check-by-name.yml @infinisil
|
||||
|
||||
# Nixpkgs build-support
|
||||
/pkgs/build-support/writers @lassulus @Profpatsch
|
||||
|
||||
@ -91,6 +87,7 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza
|
||||
/doc/README.md @infinisil
|
||||
/nixos/README.md @infinisil
|
||||
/pkgs/README.md @infinisil
|
||||
/pkgs/by-name/README.md @infinisil
|
||||
/maintainers/README.md @infinisil
|
||||
|
||||
# User-facing development documentation
|
||||
|
||||
2
.github/workflows/check-nix-format.yml
vendored
2
.github/workflows/check-nix-format.yml
vendored
@ -7,7 +7,7 @@ name: Check that Nix files are formatted
|
||||
|
||||
on:
|
||||
pull_request_target:
|
||||
# See the comment at the same location in ./check-by-name.yml
|
||||
# See the comment at the same location in ./nixpkgs-vet.yml
|
||||
types: [opened, synchronize, reopened, edited]
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
@ -1,42 +1,32 @@
|
||||
# Checks pkgs/by-name (see pkgs/by-name/README.md)
|
||||
# using the nixpkgs-check-by-name tool (see https://github.com/NixOS/nixpkgs-check-by-name)
|
||||
#
|
||||
# When you make changes to this workflow, also update pkgs/test/check-by-name/run-local.sh adequately
|
||||
name: Check pkgs/by-name
|
||||
# `nixpkgs-vet` is a tool to vet Nixpkgs: its architecture, package structure, and more.
|
||||
# Among other checks, it makes sure that `pkgs/by-name` (see `../../pkgs/by-name/README.md`) follows the validity rules outlined in [RFC 140](https://github.com/NixOS/rfcs/pull/140).
|
||||
# When you make changes to this workflow, please also update `ci/nixpkgs-vet.sh` to reflect the impact of your work to the CI.
|
||||
# See https://github.com/NixOS/nixpkgs-vet for details on the tool and its checks.
|
||||
name: Vet nixpkgs
|
||||
|
||||
on:
|
||||
# Using pull_request_target instead of pull_request avoids having to approve first time contributors
|
||||
# Using pull_request_target instead of pull_request avoids having to approve first time contributors.
|
||||
pull_request_target:
|
||||
# This workflow depends on the base branch of the PR,
|
||||
# but changing the base branch is not included in the default trigger events,
|
||||
# which would be `opened`, `synchronize` or `reopened`.
|
||||
# Instead it causes an `edited` event, so we need to add it explicitly here
|
||||
# While `edited` is also triggered when the PR title/body is changed,
|
||||
# this PR action is fairly quick, and PR's don't get edited that often,
|
||||
# so it shouldn't be a problem
|
||||
# There is a feature request for adding a `base_changed` event:
|
||||
# https://github.com/orgs/community/discussions/35058
|
||||
# This workflow depends on the base branch of the PR, but changing the base branch is not included in the default trigger events, which would be `opened`, `synchronize` or `reopened`.
|
||||
# Instead it causes an `edited` event, so we need to add it explicitly here.
|
||||
# While `edited` is also triggered when the PR title/body is changed, this PR action is fairly quick, and PRs don't get edited **that** often, so it shouldn't be a problem.
|
||||
# There is a feature request for adding a `base_changed` event: https://github.com/orgs/community/discussions/35058
|
||||
types: [opened, synchronize, reopened, edited]
|
||||
|
||||
permissions: {}
|
||||
|
||||
# We don't use a concurrency group here, because the action is triggered quite often (due to the PR edit
|
||||
# trigger), and contributers would get notified on any canceled run.
|
||||
# There is a feature request for supressing notifications on concurrency-canceled runs:
|
||||
# https://github.com/orgs/community/discussions/13015
|
||||
# We don't use a concurrency group here, because the action is triggered quite often (due to the PR edit trigger), and contributors would get notified on any canceled run.
|
||||
# There is a feature request for suppressing notifications on concurrency-canceled runs: https://github.com/orgs/community/discussions/13015
|
||||
|
||||
jobs:
|
||||
check:
|
||||
name: pkgs-by-name-check
|
||||
# This needs to be x86_64-linux, because we depend on the tooling being pre-built in the GitHub releases
|
||||
name: nixpkgs-vet
|
||||
# This needs to be x86_64-linux, because we depend on the tooling being pre-built in the GitHub releases.
|
||||
runs-on: ubuntu-latest
|
||||
# This should take 1 minute at most, but let's be generous.
|
||||
# The default of 6 hours is definitely too long
|
||||
# This should take 1 minute at most, but let's be generous. The default of 6 hours is definitely too long.
|
||||
timeout-minutes: 10
|
||||
steps:
|
||||
# This step has to be in this file,
|
||||
# because it's needed to determine which revision of the repository to fetch,
|
||||
# and we can only use other files from the repository once it's fetched.
|
||||
# This step has to be in this file, because it's needed to determine which revision of the repository to fetch, and we can only use other files from the repository once it's fetched.
|
||||
- name: Resolving the merge commit
|
||||
env:
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
@ -99,27 +89,28 @@ jobs:
|
||||
if: env.mergedSha
|
||||
- name: Fetching the pinned tool
|
||||
if: env.mergedSha
|
||||
# Update the pinned version using pkgs/test/check-by-name/update-pinned-tool.sh
|
||||
# Update the pinned version using ci/nixpkgs-vet/update-pinned-tool.sh
|
||||
run: |
|
||||
# The pinned version of the tooling to use
|
||||
toolVersion=$(<pkgs/test/check-by-name/pinned-version.txt)
|
||||
# Fetch the x86_64-linux-specific release artifact containing the Gzipped NAR of the pre-built tool
|
||||
toolPath=$(curl -sSfL https://github.com/NixOS/nixpkgs-check-by-name/releases/download/"$toolVersion"/x86_64-linux.nar.gz \
|
||||
# The pinned version of the tooling to use.
|
||||
toolVersion=$(<ci/nixpkgs-vet/pinned-version.txt)
|
||||
|
||||
# Fetch the x86_64-linux-specific release artifact containing the gzipped NAR of the pre-built tool.
|
||||
toolPath=$(curl -sSfL https://github.com/NixOS/nixpkgs-vet/releases/download/"$toolVersion"/x86_64-linux.nar.gz \
|
||||
| gzip -cd | nix-store --import | tail -1)
|
||||
# Adds a result symlink as a GC root
|
||||
|
||||
# Adds a result symlink as a GC root.
|
||||
nix-store --realise "$toolPath" --add-root result
|
||||
- name: Running nixpkgs-check-by-name
|
||||
- name: Running nixpkgs-vet
|
||||
if: env.mergedSha
|
||||
env:
|
||||
# Force terminal colors to be enabled. The library that
|
||||
# nixpkgs-check-by-name uses respects: https://bixense.com/clicolors/
|
||||
# Force terminal colors to be enabled. The library that `nixpkgs-vet` uses respects https://bixense.com/clicolors/
|
||||
CLICOLOR_FORCE: 1
|
||||
run: |
|
||||
if result/bin/nixpkgs-check-by-name --base "$base" .; then
|
||||
if result/bin/nixpkgs-vet --base "$base" .; then
|
||||
exit 0
|
||||
else
|
||||
exitCode=$?
|
||||
echo "To run locally: ./maintainers/scripts/check-by-name.sh $GITHUB_BASE_REF https://github.com/$GITHUB_REPOSITORY.git"
|
||||
echo "If you're having trouble, ping @NixOS/nixpkgs-check-by-name"
|
||||
echo "To run locally: ./ci/nixpkgs-vet.sh $GITHUB_BASE_REF https://github.com/$GITHUB_REPOSITORY.git"
|
||||
echo "If you're having trouble, ping @NixOS/nixpkgs-vet"
|
||||
exit "$exitCode"
|
||||
fi
|
||||
33
ci/README.md
33
ci/README.md
@ -1,7 +1,7 @@
|
||||
# CI support files
|
||||
|
||||
This directory contains files to support CI, such as [GitHub Actions](https://github.com/NixOS/nixpkgs/tree/master/.github/workflows) and [Ofborg](https://github.com/nixos/ofborg).
|
||||
This is in contrast with [`maintainers/scripts`](`../maintainers/scripts`) which is for human use instead.
|
||||
This is in contrast with [`maintainers/scripts`](../maintainers/scripts) which is for human use instead.
|
||||
|
||||
## Pinned Nixpkgs
|
||||
|
||||
@ -10,3 +10,34 @@ In order to ensure that the needed packages are generally available without buil
|
||||
[`pinned-nixpkgs.json`](./pinned-nixpkgs.json) contains a pinned Nixpkgs version tested by Hydra.
|
||||
|
||||
Run [`update-pinned-nixpkgs.sh`](./update-pinned-nixpkgs.sh) to update it.
|
||||
|
||||
## `ci/nixpkgs-vet.sh BASE_BRANCH [REPOSITORY]`
|
||||
|
||||
Runs the [`nixpkgs-vet` tool](https://github.com/NixOS/nixpkgs-vet) on the HEAD commit, closely matching what CI does. This can't do exactly the same as CI, because CI needs to rely on GitHub's server-side Git history to compute the mergeability of PRs before the check can be started.
|
||||
In turn, when contributors are running this tool locally, we don't want to have to push commits to test them, and we can also rely on the local Git history to do the mergeability check.
|
||||
|
||||
Arguments:
|
||||
|
||||
- `BASE_BRANCH`: The base branch to use, e.g. master or release-24.05
|
||||
- `REPOSITORY`: The repository from which to fetch the base branch. Defaults to <https://github.com/NixOS/nixpkgs.git>.
|
||||
|
||||
## `ci/nixpkgs-vet`
|
||||
|
||||
This directory contains scripts and files used and related to [`nixpkgs-vet`](https://github.com/NixOS/nixpkgs-vet/), which the CI uses to implement `pkgs/by-name` checks, along with many other Nixpkgs architecture rules.
|
||||
See also the [CI GitHub Action](../.github/workflows/nixpkgs-vet.yml).
|
||||
|
||||
## `ci/nixpkgs-vet/update-pinned-tool.sh`
|
||||
|
||||
Updates the pinned [`nixpkgs-vet` tool](https://github.com/NixOS/nixpkgs-vet) in [`ci/nixpkgs-vet/pinned-version.txt`](./nixpkgs-vet/pinned-version.txt) to the latest [release](https://github.com/NixOS/nixpkgs-vet/releases).
|
||||
|
||||
Each release contains a pre-built `x86_64-linux` version of the tool which is used by CI.
|
||||
|
||||
This script currently needs to be called manually when the CI tooling needs to be updated.
|
||||
|
||||
Why not just build the tooling right from the PRs Nixpkgs version?
|
||||
|
||||
- Because it allows CI to check all PRs, even if they would break the CI tooling.
|
||||
- Because it makes the CI check very fast, since no Nix builds need to be done, even for mass rebuilds.
|
||||
- Because it improves security, since we don't have to build potentially untrusted code from PRs.
|
||||
The tool only needs a very minimal Nix evaluation at runtime, which can work with [readonly-mode](https://nixos.org/manual/nix/stable/command-ref/opt-common.html#opt-readonly-mode) and [restrict-eval](https://nixos.org/manual/nix/stable/command-ref/conf-file.html#conf-restrict-eval).
|
||||
|
||||
|
||||
@ -61,13 +61,11 @@ trace "Done"
|
||||
trace -n "Merging base branch into the HEAD commit in $tmp/merged.. "
|
||||
git -C "$tmp/merged" merge -q --no-edit "$baseSha"
|
||||
trace -e "\e[34m$(git -C "$tmp/merged" rev-parse HEAD)\e[0m"
|
||||
|
||||
trace -n "Reading pinned nixpkgs-check-by-name version from pinned-version.txt.. "
|
||||
toolVersion=$(<"$tmp/merged/pkgs/test/check-by-name/pinned-version.txt")
|
||||
trace -n "Reading pinned nixpkgs-vet version from pinned-version.txt.. "
|
||||
toolVersion=$(<"$tmp/merged/ci/nixpkgs-vet/pinned-version.txt")
|
||||
trace -e "\e[34m$toolVersion\e[0m"
|
||||
|
||||
trace -n "Building tool.. "
|
||||
nix-build https://github.com/NixOS/nixpkgs-check-by-name/tarball/"$toolVersion" -o "$tmp/tool" -A build
|
||||
|
||||
trace "Running nixpkgs-check-by-name.."
|
||||
"$tmp/tool/bin/nixpkgs-check-by-name" --base "$tmp/base" "$tmp/merged"
|
||||
nix-build https://github.com/NixOS/nixpkgs-vet/tarball/"$toolVersion" -o "$tmp/tool" -A build
|
||||
trace "Running nixpkgs-vet.."
|
||||
"$tmp/tool/bin/nixpkgs-vet" --base "$tmp/base" "$tmp/merged"
|
||||
1
ci/nixpkgs-vet/pinned-version.txt
Normal file
1
ci/nixpkgs-vet/pinned-version.txt
Normal file
@ -0,0 +1 @@
|
||||
0.1.4
|
||||
@ -7,7 +7,7 @@ trace() { echo >&2 "$@"; }
|
||||
|
||||
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
|
||||
|
||||
repository=NixOS/nixpkgs-check-by-name
|
||||
repository=NixOS/nixpkgs-vet
|
||||
pin_file=$SCRIPT_DIR/pinned-version.txt
|
||||
|
||||
trace -n "Fetching latest release of $repository.. "
|
||||
@ -285,7 +285,7 @@ You, as the writer of documentation, are still in charge of its content.
|
||||
- _optional_ attributes have a _`Default:`_ if it's easily described as a value.
|
||||
- _optional_ attributes have a _`Default behavior:`_ if it's not easily described using a value.
|
||||
- Nix types aren't in code spans, because they are not code
|
||||
- Nix types are capitalized, to distinguish them from the camelCase [Module System](#module-system) types, which _are_ code and behave like functions.
|
||||
- Nix types are capitalized, to distinguish them from the camelCase Module System types, which _are_ code and behave like functions.
|
||||
|
||||
#### Examples
|
||||
|
||||
|
||||
@ -721,10 +721,9 @@ lib.mapAttrs mkLicense ({
|
||||
fullName = "ISC License";
|
||||
};
|
||||
|
||||
# Proprietary binaries; free to redistribute without modification.
|
||||
databricks = {
|
||||
fullName = "Databricks Proprietary License";
|
||||
url = "https://pypi.org/project/databricks-connect";
|
||||
fullName = "Databricks License";
|
||||
url = "https://www.databricks.com/legal/db-license";
|
||||
free = false;
|
||||
};
|
||||
|
||||
|
||||
@ -2255,6 +2255,12 @@
|
||||
githubId = 80325;
|
||||
name = "Benjamin Andresen";
|
||||
};
|
||||
banh-canh = {
|
||||
email = "vhvictorhang@gmail.com";
|
||||
github = "Banh-Canh";
|
||||
githubId = 66330398;
|
||||
name = "Victor Hang";
|
||||
};
|
||||
barab-i = {
|
||||
email = "barab_i@outlook.com";
|
||||
github = "barab-i";
|
||||
|
||||
@ -9,10 +9,6 @@ What follows is a (very incomplete) overview of available scripts.
|
||||
|
||||
## Metadata
|
||||
|
||||
### `check-by-name.sh`
|
||||
|
||||
An alias for `pkgs/test/check-by-name/run-local.sh`, see [documentation](../../pkgs/test/check-by-name/README.md).
|
||||
|
||||
### `get-maintainer.sh`
|
||||
|
||||
`get-maintainer.sh [selector] value` returns a JSON object describing
|
||||
|
||||
@ -1 +1 @@
|
||||
../../pkgs/test/check-by-name/run-local.sh
|
||||
../../ci/nixpkgs-vet.sh
|
||||
@ -171,6 +171,9 @@
|
||||
Processes also now run as a dynamically allocated user by default instead of
|
||||
root.
|
||||
|
||||
- The `mautrix-signal` module was adapted to incorporate the configuration rearrangement that resulted from the update to the mautrix bridgev2 architecture. Pre-0.7.0 configurations should continue to work.
|
||||
In case you want to update your configuration make sure to check the NixOS manual.
|
||||
|
||||
- The nvidia driver no longer defaults to the proprietary driver starting with version 560. You will need to manually set `hardware.nvidia.open` to select the proprietary or open driver.
|
||||
|
||||
- `singularity-tools` have the `storeDir` argument removed from its override interface and use `builtins.storeDir` instead.
|
||||
@ -456,6 +459,8 @@
|
||||
|
||||
- `xxd` is now provided by the `tinyxxd` package, rather than `vim.xxd`, to reduce closure size and vulnerability impact. Since it has the same options and semantics as Vim's `xxd` utility, there is no user impact. Vim's `xxd` remains available as the `vim.xxd` package.
|
||||
|
||||
- `prometheus-openldap-exporter` was removed since it was unmaintained upstream and had no nixpkgs maintainers.
|
||||
|
||||
- `restic` module now has an option for inhibiting system sleep while backups are running, defaulting to off (not inhibiting sleep), available as [`services.restic.backups.<name>.inhibitsSleep`](#opt-services.restic.backups._name_.inhibitsSleep).
|
||||
|
||||
- Support for *runner registration tokens* has been [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/380872)
|
||||
|
||||
@ -12,16 +12,16 @@ osc7_cwd() {
|
||||
done
|
||||
printf '\e]7;file://%s%s\e\\' "${HOSTNAME}" "${encoded}"
|
||||
}
|
||||
PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }osc7_cwd
|
||||
PROMPT_COMMAND=${PROMPT_COMMAND:+${PROMPT_COMMAND%;}; }osc7_cwd
|
||||
|
||||
prompt_marker() {
|
||||
printf '\e]133;A\e\\'
|
||||
}
|
||||
PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }prompt_marker
|
||||
PROMPT_COMMAND=${PROMPT_COMMAND:+${PROMPT_COMMAND%;}; }prompt_marker
|
||||
|
||||
PS0+='\e]133;C\e\\'
|
||||
|
||||
command_done() {
|
||||
printf '\e]133;D\e\\'
|
||||
}
|
||||
PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }command_done
|
||||
PROMPT_COMMAND=${PROMPT_COMMAND:+${PROMPT_COMMAND%;}; }command_done
|
||||
|
||||
@ -3,13 +3,39 @@
|
||||
let
|
||||
cfg = config.programs.mouse-actions;
|
||||
in
|
||||
{
|
||||
options.programs.mouse-actions = {
|
||||
enable = lib.mkEnableOption ''
|
||||
mouse-actions udev rules. This is a prerequisite for using mouse-actions without being root
|
||||
{
|
||||
options.programs.mouse-actions = {
|
||||
enable = lib.mkEnableOption "" // {
|
||||
description = ''
|
||||
Whether to install and set up mouse-actions and it's udev rules.
|
||||
|
||||
Note that only users in the "uinput" group will be able to use the package
|
||||
'';
|
||||
};
|
||||
config = lib.mkIf cfg.enable {
|
||||
services.udev.packages = [ pkgs.mouse-actions ];
|
||||
package = lib.mkPackageOption pkgs "mouse-actions" {
|
||||
example = "mouse-actions-gui";
|
||||
};
|
||||
}
|
||||
autorun = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to start a user service to run mouse-actions on startup.
|
||||
'';
|
||||
};
|
||||
};
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
services.udev.packages = [ cfg.package ];
|
||||
systemd.user.services.mouse-actions = lib.mkIf cfg.autorun {
|
||||
description = "mouse-actions launcher";
|
||||
wantedBy = [ "graphical-session.target" ];
|
||||
bindsTo = [ "graphical-session.target" ];
|
||||
after = [ "graphical-session.target" ];
|
||||
environment.PATH = lib.mkForce null; # don't use the default PATH provided by NixOS
|
||||
serviceConfig = {
|
||||
ExecStart = "${lib.getExe cfg.package} start";
|
||||
PassEnvironment = "PATH"; # inherit PATH from user environment
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -275,7 +275,7 @@ in
|
||||
"--create=${mkSavePath cfg.saveName}"
|
||||
(lib.optionalString (cfg.mods != []) "--mod-directory=${modDir}")
|
||||
])
|
||||
+ (lib.optionalString (cfg.extraSettingsFile != null) ("\necho ${lib.strings.lib.escapeShellArg serverSettingsString}"
|
||||
+ (lib.optionalString (cfg.extraSettingsFile != null) ("\necho ${lib.strings.escapeShellArg serverSettingsString}"
|
||||
+ " \"$(cat ${cfg.extraSettingsFile})\" | ${lib.getExe pkgs.jq} -s add"
|
||||
+ " > ${stateDir}/server-settings.json"));
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@ let
|
||||
tuple = ts: lib.mkOptionType {
|
||||
name = "tuple";
|
||||
merge = lib.mergeOneOption;
|
||||
check = xs: lib.all lib.id (zipListsWith (t: x: t.check x) ts xs);
|
||||
check = xs: lib.all lib.id (lib.zipListsWith (t: x: t.check x) ts xs);
|
||||
description = "tuple of" + lib.concatMapStrings (t: " (${t.description})") ts;
|
||||
};
|
||||
level = ints.unsigned;
|
||||
|
||||
32
nixos/modules/services/matrix/mautrix-signal.md
Normal file
32
nixos/modules/services/matrix/mautrix-signal.md
Normal file
@ -0,0 +1,32 @@
|
||||
# Mautrix-Signal {#module-services-mautrix-signal}
|
||||
|
||||
[Mautrix-Signal](https://github.com/mautrix/signal) is a Matrix-Signal puppeting bridge.
|
||||
|
||||
## Configuration {#module-services-mautrix-signal-configuration}
|
||||
|
||||
1. Set [](#opt-services.mautrix-signal.enable) to `true`. The service will use
|
||||
SQLite by default.
|
||||
2. To create your configuration check the default configuration for
|
||||
[](#opt-services.mautrix-signal.settings). To obtain the complete default
|
||||
configuration, run
|
||||
`nix-shell -p mautrix-signal --run "mautrix-signal -c default.yaml -e"`.
|
||||
|
||||
::: {.warning}
|
||||
Mautrix-Signal allows for some options like `encryption.pickle_key`,
|
||||
`provisioning.shared_secret`, allow the value `generate` to be set.
|
||||
Since the configuration file is regenerated on every start of the
|
||||
service, the generated values would be discarded and might break your
|
||||
installation. Instead, set those values via
|
||||
[](#opt-services.mautrix-signal.environmentFile).
|
||||
:::
|
||||
|
||||
## Migrating from an older configuration {#module-services-mautrix-signal-migrate-configuration}
|
||||
|
||||
With Mautrix-Signal v0.7.0 the configuration has been rearranged. Mautrix-Signal
|
||||
performs an automatic configuration migration so your pre-0.7.0 configuration
|
||||
should just continue to work.
|
||||
|
||||
In case you want to update your NixOS configuration, compare the migrated configuration
|
||||
at `/var/lib/mautrix-signal/config.yaml` with the default configuration
|
||||
(`nix-shell -p mautrix-signal --run "mautrix-signal -c example.yaml -e"`) and
|
||||
update your module configuration accordingly.
|
||||
@ -1,7 +1,8 @@
|
||||
{ lib
|
||||
, config
|
||||
, pkgs
|
||||
, ...
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.services.mautrix-signal;
|
||||
@ -16,12 +17,22 @@ let
|
||||
optOneOf = lib.lists.findFirst (value: value.condition) (lib.mkIf false null);
|
||||
mkDefaults = lib.mapAttrsRecursive (n: v: lib.mkDefault v);
|
||||
defaultConfig = {
|
||||
network = {
|
||||
displayname_template = "{{or .ProfileName .PhoneNumber \"Unknown user\"}}";
|
||||
};
|
||||
bridge = {
|
||||
command_prefix = "!signal";
|
||||
relay.enabled = true;
|
||||
permissions."*" = "relay";
|
||||
};
|
||||
database = {
|
||||
type = "sqlite3";
|
||||
uri = "file:${dataDir}/mautrix-signal.db?_txlock=immediate";
|
||||
};
|
||||
homeserver.address = "http://localhost:8448";
|
||||
appservice = {
|
||||
hostname = "[::]";
|
||||
port = appservicePort;
|
||||
database.type = "sqlite3";
|
||||
database.uri = "file:${dataDir}/mautrix-signal.db?_txlock=immediate";
|
||||
id = "signal";
|
||||
bot = {
|
||||
username = "signalbot";
|
||||
@ -29,16 +40,19 @@ let
|
||||
};
|
||||
as_token = "";
|
||||
hs_token = "";
|
||||
};
|
||||
bridge = {
|
||||
username_template = "signal_{{.}}";
|
||||
displayname_template = "{{or .ProfileName .PhoneNumber \"Unknown user\"}}";
|
||||
double_puppet_server_map = { };
|
||||
login_shared_secret_map = { };
|
||||
command_prefix = "!signal";
|
||||
permissions."*" = "relay";
|
||||
relay.enabled = true;
|
||||
};
|
||||
double_puppet = {
|
||||
servers = { };
|
||||
secrets = { };
|
||||
};
|
||||
# By default, the following keys/secrets are set to `generate`. This would break when the service
|
||||
# is restarted, since the previously generated configuration will be overwritten everytime.
|
||||
# If encryption is enabled, it's recommended to set those keys via `environmentFile`.
|
||||
encryption.pickle_key = "";
|
||||
provisioning.shared_secret = "";
|
||||
public_media.signing_key = "";
|
||||
direct_media.server_key = "";
|
||||
logging = {
|
||||
min_level = "info";
|
||||
writers = lib.singleton {
|
||||
@ -60,38 +74,42 @@ in
|
||||
default = defaultConfig;
|
||||
description = ''
|
||||
{file}`config.yaml` configuration as a Nix attribute set.
|
||||
Configuration options should match those described in
|
||||
[example-config.yaml](https://github.com/mautrix/signal/blob/master/example-config.yaml).
|
||||
Configuration options should match those described in the example configuration.
|
||||
Get an example configuration by executing `mautrix-signal -c example.yaml --generate-example-config`
|
||||
Secret tokens should be specified using {option}`environmentFile`
|
||||
instead of this world-readable attribute set.
|
||||
'';
|
||||
example = {
|
||||
appservice = {
|
||||
database = {
|
||||
type = "postgres";
|
||||
uri = "postgresql:///mautrix_signal?host=/run/postgresql";
|
||||
};
|
||||
id = "signal";
|
||||
ephemeral_events = false;
|
||||
};
|
||||
bridge = {
|
||||
history_sync = {
|
||||
request_full_sync = true;
|
||||
};
|
||||
private_chat_portal_meta = true;
|
||||
mute_bridging = true;
|
||||
encryption = {
|
||||
allow = true;
|
||||
default = true;
|
||||
require = true;
|
||||
};
|
||||
provisioning = {
|
||||
shared_secret = "disable";
|
||||
};
|
||||
mute_only_on_create = false;
|
||||
permissions = {
|
||||
"example.com" = "user";
|
||||
};
|
||||
};
|
||||
database = {
|
||||
type = "postgres";
|
||||
uri = "postgresql:///mautrix_signal?host=/run/postgresql";
|
||||
};
|
||||
homeserver = {
|
||||
address = "http://[::1]:8008";
|
||||
domain = "my-domain.tld";
|
||||
};
|
||||
appservice = {
|
||||
id = "signal";
|
||||
ephemeral_events = false;
|
||||
};
|
||||
matrix.message_status_events = true;
|
||||
provisioning = {
|
||||
shared_secret = "disable";
|
||||
};
|
||||
backfill.enabled = true;
|
||||
encryption = {
|
||||
allow = true;
|
||||
default = true;
|
||||
require = true;
|
||||
pickle_key = "$ENCRYPTION_PICKLE_KEY";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -102,16 +120,15 @@ in
|
||||
File containing environment variables to be passed to the mautrix-signal service.
|
||||
If an environment variable `MAUTRIX_SIGNAL_BRIDGE_LOGIN_SHARED_SECRET` is set,
|
||||
then its value will be used in the configuration file for the option
|
||||
`login_shared_secret_map` without leaking it to the store, using the configured
|
||||
`double_puppet.secrets` without leaking it to the store, using the configured
|
||||
`homeserver.domain` as key.
|
||||
See [here](https://github.com/mautrix/signal/blob/main/example-config.yaml)
|
||||
for the documentation of `login_shared_secret_map`.
|
||||
'';
|
||||
};
|
||||
|
||||
serviceDependencies = lib.mkOption {
|
||||
type = with lib.types; listOf str;
|
||||
default = (lib.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit)
|
||||
default =
|
||||
(lib.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit)
|
||||
++ (lib.optional config.services.matrix-conduit.enable "conduit.service");
|
||||
defaultText = lib.literalExpression ''
|
||||
(optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit)
|
||||
@ -154,15 +171,18 @@ in
|
||||
};
|
||||
|
||||
# Note: this is defined here to avoid the docs depending on `config`
|
||||
services.mautrix-signal.settings.homeserver = optOneOf (with config.services; [
|
||||
(lib.mkIf matrix-synapse.enable (mkDefaults {
|
||||
domain = matrix-synapse.settings.server_name;
|
||||
}))
|
||||
(lib.mkIf matrix-conduit.enable (mkDefaults {
|
||||
domain = matrix-conduit.settings.global.server_name;
|
||||
address = "http://localhost:${toString matrix-conduit.settings.global.port}";
|
||||
}))
|
||||
]);
|
||||
services.mautrix-signal.settings.homeserver = optOneOf (
|
||||
with config.services;
|
||||
[
|
||||
(lib.mkIf matrix-synapse.enable (mkDefaults {
|
||||
domain = matrix-synapse.settings.server_name;
|
||||
}))
|
||||
(lib.mkIf matrix-conduit.enable (mkDefaults {
|
||||
domain = matrix-conduit.settings.global.server_name;
|
||||
address = "http://localhost:${toString matrix-conduit.settings.global.port}";
|
||||
}))
|
||||
]
|
||||
);
|
||||
|
||||
systemd.services.mautrix-signal = {
|
||||
description = "mautrix-signal, a Matrix-Signal puppeting bridge.";
|
||||
@ -201,7 +221,7 @@ in
|
||||
${pkgs.yq}/bin/yq -s '.[0].appservice.as_token = .[1].as_token
|
||||
| .[0].appservice.hs_token = .[1].hs_token
|
||||
| .[0]
|
||||
| if env.MAUTRIX_SIGNAL_BRIDGE_LOGIN_SHARED_SECRET then .bridge.login_shared_secret_map.[.homeserver.domain] = env.MAUTRIX_SIGNAL_BRIDGE_LOGIN_SHARED_SECRET else . end' \
|
||||
| if env.MAUTRIX_SIGNAL_BRIDGE_LOGIN_SHARED_SECRET then .double_puppet.secrets.[.homeserver.domain] = env.MAUTRIX_SIGNAL_BRIDGE_LOGIN_SHARED_SECRET else . end' \
|
||||
'${settingsFile}' '${registrationFile}' > '${settingsFile}.tmp'
|
||||
mv '${settingsFile}.tmp' '${settingsFile}'
|
||||
umask $old_umask
|
||||
@ -240,10 +260,17 @@ in
|
||||
SystemCallErrorNumber = "EPERM";
|
||||
SystemCallFilter = [ "@system-service" ];
|
||||
Type = "simple";
|
||||
UMask = 0027;
|
||||
UMask = 27;
|
||||
};
|
||||
restartTriggers = [ settingsFileUnsubstituted ];
|
||||
};
|
||||
};
|
||||
meta.maintainers = with lib.maintainers; [ niklaskorz ];
|
||||
meta = {
|
||||
buildDocsInSandbox = false;
|
||||
doc = ./mautrix-signal.md;
|
||||
maintainers = with lib.maintainers; [
|
||||
niklaskorz
|
||||
frederictobiasc
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@ -23,7 +23,7 @@ let
|
||||
example = "LABEL=MyBulkDataDrive";
|
||||
};
|
||||
options.hashTableSizeMB = lib.mkOption {
|
||||
type = lib.types.addCheck lib.types.int (n: mod n 16 == 0);
|
||||
type = lib.types.addCheck lib.types.int (n: lib.mod n 16 == 0);
|
||||
default = 1024; # 1GB; default from upstream beesd script
|
||||
description = ''
|
||||
Hash table size in MB; must be a multiple of 16.
|
||||
|
||||
@ -63,7 +63,6 @@ let
|
||||
"nginxlog"
|
||||
"node"
|
||||
"nut"
|
||||
"openldap"
|
||||
"pgbouncer"
|
||||
"php-fpm"
|
||||
"pihole"
|
||||
|
||||
@ -1,66 +0,0 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
cfg = config.services.prometheus.exporters.openldap;
|
||||
inherit (lib) mkOption types concatStringsSep;
|
||||
in {
|
||||
port = 9330;
|
||||
extraOpts = {
|
||||
ldapCredentialFile = mkOption {
|
||||
type = types.path;
|
||||
example = "/run/keys/ldap_pass";
|
||||
description = ''
|
||||
Environment file to contain the credentials to authenticate against
|
||||
`openldap`.
|
||||
|
||||
The file should look like this:
|
||||
```
|
||||
---
|
||||
ldapUser: "cn=monitoring,cn=Monitor"
|
||||
ldapPass: "secret"
|
||||
```
|
||||
'';
|
||||
};
|
||||
protocol = mkOption {
|
||||
default = "tcp";
|
||||
example = "udp";
|
||||
type = types.str;
|
||||
description = ''
|
||||
Which protocol to use to connect against `openldap`.
|
||||
'';
|
||||
};
|
||||
ldapAddr = mkOption {
|
||||
default = "localhost:389";
|
||||
type = types.str;
|
||||
description = ''
|
||||
Address of the `openldap`-instance.
|
||||
'';
|
||||
};
|
||||
metricsPath = mkOption {
|
||||
default = "/metrics";
|
||||
type = types.str;
|
||||
description = ''
|
||||
URL path where metrics should be exposed.
|
||||
'';
|
||||
};
|
||||
interval = mkOption {
|
||||
default = "30s";
|
||||
type = types.str;
|
||||
example = "1m";
|
||||
description = ''
|
||||
Scrape interval of the exporter.
|
||||
'';
|
||||
};
|
||||
};
|
||||
serviceOpts.serviceConfig = {
|
||||
ExecStart = ''
|
||||
${pkgs.prometheus-openldap-exporter}/bin/openldap_exporter \
|
||||
--promAddr ${cfg.listenAddress}:${toString cfg.port} \
|
||||
--metrPath ${cfg.metricsPath} \
|
||||
--ldapNet ${cfg.protocol} \
|
||||
--interval ${cfg.interval} \
|
||||
--config ${cfg.ldapCredentialFile} \
|
||||
${concatStringsSep " \\\n " cfg.extraFlags}
|
||||
'';
|
||||
};
|
||||
}
|
||||
@ -1,5 +0,0 @@
|
||||
let self = {
|
||||
"16.09" = "https://nixos.blob.core.windows.net/images/nixos-image-16.09.1694.019dcc3-x86_64-linux.vhd";
|
||||
|
||||
latest = self."16.09";
|
||||
}; in self
|
||||
@ -929,66 +929,6 @@ let
|
||||
'';
|
||||
};
|
||||
|
||||
openldap = {
|
||||
exporterConfig = {
|
||||
enable = true;
|
||||
ldapCredentialFile = "${pkgs.writeText "exporter.yml" ''
|
||||
ldapUser: "cn=root,dc=example"
|
||||
ldapPass: "notapassword"
|
||||
''}";
|
||||
};
|
||||
metricProvider = {
|
||||
services.openldap = {
|
||||
enable = true;
|
||||
settings.children = {
|
||||
"cn=schema".includes = [
|
||||
"${pkgs.openldap}/etc/schema/core.ldif"
|
||||
"${pkgs.openldap}/etc/schema/cosine.ldif"
|
||||
"${pkgs.openldap}/etc/schema/inetorgperson.ldif"
|
||||
"${pkgs.openldap}/etc/schema/nis.ldif"
|
||||
];
|
||||
"olcDatabase={1}mdb" = {
|
||||
attrs = {
|
||||
objectClass = [ "olcDatabaseConfig" "olcMdbConfig" ];
|
||||
olcDatabase = "{1}mdb";
|
||||
olcDbDirectory = "/var/lib/openldap/db";
|
||||
olcSuffix = "dc=example";
|
||||
olcRootDN = {
|
||||
# cn=root,dc=example
|
||||
base64 = "Y249cm9vdCxkYz1leGFtcGxl";
|
||||
};
|
||||
olcRootPW = {
|
||||
path = "${pkgs.writeText "rootpw" "notapassword"}";
|
||||
};
|
||||
};
|
||||
};
|
||||
"olcDatabase={2}monitor".attrs = {
|
||||
objectClass = [ "olcDatabaseConfig" ];
|
||||
olcDatabase = "{2}monitor";
|
||||
olcAccess = [ "to dn.subtree=cn=monitor by users read" ];
|
||||
};
|
||||
};
|
||||
declarativeContents."dc=example" = ''
|
||||
dn: dc=example
|
||||
objectClass: domain
|
||||
dc: example
|
||||
|
||||
dn: ou=users,dc=example
|
||||
objectClass: organizationalUnit
|
||||
ou: users
|
||||
'';
|
||||
};
|
||||
};
|
||||
exporterTest = ''
|
||||
wait_for_unit("prometheus-openldap-exporter.service")
|
||||
wait_for_open_port(389)
|
||||
wait_for_open_port(9330)
|
||||
wait_until_succeeds(
|
||||
"curl -sSf http://localhost:9330/metrics | grep 'openldap_scrape{result=\"ok\"} 1'"
|
||||
)
|
||||
'';
|
||||
};
|
||||
|
||||
pgbouncer = {
|
||||
exporterConfig = {
|
||||
enable = true;
|
||||
|
||||
@ -689,7 +689,7 @@ Here are examples of package tests:
|
||||
- [Lobster compile test](development/compilers/lobster/test-can-run-hello-world.nix)
|
||||
- [Spacy annotation test](development/python-modules/spacy/annotation-test/default.nix)
|
||||
- [Libtorch test](development/libraries/science/math/libtorch/test/default.nix)
|
||||
- [Multiple tests for nanopb](development/libraries/nanopb/default.nix)
|
||||
- [Multiple tests for nanopb](./by-name/na/nanopb/package.nix)
|
||||
|
||||
### Linking NixOS module tests to a package
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@ index a572ed55dd..3dd6c2fda6 100644
|
||||
lxvst_path = "/usr/local/lib64/lxvst:/usr/local/lib/lxvst:/usr/lib64/lxvst:/usr/lib/lxvst:"
|
||||
"/usr/local/lib64/linux_vst:/usr/local/lib/linux_vst:/usr/lib64/linux_vst:/usr/lib/linux_vst:"
|
||||
- "/usr/lib/vst:/usr/local/lib/vst";
|
||||
+ "/usr/lib/vst:/usr/local/lib/vst:"
|
||||
+ "/usr/lib/vst:/usr/local/lib/vst:$HOME/.nix-profile/lib/vst:"
|
||||
+ "$HOME/.lxvst:$HOME/.nix-profile/lib/lxvst:/run/current-system/sw/lib/lxvst:/etc/profiles/per-user/$USER/lib/lxvst";
|
||||
}
|
||||
|
||||
|
||||
@ -1,17 +1,19 @@
|
||||
{ fetchurl, lib, stdenv, pkg-config, libao, json_c, libgcrypt, ffmpeg, curl }:
|
||||
{ fetchFromGitHub, lib, stdenv, pkg-config, libao, json_c, libgcrypt, ffmpeg_7, curl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pianobar";
|
||||
version = "2022.04.01";
|
||||
version = "2022.04.01-unstable-2024-08-16";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://6xq.net/projects/pianobar/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-FnCyiGWouCpXu23+p/FuL6QUXS81SRC7FzgLMsm5R2M=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "PromyLOPh";
|
||||
repo = "pianobar";
|
||||
rev = "41ac06c8585dc535c4b1737b4c2943bb3fe7beb0";
|
||||
hash = "sha256-5LTZ6J9bvfsnpD/bGuojekutFVdH9feWLF+nLFvkeOA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
libao json_c libgcrypt ffmpeg curl
|
||||
libao json_c libgcrypt ffmpeg_7 curl
|
||||
];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
@ -28,13 +28,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "reaper";
|
||||
version = "7.20";
|
||||
version = "7.22";
|
||||
|
||||
src = fetchurl {
|
||||
url = url_for_platform version stdenv.hostPlatform.qemuArch;
|
||||
hash = if stdenv.isDarwin then "sha256-RtGGGbiEEPXYUqK5qpKcCEfIwhlP7/0bAOPMCG7tqZw=" else {
|
||||
x86_64-linux = "sha256-/6Ee8YCHM9nJhyelEfH62jhkbDwypKXljM305mWY2io=";
|
||||
aarch64-linux = "sha256-YnKlONKCmXeV19oREJnXD5t3nEQZ5hVOOvDPtUIFw1A=";
|
||||
hash = if stdenv.isDarwin then "sha256-dIRZCUIfqnGTxBaLzczwzD6hA/PyAxPqfa+FfCRKdu0=" else {
|
||||
x86_64-linux = "sha256-aa2KcL8yZYG+Dki7J6U473E2BQgdACAIzRLtD9zuHV0=";
|
||||
aarch64-linux = "sha256-NECEEUKtTQajl0MZK8/NsbhcuyihHOo0Q5Y5UpAAgrM=";
|
||||
}.${stdenv.hostPlatform.system};
|
||||
};
|
||||
|
||||
|
||||
@ -0,0 +1,43 @@
|
||||
diff -Naur cask-source-0.9.0-old/bin/cask cask-source-0.9.0-new/bin/cask
|
||||
--- cask-source-0.9.0-old/bin/cask 1969-12-31 21:00:01.000000000 -0300
|
||||
+++ cask-source-0.9.0-new/bin/cask 2024-09-02 12:46:48.316364621 -0300
|
||||
@@ -21,8 +21,6 @@
|
||||
set -euo pipefail
|
||||
CASK=$0
|
||||
EMACS=${CASK_EMACS:-${EMACS:-emacs}}
|
||||
-READLINK=${READLINK:-readlink}
|
||||
-GREADLINK=${GREADLINK:-greadlink}
|
||||
|
||||
if [ "$#" -eq "0" ] ; then
|
||||
subcommand=install
|
||||
@@ -31,21 +29,10 @@
|
||||
shift
|
||||
fi
|
||||
|
||||
-set +eu
|
||||
-SRCDIR__=$($READLINK -f "$CASK" 2>/dev/null)
|
||||
-if [ -z "$SRCDIR__" ] ; then
|
||||
- SRCDIR__=$($GREADLINK -f "$CASK" 2>/dev/null)
|
||||
-fi
|
||||
-set -eu
|
||||
-if [ -z "$SRCDIR__" ]; then
|
||||
- SRCDIR__=$(python -c "import os, sys; print(os.path.realpath(sys.argv[1]))" "$CASK")
|
||||
-fi
|
||||
-SRCDIR_=$(dirname "$SRCDIR__")
|
||||
-SRCDIR=$(dirname "$SRCDIR_")
|
||||
case $subcommand in
|
||||
emacs)
|
||||
EMACS="$EMACS" \
|
||||
- "$EMACS" -Q -L "$SRCDIR" -l "$SRCDIR/cask" \
|
||||
+ "$EMACS" -Q -L "@lispdir@" -l "@lispdir@/cask" \
|
||||
--eval "(cask--initialize (expand-file-name default-directory))" \
|
||||
"$@"
|
||||
;;
|
||||
@@ -53,6 +40,6 @@
|
||||
EMACSLOADPATH="$($CASK load-path)" PATH="$($CASK path)" EMACS="$EMACS" "$@"
|
||||
;;
|
||||
*)
|
||||
- "$EMACS" -Q --script "$SRCDIR/cask-cli.el" -- $subcommand "$@"
|
||||
+ "$EMACS" -Q --script "@lispdir@/cask-cli.el" -- $subcommand "$@"
|
||||
;;
|
||||
esac
|
||||
@ -1,77 +1,80 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, bash
|
||||
, emacs
|
||||
, python3
|
||||
{
|
||||
lib,
|
||||
ansi,
|
||||
cl-generic,
|
||||
cl-lib,
|
||||
commander,
|
||||
|
||||
epl,
|
||||
f,
|
||||
fetchFromGitHub,
|
||||
git,
|
||||
gitUpdater,
|
||||
melpaBuild,
|
||||
package-build,
|
||||
s,
|
||||
shut-up,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
melpaBuild (finalAttrs: {
|
||||
pname = "cask";
|
||||
version = "0.8.8";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "cask-source-${finalAttrs.version}";
|
||||
owner = "cask";
|
||||
repo = "cask";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-TlReq5sLVJj+pXmJSnepKQkNEWVhnh30iq4egM1HJMU=";
|
||||
hash = "sha256-91rJFsp2SLk/JY+v6G5JmXH5bg9QnT+qhI8ccNJlI4A=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
patches = [
|
||||
# Uses LISPDIR substitution var
|
||||
./0000-cask-lispdir.diff
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ emacs ];
|
||||
buildInputs = [
|
||||
bash
|
||||
python3
|
||||
]
|
||||
++ (with emacs.pkgs; [
|
||||
packageRequires = [
|
||||
ansi
|
||||
dash
|
||||
ecukes
|
||||
el-mock
|
||||
ert-async
|
||||
ert-runner
|
||||
cl-generic
|
||||
cl-lib
|
||||
commander
|
||||
epl
|
||||
f
|
||||
git
|
||||
noflet
|
||||
package-build
|
||||
s
|
||||
servant
|
||||
shell-split-string
|
||||
]);
|
||||
shut-up
|
||||
];
|
||||
|
||||
ignoreCompilationError = false;
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
emacs --batch -L . -f batch-byte-compile cask.el cask-cli.el
|
||||
|
||||
runHook postBuild
|
||||
# use melpaVersion so that it works for unstable releases too
|
||||
postPatch = ''
|
||||
lispdir=$out/share/emacs/site-lisp/elpa/cask-${finalAttrs.melpaVersion} \
|
||||
substituteAllInPlace bin/cask
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
install -Dm444 -t $out/share/emacs/site-lisp/cask *.el *.elc
|
||||
install -Dm555 -t $out/share/emacs/site-lisp/cask/bin bin/cask
|
||||
ln -s $out/share/emacs/site-lisp/cask/bin/cask $out/bin/cask
|
||||
|
||||
runHook postInstall
|
||||
# TODO: use installBin as soon as installBin arrives Master branch
|
||||
postInstall = ''
|
||||
install -D -t $out/bin bin/cask
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
passthru.updateScript = gitUpdater {
|
||||
rev-prefix = "v";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/cask/cask";
|
||||
description = "Project management for Emacs";
|
||||
mainProgram = "cask";
|
||||
longDescription = ''
|
||||
Cask is a project management tool for Emacs that helps automate the
|
||||
package development cycle; development, dependencies, testing, building,
|
||||
packaging and more.
|
||||
'';
|
||||
homepage = "https://cask.readthedocs.io/en/latest/index.html";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
inherit (emacs.meta) platforms;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
mainProgram = "cask";
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
};
|
||||
})
|
||||
|
||||
@ -3,34 +3,27 @@
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, stdenv
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "glow";
|
||||
version = "1.5.1";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = "glow";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-12UziCf3BO1z+W02slNCCvXhIkvZuVgXk++BdHG3gDI=";
|
||||
hash = "sha256-gPy3MnQHmBJl06oVOpwQB4qIpJ10kUNMNMPkpsIujeI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xxFC87t12bZKea9Snscul+xx8IGFAcoIr9Z8wxHL7nM=";
|
||||
vendorHash = "sha256-vxw8yqY6MxIIWeSX1D+unb0VbBmIpz1431N7UNORJP0=";
|
||||
|
||||
# Remove whenever a release with it is available
|
||||
patches = [(fetchpatch {
|
||||
url = "https://github.com/charmbracelet/glow/commit/f0734709f0be19a34e648caaf63340938a50caa2.patch";
|
||||
name = "go-1-17-patch";
|
||||
hash = "sha256-vpMiVb/7SFT9xcSpVGQriEjkexh1F/ljpfpIswdBx2Y=";
|
||||
})];
|
||||
|
||||
doCheck = false;
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
doCheck = false;
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd glow \
|
||||
--bash <($out/bin/glow completion bash) \
|
||||
|
||||
@ -3367,8 +3367,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "datawrangler";
|
||||
publisher = "ms-toolsai";
|
||||
version = "0.29.6";
|
||||
hash = "sha256-9MR2+hb9YdjIGDfUkdLW41HOxhjeS/San49C8QRZ/YY=";
|
||||
version = "1.7.2";
|
||||
hash = "sha256-3UK87MhDBCT4La8jRgmkRJJQPZbgvOu0+VBea7ho9hs=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
, withQuartz ? stdenv.isDarwin, ApplicationServices
|
||||
, withRandr ? stdenv.isLinux, libxcb
|
||||
, withDrm ? stdenv.isLinux, libdrm
|
||||
, withVidmode ? stdenv.isLinux, libXxf86vm
|
||||
|
||||
, withGeolocation ? true
|
||||
, withCoreLocation ? withGeolocation && stdenv.isDarwin, CoreLocation, Foundation, Cocoa
|
||||
@ -45,6 +46,7 @@ let
|
||||
"--enable-randr=${if withRandr then "yes" else "no"}"
|
||||
"--enable-geoclue2=${if withGeoclue then "yes" else "no"}"
|
||||
"--enable-drm=${if withDrm then "yes" else "no"}"
|
||||
"--enable-vidmode=${if withVidmode then "yes" else "no"}"
|
||||
"--enable-quartz=${if withQuartz then "yes" else "no"}"
|
||||
"--enable-corelocation=${if withCoreLocation then "yes" else "no"}"
|
||||
] ++ lib.optionals (pname == "gammastep") [
|
||||
@ -57,6 +59,7 @@ let
|
||||
] ++ lib.optional withRandr libxcb
|
||||
++ lib.optional withGeoclue geoclue
|
||||
++ lib.optional withDrm libdrm
|
||||
++ lib.optional withVidmode libXxf86vm
|
||||
++ lib.optional withQuartz ApplicationServices
|
||||
++ lib.optionals withCoreLocation [ CoreLocation Foundation Cocoa ]
|
||||
++ lib.optional withAppIndicator (if (pname != "gammastep")
|
||||
|
||||
@ -20,7 +20,7 @@ target_version = sys.argv[1] if len(sys.argv) == 2 else None
|
||||
|
||||
for entry in feed.entries:
|
||||
url = requests.get(entry.link).url.split('?')[0]
|
||||
if entry.title != 'Stable Channel Update for Desktop':
|
||||
if entry.title.lower() != 'Stable Channel Update for Desktop'.lower():
|
||||
if target_version and entry.title == '':
|
||||
# Workaround for a special case (Chrome Releases bug?):
|
||||
if not 'the-stable-channel-has-been-updated-to' in url:
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{
|
||||
stable = {
|
||||
chromedriver = {
|
||||
hash_darwin = "sha256-tC2BZmjKeYjBfwJINtgVQEJjiqJidVtnXdxigFkR2/M=";
|
||||
hash_darwin = "sha256-jqBrEpqHRjpxi7sp/dSzQFzROS21bPTfwvco/UzKMug=";
|
||||
hash_darwin_aarch64 =
|
||||
"sha256-MRXiiQPY8EZ85zRCmJyxuI7SG5RbalBBg+vt0goeWus=";
|
||||
hash_linux = "sha256-rQ/WYDghBXewFqMTGf7ZJGp2mMiPwjf8ImNyTvXulQU=";
|
||||
version = "128.0.6613.86";
|
||||
"sha256-7T9uargLSXs4uqBmS00eUNvhYiA42UC7DPTkTI2sM8U=";
|
||||
hash_linux = "sha256-Li4f3+zZl2HCbxwIyLpylRJ1PMRbV3LKW7dBEnKyIdo=";
|
||||
version = "128.0.6613.119";
|
||||
};
|
||||
deps = {
|
||||
gn = {
|
||||
@ -15,8 +15,8 @@
|
||||
version = "2024-06-11";
|
||||
};
|
||||
};
|
||||
hash = "sha256-wqhaK1VuE1qPLt+f/x2KrtwZGxKFluTOWYMau+cSl2E=";
|
||||
version = "128.0.6613.113";
|
||||
hash = "sha256-WCemrL5jPRn5P1olLwfrAM1xLc0hcaBYDj0CZPoPucU=";
|
||||
version = "128.0.6613.119";
|
||||
};
|
||||
ungoogled-chromium = {
|
||||
deps = {
|
||||
@ -27,11 +27,11 @@
|
||||
version = "2024-06-11";
|
||||
};
|
||||
ungoogled-patches = {
|
||||
hash = "sha256-2P9c+zS741H4/jTp92mno4egju9r0tGTLkXHAFhM9mA=";
|
||||
rev = "128.0.6613.113-1";
|
||||
hash = "sha256-qHt7Rjx1VmKlX8ko7hpNv8SW/rNhXsGchWs6A/aXuu0=";
|
||||
rev = "128.0.6613.119-1";
|
||||
};
|
||||
};
|
||||
hash = "sha256-wqhaK1VuE1qPLt+f/x2KrtwZGxKFluTOWYMau+cSl2E=";
|
||||
version = "128.0.6613.113";
|
||||
hash = "sha256-WCemrL5jPRn5P1olLwfrAM1xLc0hcaBYDj0CZPoPucU=";
|
||||
version = "128.0.6613.119";
|
||||
};
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -237,7 +237,7 @@ buildStdenv.mkDerivation {
|
||||
patches = lib.optionals (lib.versionAtLeast version "111") [ ./env_var_for_system_dir-ff111.patch ]
|
||||
++ lib.optionals (lib.versionAtLeast version "96" && lib.versionOlder version "121") [ ./no-buildconfig-ffx96.patch ]
|
||||
++ lib.optionals (lib.versionAtLeast version "121") [ ./no-buildconfig-ffx121.patch ]
|
||||
++ lib.optionals (lib.versionOlder version "131") [
|
||||
++ lib.optionals (lib.versionOlder version "128.2" || (lib.versionAtLeast version "129" && lib.versionOlder version "130")) [
|
||||
(fetchpatch {
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1912663
|
||||
name = "cbindgen-0.27.0-compat.patch";
|
||||
@ -245,24 +245,6 @@ buildStdenv.mkDerivation {
|
||||
hash = "sha256-MqgWHgbDedVzDOqY2/fvCCp+bGwFBHqmaJLi/mllZug=";
|
||||
})
|
||||
]
|
||||
++ lib.optionals (lib.versionOlder version "130" && lib.versionAtLeast version "128") [
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1898476
|
||||
(fetchpatch {
|
||||
name = "mozbz-1898476-1.patch";
|
||||
url = "https://hg.mozilla.org/mozilla-central/raw-rev/f9323daf7abe";
|
||||
hash = "sha256-fvIowXJLWnm16LeiSz6EasGypTi1ilG+s/T6+lNLbMQ=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "mozbz-1898476-2.patch";
|
||||
url = "https://hg.mozilla.org/mozilla-central/raw-rev/a264ff9e9f6f";
|
||||
hash = "sha256-9vkI/Ho4BXvLnoRGdfTzUODcIlA6K3RjbdhZjb/LEz0=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "mozbz-1898476-3.patch";
|
||||
url = "https://hg.mozilla.org/mozilla-central/raw-rev/eb230ecdf8eb";
|
||||
hash = "sha256-IaLltxf5W1WEzxvbi10wphqXVQPtBiLc2zlk38CIiz4=";
|
||||
})
|
||||
]
|
||||
++ lib.optionals (lib.versionOlder version "122") [ ./bindgen-0.64-clang-18.patch ]
|
||||
++ lib.optionals (lib.versionOlder version "123") [
|
||||
(fetchpatch {
|
||||
|
||||
@ -5,10 +5,10 @@
|
||||
{
|
||||
firefox = buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "129.0.2";
|
||||
version = "130.0";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "f6805a87e5cb4e437583916e3ec1b312dc73eec5fc06ce7a038b13bd7c6827b18cf383c30645d96623ce41675351f3023ec6b9f89d676f1c889994eae79f2c13";
|
||||
sha512 = "d0d11b38d9e02fa15298ec13336bb086668b4f36b3ce9ced218a265327fd4822b9fea4303402631947ea3c20490c414de87f8df3e7c23d2e02b70f0456b9af40";
|
||||
};
|
||||
|
||||
extraPatches = [
|
||||
@ -96,10 +96,10 @@
|
||||
|
||||
firefox-esr-128 = buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "128.1.0esr";
|
||||
version = "128.2.0esr";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "8055a7f83acf0cab6124ba5809aff1c082e81a0d30ff318ec719f8fd3f4af9aa60e2094c1abd6c981193d751075a9569370176e20e50f3c1959fe27a15511388";
|
||||
sha512 = "9a689929f6f86d795ea2c0318bb78f77f72a552f40715a1108dbd6361b0dedc3aaf049f1883424012459899607067d5a8374d895564591ec6679a1ce80708d7d";
|
||||
};
|
||||
|
||||
meta = {
|
||||
@ -125,11 +125,11 @@
|
||||
|
||||
firefox-esr-115 = (buildMozillaMach rec {
|
||||
pname = "firefox-esr-115";
|
||||
version = "115.14.0esr";
|
||||
version = "115.15.0esr";
|
||||
applicationName = "Mozilla Firefox ESR";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "dd40c1fd3cf454dbf33a85d38e47bb0e736ed89b829643653e239f43232441f4e9f3c7876f058ff2e6f19daf2b50a8f2d13274e9a107d8a258a6067d1fc43f54";
|
||||
sha512 = "0df4c498c99cce08903004d2e0f9e977a19f7de86240aa82dba179b60f1d67ca3021eb474f56bddc38035e773eeb5d99bb3e1b0756d9f7583dc8e1f747f477ba";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "arkade";
|
||||
version = "0.11.21";
|
||||
version = "0.11.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexellis";
|
||||
repo = "arkade";
|
||||
rev = version;
|
||||
hash = "sha256-vNJQLrpPJJG5FjQ73203V/Ky93HawRWgMiPYHU+eXPM=";
|
||||
hash = "sha256-Qc8cQLLRcCNYouWfs8NzF9nrKIPrM1+1VA0wbP2iupQ=";
|
||||
};
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
@ -60,7 +60,7 @@ buildGoModule rec {
|
||||
description = "Build, deploy, and manage your applications with Docker and Kubernetes";
|
||||
homepage = "http://www.openshift.org";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ offline bachp moretea stehessel ];
|
||||
maintainers = with maintainers; [ offline moretea stehessel ];
|
||||
mainProgram = "oc";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,27 +1,24 @@
|
||||
{ lib, stdenv, fetchFromGitHub, openssl, sqlite }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, darwin, openssl, sqlite }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "signalbackup-tools";
|
||||
version = "20240816";
|
||||
version = "20240830";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bepaald";
|
||||
repo = "signalbackup-tools";
|
||||
rev = version;
|
||||
hash = "sha256-8r3XpKqCR2ElfQnRuuBaDDIUwAASTTfGSihOounIVZQ=";
|
||||
hash = "sha256-d93f/kKOd7D7FdtgrhrJhQS1DxiUKsdcf2JuUTmRDrw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs BUILDSCRIPT_MULTIPROC.bash44
|
||||
'';
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ openssl sqlite ];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
./BUILDSCRIPT_MULTIPROC.bash44${lib.optionalString stdenv.isDarwin " --config nixpkgs-darwin"}
|
||||
runHook postBuild
|
||||
'';
|
||||
buildInputs = [
|
||||
openssl
|
||||
sqlite
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk_11_0.frameworks.Security
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
let
|
||||
pname = "zulip";
|
||||
version = "5.11.0";
|
||||
version = "5.11.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage";
|
||||
hash = "sha256-snxeMgcLFMYDEsog7Xqeybw8GkU4kPqHMds1174bPd0=";
|
||||
hash = "sha256-t5qBm5+kTdeRMvcHpNbS5mp184UG/IqgJrtj7Ntcbb0=";
|
||||
name="${pname}-${version}.AppImage";
|
||||
};
|
||||
|
||||
@ -27,7 +27,7 @@ in appimageTools.wrapType2 {
|
||||
install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/zulip.png \
|
||||
$out/share/icons/hicolor/512x512/apps/zulip.png
|
||||
substituteInPlace $out/share/applications/zulip.desktop \
|
||||
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
--replace-fail 'Exec=AppRun' 'Exec=${pname}'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -238,7 +238,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Citrix Workspace";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
platforms = [ "x86_64-linux" ] ++ optional (versionOlder version "24") "i686-linux";
|
||||
maintainers = with maintainers; [ michaeladler ];
|
||||
maintainers = [ ];
|
||||
inherit homepage;
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
let
|
||||
pname = "jbrowse";
|
||||
version = "2.13.1";
|
||||
version = "2.14.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/GMOD/jbrowse-components/releases/download/v${version}/jbrowse-desktop-v${version}-linux.AppImage";
|
||||
sha256 = "sha256-JxV7ZxA3/YMG6ziYOA8QiBVth9UunVGJLTy1E110y6w=";
|
||||
sha256 = "sha256-fxXOUB+glJmg4WdL+mNfkp0O4iUsl8L1EuIYpBO1gRA=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
||||
@ -12,7 +12,7 @@ If the build broke as a result of a package update, try those solutions in order
|
||||
|
||||
- search the [sage GitHub repo](https://github.com/sagemath/sage) for keywords like "Upgrade <package>". Maybe somebody has already proposed a patch that fixes the issue. You can then add a `fetchpatch` to `sage-src.nix`.
|
||||
|
||||
- check if [gentoo](https://github.com/cschwan/sage-on-gentoo/tree/master/sci-mathematics/sage), [debian](https://salsa.debian.org/science-team/sagemath/tree/master/debian) or [arch linux](https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/sagemath) already solved the problem. You can then again add a `fetchpatch` to `sage-src.nix`. If applicable you should also [propose the patch upstream](#proposing-a-sage-patch).
|
||||
- check if [gentoo](https://github.com/cschwan/sage-on-gentoo/tree/master/sci-mathematics/sage), [debian](https://salsa.debian.org/science-team/sagemath/tree/master/debian) or [arch linux](https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/sagemath) already solved the problem. You can then again add a `fetchpatch` to `sage-src.nix`. If applicable you should also propose the patch upstream.
|
||||
|
||||
- fix the problem yourself. First clone the sagemath source and then check out the sage version you want to patch:
|
||||
|
||||
|
||||
@ -97,6 +97,7 @@ let
|
||||
# Running the tests should take something in the order of 1h.
|
||||
sage-tests = callPackage ./sage-tests.nix {
|
||||
inherit sage-with-env;
|
||||
pytest = python3.pkgs.pytest;
|
||||
};
|
||||
|
||||
sage-src = callPackage ./sage-src.nix {};
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
diff --git a/src/sage_docbuild/builders.py b/src/sage_docbuild/builders.py
|
||||
index c5be38600a..e1d15f62d3 100644
|
||||
index 871cc4705a2..4b718136b91 100644
|
||||
--- a/src/sage_docbuild/builders.py
|
||||
+++ b/src/sage_docbuild/builders.py
|
||||
@@ -105,31 +105,6 @@ def builder_helper(type):
|
||||
@@ -106,31 +106,6 @@ def builder_helper(type):
|
||||
"""
|
||||
Return a function which builds the documentation for
|
||||
output type ``type``.
|
||||
-
|
||||
- TESTS:
|
||||
-
|
||||
- Check that :trac:`25161` has been resolved::
|
||||
- Check that :issue:`25161` has been resolved::
|
||||
-
|
||||
- sage: from sage_docbuild.builders import DocBuilder
|
||||
- sage: from sage_docbuild.__main__ import setup_parser
|
||||
@ -48,10 +48,10 @@ index c5be38600a..e1d15f62d3 100644
|
||||
if build_options.ABORT_ON_ERROR:
|
||||
raise
|
||||
diff --git a/src/sage_docbuild/sphinxbuild.py b/src/sage_docbuild/sphinxbuild.py
|
||||
index 07c584de55..b83283a9ee 100644
|
||||
index 5621fe9e456..b1b91ce7b2c 100644
|
||||
--- a/src/sage_docbuild/sphinxbuild.py
|
||||
+++ b/src/sage_docbuild/sphinxbuild.py
|
||||
@@ -331,3 +331,8 @@ def runsphinx():
|
||||
@@ -323,3 +323,8 @@ def runsphinx():
|
||||
sys.stderr = saved_stderr
|
||||
sys.stdout.flush()
|
||||
sys.stderr.flush()
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, sage-src
|
||||
, furo
|
||||
, jupyter-sphinx
|
||||
, sphinx
|
||||
, sphinx-copybutton
|
||||
@ -13,6 +14,7 @@ buildPythonPackage rec {
|
||||
src = sage-src;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
furo
|
||||
jupyter-sphinx
|
||||
sphinx
|
||||
sphinx-copybutton
|
||||
|
||||
@ -11,14 +11,14 @@
|
||||
# all get the same sources with the same patches applied.
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "10.3";
|
||||
version = "10.4";
|
||||
pname = "sage-src";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sagemath";
|
||||
repo = "sage";
|
||||
rev = version;
|
||||
hash = "sha256-OHtMv8t0RrP6R8XIREU+C1vpazeQLWa75wx9Mv6BN1U=";
|
||||
hash = "sha256-BDO00ZSm5lnjEuA56VsY/FZyAhoG1hkFxdIlTtBZVBA=";
|
||||
};
|
||||
|
||||
# contains essential files (e.g., setup.cfg) generated by the bootstrap script.
|
||||
@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
|
||||
configure-src = fetchurl {
|
||||
# the hash below is the tagged commit's _parent_. it can also be found by looking for
|
||||
# the "configure" asset at https://github.com/sagemath/sage/releases/tag/${version}
|
||||
url = "mirror://sageupstream/configure/configure-ab1a517b64b02bf15bbcb8d7c2d4d643bd5eff9b.tar.gz";
|
||||
hash = "sha256-pe9AxTM+gFSR4/eVfUzay+4bwjoubbYeDPc+avKjlaw=";
|
||||
url = "mirror://sageupstream/configure/configure-3c279ec5712e0fa35c5733e03e010970727d7189.tar.gz";
|
||||
hash = "sha256-3bRlgIUSIq9tDzvI+ZfEd5LMy1qHXdItEwu1say4cx4=";
|
||||
};
|
||||
|
||||
# Patches needed because of particularities of nix or the way this is packaged.
|
||||
@ -62,23 +62,9 @@ stdenv.mkDerivation rec {
|
||||
# https://github.com/sagemath/sage/issues/34575
|
||||
./patches/disable-slow-glpk-test.patch
|
||||
|
||||
# https://github.com/sagemath/sage/pull/37489, landed in 10.4.beta1
|
||||
(fetchpatch {
|
||||
name = "quaternionalgebra-random-failure.patch";
|
||||
url = "https://github.com/sagemath/sage/commit/1c3f991b9d3c5778e409e5414c6cfcd456113f19.diff";
|
||||
hash = "sha256-uCXchYx26DdxTjR1k2748KCEHPnekKS2fAM7SpyhNvM=";
|
||||
})
|
||||
|
||||
# compile libs/gap/element.pyx with -O1
|
||||
# a more conservative version of https://github.com/sagemath/sage/pull/37951
|
||||
./patches/gap-element-crash.patch
|
||||
|
||||
# https://github.com/sagemath/sage/pull/37886, landed in 10.4.beta7
|
||||
(fetchpatch {
|
||||
name = "remove-xcode.patch";
|
||||
url = "https://github.com/sagemath/sage/commit/8e72038b4ab24fb63c06b28f6eb43097b9ab24d6.patch";
|
||||
sha256 = "sha256-hufDJFUBa/Trn1xsVNvzb2c1wE9iyhqewj3RMjVtENA=";
|
||||
})
|
||||
];
|
||||
|
||||
# Patches needed because of package updates. We could just pin the versions of
|
||||
@ -88,45 +74,11 @@ stdenv.mkDerivation rec {
|
||||
# should come from or be proposed to upstream. This list will probably never
|
||||
# be empty since dependencies update all the time.
|
||||
packageUpgradePatches = [
|
||||
# https://github.com/sagemath/sage/pull/37646, landed in 10.4.beta1
|
||||
# https://github.com/sagemath/sage/pull/38500, positively reviewed, to land in 10.5.beta3
|
||||
(fetchpatch {
|
||||
name = "cpp-17.patch";
|
||||
url = "https://github.com/sagemath/sage/commit/9b0a40d6cd17706db31d5ff8cdd78910409ba1c8.patch";
|
||||
sha256 = "sha256-2pJ9eH+o9O76Tsmklc/frzDOFkvPjvs2JQWCSqA+tMs=";
|
||||
})
|
||||
# https://github.com/sagemath/sage/pull/37763, landed in 10.4.beta2
|
||||
(fetchpatch {
|
||||
name = "scipy-fault-tolerance.patch";
|
||||
url = "https://github.com/sagemath/sage/commit/551139c09f26a5da96b1187c3f0dd17b8d80ef84.diff";
|
||||
hash = "sha256-PR4przrZ3ieHaW2nSY7l7VhNfrUupu9yCIrXpeyoAgg=";
|
||||
})
|
||||
|
||||
# https://github.com/sagemath/sage/pull/37492, landed in 10.4.beta5
|
||||
(fetchpatch {
|
||||
name = "singular-4.3.2p14-upgrade.patch";
|
||||
url = "https://github.com/sagemath/sage/commit/a0c56816b051e97da44ac0a4e4d4f6915cf7fa0f.diff";
|
||||
sha256 = "sha256-WGMmPeBoj2LUC+2qxWuaJL89QUuGt6axGvxWkpM9LYg=";
|
||||
})
|
||||
|
||||
# https://github.com/sagemath/sage/pull/37949, landed in 10.4.beta6
|
||||
(fetchpatch {
|
||||
name = "conway-polynomials-new-len.patch";
|
||||
url = "https://github.com/sagemath/sage/commit/c9f5b45179e92ea0de1e0dbe0f47464010902851.diff";
|
||||
hash = "sha256-DwN2UIX8dxfxjIiqVvMdGbIxJ7CR/Ag2XUmS5vUKFTs=";
|
||||
})
|
||||
|
||||
# https://github.com/sagemath/sage/pull/37967, landed in 10.4.beta6
|
||||
(fetchpatch {
|
||||
name = "conway-polynomials-ell-point.patch";
|
||||
url = "https://github.com/sagemath/sage/commit/4e0bbaf90262a42f8ea14d5bcfed65f9d1787f54.diff";
|
||||
hash = "sha256-9gXydi1A+n7+K8YpH0PB8l/OMexhgO2F5NccU0cK+ls=";
|
||||
})
|
||||
|
||||
# https://github.com/sagemath/sage/pull/38100, landed in 10.4.beta8
|
||||
(fetchpatch {
|
||||
name = "sphinx-7.3-update.patch";
|
||||
url = "https://github.com/sagemath/sage/commit/e1b22690db42885423be5049246eb71ff52bdfef.diff";
|
||||
hash = "sha256-04KAyz8+0pJbRV8Ld0bNX1OoEx/35gIh3Nff+6n8QUU=";
|
||||
name = "cython-3.0.11-upgrade.patch";
|
||||
url = "https://patch-diff.githubusercontent.com/raw/sagemath/sage/pull/38500.diff";
|
||||
hash = "sha256-ePfH3Gy1T0UfpoVd3EZowCfy88CbE+yE2MV2itWthsA=";
|
||||
})
|
||||
];
|
||||
|
||||
@ -151,7 +103,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
installPhase = ''
|
||||
cp -r . "$out"
|
||||
tar xkzf ${configure-src} -C "$out"
|
||||
tar xzf ${configure-src} -C "$out"
|
||||
rm "$out/configure"
|
||||
'';
|
||||
}
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, pytest
|
||||
, sage-with-env
|
||||
, makeWrapper
|
||||
, files ? null # "null" means run all tests
|
||||
@ -30,6 +31,7 @@ stdenv.mkDerivation {
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [
|
||||
pytest
|
||||
sage-with-env
|
||||
];
|
||||
|
||||
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cri-o";
|
||||
version = "1.30.4";
|
||||
version = "1.30.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cri-o";
|
||||
repo = "cri-o";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PfG5RlUmMGMduTApdlHoI+4kdRprvWXeXZDkd6brVkM=";
|
||||
hash = "sha256-snhuV4hqbqMJK8Fg6vJGJoQ3heCFULK1iIQQB65kiR0=";
|
||||
};
|
||||
vendorHash = null;
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nixpacks";
|
||||
version = "1.26.1";
|
||||
version = "1.27.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "railwayapp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xwuW6bncNK9zhI6gWDpI5imdAd0+mALxyUQW433AeMA=";
|
||||
sha256 = "sha256-aIg+CuWa97FlSs8kOFe6BxV2lB4M6R8QosoSomFPqFA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-uxvFeoooz7aSM7ZAgUsxGO3LE/zinW5D/GwXcWoKLA0=";
|
||||
cargoHash = "sha256-4Q6nduLEK2ym+3o3OD8jJwpl+sLbryk/TzoOSd/d4yE=";
|
||||
|
||||
# skip test due FHS dependency
|
||||
doCheck = false;
|
||||
|
||||
@ -14,13 +14,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "runc";
|
||||
version = "1.1.13";
|
||||
version = "1.1.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opencontainers";
|
||||
repo = "runc";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RQsM8Q7HogDVGbNpen3wxXNGR9lfqmNhkXTRoC+LBk8=";
|
||||
hash = "sha256-7PYbSZqCQLTaeFppuNz5mxDlwEyLkA5zpdMhWy1tWmc=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -147,6 +147,8 @@ let
|
||||
dotnetUseAppHost = useAppHost;
|
||||
inherit useDotnetFromEnv;
|
||||
|
||||
inherit enableParallelBuilding;
|
||||
|
||||
nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [
|
||||
dotnetConfigureHook
|
||||
dotnetBuildHook
|
||||
|
||||
@ -177,7 +177,8 @@ in
|
||||
# Handle empty vendorHash; avoid
|
||||
# error: empty hash requires explicit hash algorithm
|
||||
outputHashAlgo = if finalAttrs.vendorHash == "" then "sha256" else null;
|
||||
}).overrideAttrs finalAttrs.passthru.overrideModAttrs;
|
||||
# in case an overlay clears passthru by accident, don't fail evaluation
|
||||
}).overrideAttrs (finalAttrs.passthru.overrideModAttrs or overrideModAttrs);
|
||||
|
||||
nativeBuildInputs = [ go ] ++ nativeBuildInputs;
|
||||
|
||||
|
||||
@ -80,7 +80,7 @@ rec {
|
||||
'';
|
||||
};
|
||||
} // lib.mapAttrs (old: new: platform:
|
||||
lib.warn "`rust.${old} platform` is deprecated. Use `platform.rust.${new}` instead."
|
||||
lib.warn "`rust.${old} platform` is deprecated. Use `platform.rust.${lib.showAttrPath new}` instead."
|
||||
lib.getAttrFromPath new platform.rust)
|
||||
{
|
||||
toTargetArch = [ "platform" "arch" ];
|
||||
|
||||
@ -110,16 +110,16 @@ There's some limitations as to which packages can be defined using this structur
|
||||
|
||||
## Validation
|
||||
|
||||
CI performs [certain checks](https://github.com/NixOS/nixpkgs-check-by-name?tab=readme-ov-file#validity-checks) on the `pkgs/by-name` structure.
|
||||
This is done using the [`nixpkgs-check-by-name` tool](https://github.com/NixOS/nixpkgs-check-by-name).
|
||||
CI performs [certain checks](https://github.com/NixOS/nixpkgs-vet?tab=readme-ov-file#validity-checks) on the `pkgs/by-name` structure.
|
||||
This is done using the [`nixpkgs-vet` tool](https://github.com/NixOS/nixpkgs-vet).
|
||||
|
||||
You can locally emulate the CI check using
|
||||
|
||||
```
|
||||
$ ./maintainers/scripts/check-by-name.sh master
|
||||
$ ./ci/nixpkgs-vet.sh master
|
||||
```
|
||||
|
||||
See [here](../../.github/workflows/check-by-name.yml) for more info.
|
||||
See [here](../../.github/workflows/nixpkgs-vet.yml) for more info.
|
||||
|
||||
## Recommendation for new packages with multiple versions
|
||||
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ada";
|
||||
version = "2.9.1";
|
||||
version = "2.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ada-url";
|
||||
repo = "ada";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bDkhSAd+MlOm8pd5MPvzVHkWMY9aNcvNfLuH7qoyUuk=";
|
||||
hash = "sha256-VWFxupmgc+fq9aj/02uMEsiwhP+9PWMSleoIoyKVe3c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromSourcehut
|
||||
, fetchpatch
|
||||
, ncurses
|
||||
, notmuch
|
||||
, scdoc
|
||||
@ -31,6 +32,12 @@ buildGoModule rec {
|
||||
|
||||
patches = [
|
||||
./runtime-libexec.patch
|
||||
|
||||
# patch to fix a encoding problem with gpg signed messages
|
||||
(fetchpatch {
|
||||
url ="https://git.sr.ht/~rjarry/aerc/commit/7346d20.patch";
|
||||
hash = "sha256-OCm8BcovYN2IDSgslZklQxkGVkSYQ8HLCrf2+DRB2mM=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -12,7 +12,7 @@ let
|
||||
self = python3;
|
||||
packageOverrides = _: super: { tree-sitter = super.tree-sitter_0_21; };
|
||||
};
|
||||
version = "0.53.0";
|
||||
version = "0.54.0";
|
||||
in
|
||||
python3.pkgs.buildPythonApplication {
|
||||
pname = "aider-chat";
|
||||
@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication {
|
||||
owner = "paul-gauthier";
|
||||
repo = "aider";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-KQp4qqQKm++oB9RVQZhAWQJs7Nbyssc9eKKRH1VZbRU=";
|
||||
hash = "sha256-ysNhfhFGSDhEQLQLP26Lv6qmZehmwtQTSlAqJVPD5O8=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [ setuptools ];
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "artalk";
|
||||
version = "2.8.7";
|
||||
version = "2.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ArtalkJS";
|
||||
repo = "artalk";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-fOuZiFomXGvRUXkpEM3BpJyMOtSm6/RHd0a7dPOsoT4=";
|
||||
hash = "sha256-5tUUlkGeT4kY/81EQ29M6z+JnBT4YCa8gecbV9WMuDo=";
|
||||
};
|
||||
web = fetchurl {
|
||||
url = "https://github.com/${src.owner}/${src.repo}/releases/download/v${version}/artalk_ui.tar.gz";
|
||||
@ -26,7 +26,7 @@ buildGoModule rec {
|
||||
|
||||
CGO_ENABLED = 1;
|
||||
|
||||
vendorHash = "sha256-Hm388ub/ja3PuSRqPkr6A+pgKUQ+czMj1WKU8W8H5wI=";
|
||||
vendorHash = "sha256-edqmv/Q99pgnScJqCmLwjHd7uKMNPGfCSujNTUQtpLc=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "astartectl";
|
||||
version = "23.5.1";
|
||||
version = "23.5.2";
|
||||
|
||||
# Workaround for go vendor failing
|
||||
# https://github.com/astarte-platform/astartectl/pull/244
|
||||
@ -15,10 +15,10 @@ buildGoModule rec {
|
||||
owner = "astarte-platform";
|
||||
repo = "astartectl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ntlLk7soiZq6Ql6k/RG9PdHawguRV6Wha8C+5FM+2og=";
|
||||
hash = "sha256-EIyta/10K6WQ1vzQZryz+c3K2AwMOUUQCw5f4Wkp6Yk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3k/G7fLll19XG2RU8YsepWv8BtkCmiLg4/c7lSvx+9k=";
|
||||
vendorHash = "sha256-NWPLHbUHrk/oJXCOJF8kKhQiZR8aqZChxuz73Acu1cM=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -59,9 +59,9 @@
|
||||
};
|
||||
aks-preview = mkAzExtension rec {
|
||||
pname = "aks-preview";
|
||||
version = "7.0.0b6";
|
||||
version = "8.0.0b1";
|
||||
url = "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-${version}-py2.py3-none-any.whl";
|
||||
sha256 = "268457ea6463d03775caa822b4b7a70749c503b47cb2aa9c898e1186cfb423f6";
|
||||
sha256 = "500a670e0f4cd8ef9399a0928fbcef6440a68cdc2978c62db911d1585f351b75";
|
||||
description = "Provides a preview for upcoming AKS features";
|
||||
};
|
||||
akshybrid = mkAzExtension rec {
|
||||
@ -87,9 +87,9 @@
|
||||
};
|
||||
amg = mkAzExtension rec {
|
||||
pname = "amg";
|
||||
version = "2.1.0";
|
||||
version = "2.2.0";
|
||||
url = "https://azcliprod.blob.core.windows.net/cli-extensions/amg-${version}-py3-none-any.whl";
|
||||
sha256 = "b28952d967b9a1e0d81dac280bdff23b44fdbb06dedd66cdf99477bdd7541d6c";
|
||||
sha256 = "8d832463a35329e61840bce5fe2c3ba214f8e800cc38140fe58dc2bf13ffeb90";
|
||||
description = "Microsoft Azure Command-Line Tools Azure Managed Grafana Extension";
|
||||
};
|
||||
amlfs = mkAzExtension rec {
|
||||
@ -150,9 +150,9 @@
|
||||
};
|
||||
azurelargeinstance = mkAzExtension rec {
|
||||
pname = "azurelargeinstance";
|
||||
version = "1.0.0b2";
|
||||
version = "1.0.0b3";
|
||||
url = "https://azcliprod.blob.core.windows.net/cli-extensions/azurelargeinstance-${version}-py3-none-any.whl";
|
||||
sha256 = "6948ac3306269ea6c8ff6d32d5673989dfd4dfa0a4e4c5d6d3991b364d5dc628";
|
||||
sha256 = "093a2fa900e3df53f8bf15b335156058333efe0eff9584a11db4bac0bccc7b1d";
|
||||
description = "Microsoft Azure Command-Line Tools Azurelargeinstance Extension";
|
||||
};
|
||||
azurestackhci = mkAzExtension rec {
|
||||
@ -164,10 +164,10 @@
|
||||
};
|
||||
baremetal-infrastructure = mkAzExtension rec {
|
||||
pname = "baremetal-infrastructure";
|
||||
version = "2.0.1";
|
||||
url = "https://github.com/Azure/azure-baremetalinfrastructure-cli-extension/releases/download/${version}/baremetal_infrastructure-2.0.1-py2.py3-none-any.whl";
|
||||
sha256 = "ea127d64603c8a45774cdf9aa80c4c8b5839a42719971b296beb96105fe5ef2d";
|
||||
description = "Additional commands for working with BareMetal instances";
|
||||
version = "3.0.0b1";
|
||||
url = "https://azcliprod.blob.core.windows.net/cli-extensions/baremetal_infrastructure-${version}-py3-none-any.whl";
|
||||
sha256 = "83ff3e4540f522a5f3578a923155715160e90a15a8d919a2e5569c08f1295a2f";
|
||||
description = "Microsoft Azure Command-Line Tools BaremetalInfrastructure Extension";
|
||||
};
|
||||
bastion = mkAzExtension rec {
|
||||
pname = "bastion";
|
||||
@ -596,6 +596,13 @@
|
||||
sha256 = "41861d65b9d86e0b622986a4984ce7a611f87b92da578db8c0527ec74334f32c";
|
||||
description = "Microsoft Azure Command-Line Tools K8s-extension Extension";
|
||||
};
|
||||
k8s-runtime = mkAzExtension rec {
|
||||
pname = "k8s-runtime";
|
||||
version = "1.0.3";
|
||||
url = "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_runtime-${version}-py3-none-any.whl";
|
||||
sha256 = "133dd153979c74d37aa25956ed8a9aa741c334929848cd67c26f268332759d40";
|
||||
description = "Microsoft Azure Command-Line Tools K8sRuntime Extension";
|
||||
};
|
||||
kusto = mkAzExtension rec {
|
||||
pname = "kusto";
|
||||
version = "0.5.0";
|
||||
|
||||
@ -32,9 +32,9 @@
|
||||
|
||||
containerapp = mkAzExtension rec {
|
||||
pname = "containerapp";
|
||||
version = "0.3.53";
|
||||
version = "1.0.0b1";
|
||||
url = "https://azcliprod.blob.core.windows.net/cli-extensions/containerapp-${version}-py2.py3-none-any.whl";
|
||||
sha256 = "f9b4f3928469efcc1bfbc98cd906d9d92e72617e5c21cf3ade8b37651607c3e1";
|
||||
sha256 = "d80b83b0e22770925c24bca150c84182376b7b0aff9b6f28498d769dc8618b45";
|
||||
description = "Microsoft Azure Command-Line Tools Containerapp Extension";
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
docker
|
||||
|
||||
@ -21,14 +21,14 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.63.0";
|
||||
version = "2.64.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "azure-cli-${version}-src";
|
||||
owner = "Azure";
|
||||
repo = "azure-cli";
|
||||
rev = "azure-cli-${version}";
|
||||
hash = "sha256-HpWdEZAMnAkB07fnE7IrA0FqpBYKChqojxwAo8RfuQs=";
|
||||
hash = "sha256-1FnrUvRpAkZ0nAxen3seam2S49tBkK5N37ZD99OkvB0=";
|
||||
};
|
||||
|
||||
# put packages that needs to be overridden in the py package scope
|
||||
|
||||
@ -139,6 +139,11 @@ let
|
||||
overrideAzureMgmtPackage super.azure-mgmt-eventgrid "10.2.0b2" "zip"
|
||||
"sha256-QcHY1wCwQyVOEdUi06/wEa4dqJH5Ccd33gJ1Sju0qZA=";
|
||||
|
||||
# ValueError: The operation 'azure.mgmt.hdinsight.operations#ExtensionsOperations.get_azure_monitor_agent_status' is invalid.
|
||||
azure-mgmt-hdinsight =
|
||||
overrideAzureMgmtPackage super.azure-mgmt-hdinsight "9.0.0b3" "tar.gz"
|
||||
"sha256-clSeCP8+7T1uI4Nec+zhzDK980C9+JGeeJFsNSwgD2Q=";
|
||||
|
||||
# ValueError: The operation 'azure.mgmt.kusto.operations#ClustersOperations.delete' is invalid.
|
||||
azure-mgmt-kusto =
|
||||
(overrideAzureMgmtPackage super.azure-mgmt-kusto "0.3.0" "zip"
|
||||
|
||||
31
pkgs/by-name/cf/cf-tool/package.nix
Normal file
31
pkgs/by-name/cf/cf-tool/package.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
nix-update-script,
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "cf-tool";
|
||||
version = "202405140250";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sempr";
|
||||
repo = "cf-tool";
|
||||
rev = version;
|
||||
hash = "sha256-D+mJJw1+ImCrFpsv8HmaAwWqjYvUWouh8mgQ7hJxMrc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-R+mzfH9f422+WTiwIbDoBeEc+YYbW3tisUPlqrnFWbg=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Codeforces CLI (Submit, Parse, Test, etc.). Support Contests, Gym, Groups, acmsguru, Windows, macOS, Linux, 7 MB";
|
||||
homepage = "https://github.com/sempr/cf-tool";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ bot-wxt1221 ];
|
||||
mainProgram = "cf";
|
||||
};
|
||||
}
|
||||
@ -13,10 +13,10 @@ let
|
||||
}.${system} or throwSystem;
|
||||
|
||||
hash = {
|
||||
x86_64-linux = "sha256-MQYUSUbQ0YjJjURpX/fguUbXJdcs16z/eYHXUzzMQ14=";
|
||||
aarch64-linux = "sha256-SQoxk70ZTBsK+KKaCF2M/5de7+L2Ycgryr4yZEfK6N8=";
|
||||
x86_64-darwin = "sha256-Tl70grYgR/yF1giGOdzvsii2GQ2/pGdUT+TAMslixzw=";
|
||||
aarch64-darwin = "sha256-VJwfskMUMpGk3n52KMvBa01EKUcZsvsd0yt7nGon6yw=";
|
||||
x86_64-linux = "sha256-BPlegORfDeGBMexdkh+5clfxNqQ5FRawW8BJuzwowg0=";
|
||||
aarch64-linux = "sha256-UPDA2wlf4K05JpeghHB+yeBFyMCXbZTDGrxFVyA1mlI=";
|
||||
x86_64-darwin = "sha256-fVqHPfGJBMdEJn6EOh4eRVmPXhmoMskjdlmSls7sm/E=";
|
||||
aarch64-darwin = "sha256-kIZYFgXj5vpZ1MwZqu1X4i/OZjfZMpvkceHzed8ZKP8=";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
bin = "$out/bin/codeium_language_server";
|
||||
@ -24,7 +24,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "codeium";
|
||||
version = "1.14.11";
|
||||
version = "1.14.15";
|
||||
src = fetchurl {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}.gz";
|
||||
url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz";
|
||||
|
||||
5043
pkgs/by-name/co/conduwuit/Cargo.lock
generated
Normal file
5043
pkgs/by-name/co/conduwuit/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
107
pkgs/by-name/co/conduwuit/package.nix
Normal file
107
pkgs/by-name/co/conduwuit/package.nix
Normal file
@ -0,0 +1,107 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
bzip2,
|
||||
zstd,
|
||||
stdenv,
|
||||
darwin,
|
||||
rocksdb,
|
||||
nix-update-script,
|
||||
testers,
|
||||
conduwuit,
|
||||
# upstream conduwuit enables jemalloc by default, so we follow suit
|
||||
enableJemalloc ? true,
|
||||
rust-jemalloc-sys,
|
||||
enableLiburing ? stdenv.isLinux,
|
||||
liburing,
|
||||
}:
|
||||
let
|
||||
rust-jemalloc-sys' = rust-jemalloc-sys.override {
|
||||
unprefixed = !stdenv.isDarwin;
|
||||
};
|
||||
rocksdb' = rocksdb.override {
|
||||
inherit enableLiburing;
|
||||
# rocksdb does not support prefixed jemalloc, which is required on darwin
|
||||
enableJemalloc = enableJemalloc && !stdenv.isDarwin;
|
||||
jemalloc = rust-jemalloc-sys';
|
||||
};
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "conduwuit";
|
||||
version = "0.4.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "girlbossceo";
|
||||
repo = "conduwuit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ut3IWEueNR/hT7NyGfuK5IYtppC6ArSoJdEfFuD/0vE=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"ruma-0.10.1" = "sha256-u4C2VwRBmw8iVaPrkSmF/EKi5U3nWJWVktUDFmQcI1E=";
|
||||
"rust-librocksdb-sys-0.25.0+9.5.2" = "sha256-wz6QDLoXtY8+EU2DlPf4MbWC67KJK0hZnRswCeomkLQ=";
|
||||
"rustyline-async-0.4.3" = "sha256-7yYOGZ14SODD4+e9fTGgggUKqTi31479S0lEVKTKLPI=";
|
||||
"tikv-jemalloc-ctl-0.6.0" = "sha256-guiH6Gw/Oeb6A8Ri1SFcB6CW6mt+9XeA6vfwdS72yDQ=";
|
||||
"tracing-0.1.40" = "sha256-J6+8hBC/755SU8n1fTiJwBh17Unluv1SXfd5+dDAEhk=";
|
||||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
bzip2
|
||||
zstd
|
||||
]
|
||||
++ lib.optional enableJemalloc rust-jemalloc-sys'
|
||||
++ lib.optional enableLiburing liburing
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
env = {
|
||||
ZSTD_SYS_USE_PKG_CONFIG = true;
|
||||
ROCKSDB_INCLUDE_DIR = "${rocksdb'}/include";
|
||||
ROCKSDB_LIB_DIR = "${rocksdb'}/lib";
|
||||
};
|
||||
|
||||
buildNoDefaultFeatures = true;
|
||||
# See https://github.com/girlbossceo/conduwuit/blob/main/src/main/Cargo.toml
|
||||
# for available features.
|
||||
# We enable all default features except jemalloc and io_uring, which
|
||||
# we guard behind our own (default-enabled) flags.
|
||||
buildFeatures = [
|
||||
"brotli_compression"
|
||||
"element_hacks"
|
||||
"gzip_compression"
|
||||
"release_max_log_level"
|
||||
"sentry_telemetry"
|
||||
"systemd"
|
||||
"zstd_compression"
|
||||
] ++ lib.optional enableJemalloc "jemalloc" ++ lib.optional enableLiburing "io_uring";
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests.version = testers.testVersion {
|
||||
package = conduwuit;
|
||||
version = "${version}";
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Matrix homeserver written in Rust, forked from conduit";
|
||||
homepage = "https://conduwuit.puppyirl.gay/";
|
||||
changelog = "https://github.com/girlbossceo/conduwuit/releases/tag/v${version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ niklaskorz ];
|
||||
# Not a typo, conduwuit is a drop-in replacement for conduit.
|
||||
mainProgram = "conduit";
|
||||
};
|
||||
}
|
||||
@ -6,27 +6,32 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "containerlab";
|
||||
version = "0.56.0";
|
||||
version = "0.57.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "srl-labs";
|
||||
repo = "containerlab";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7jQvfEplGIwTtIAOBc6R5OfcxPQuEbBnzBoAI9mE+7E=";
|
||||
hash = "sha256-dqREbTDRhSEQg8swZ5ljhAtu3Yv421/QNmpkWopPWbk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
vendorHash = "sha256-SPxpi9jG3Xtit9JOAv0xWd89qWJZXeIjMwoNTkVeDgk=";
|
||||
vendorHash = "sha256-3ESz1wnbm6KfXSO5Fw4c7uUxL3K8Lsib5KAYoRD6vrw=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X" "github.com/srl-labs/containerlab/cmd.version=${version}"
|
||||
"-X" "github.com/srl-labs/containerlab/cmd.commit=${src.rev}"
|
||||
"-X" "github.com/srl-labs/containerlab/cmd.date=1970-01-01T00:00:00Z"
|
||||
"-X github.com/srl-labs/containerlab/cmd.version=${version}"
|
||||
"-X github.com/srl-labs/containerlab/cmd.commit=${src.rev}"
|
||||
"-X github.com/srl-labs/containerlab/cmd.date=1970-01-01T00:00:00Z"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
# Fix failed TestLabelsInit test
|
||||
export USER="runner"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
local INSTALL="$out/bin/containerlab"
|
||||
installShellCompletion --cmd containerlab \
|
||||
@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)"
|
||||
substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ just pkg-config makeBinaryWrapper ];
|
||||
|
||||
@ -1,12 +1,35 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gtk3, ncurses
|
||||
, libcpuid, pciutils, procps, wrapGAppsHook3, nasm, makeWrapper
|
||||
, opencl-headers, ocl-icd
|
||||
, vulkan-headers, vulkan-loader, glfw
|
||||
, libXdmcp, pcre, util-linux
|
||||
, libselinux, libsepol
|
||||
, libthai, libdatrie, libxkbcommon, libepoxy
|
||||
, dbus, at-spi2-core
|
||||
, libXtst
|
||||
{
|
||||
lib,
|
||||
testers,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
gtk3,
|
||||
ncurses,
|
||||
libcpuid,
|
||||
pciutils,
|
||||
procps,
|
||||
wrapGAppsHook3,
|
||||
nasm,
|
||||
opencl-headers,
|
||||
ocl-icd,
|
||||
vulkan-headers,
|
||||
vulkan-loader,
|
||||
glfw,
|
||||
libXdmcp,
|
||||
pcre,
|
||||
util-linux,
|
||||
libselinux,
|
||||
libsepol,
|
||||
libthai,
|
||||
libdatrie,
|
||||
libxkbcommon,
|
||||
libepoxy,
|
||||
dbus,
|
||||
at-spi2-core,
|
||||
libXtst,
|
||||
gtkmm3,
|
||||
}:
|
||||
|
||||
# Known issues:
|
||||
@ -14,41 +37,69 @@
|
||||
# registered in /etc/shells. The nix's bash is not in there when running
|
||||
# cpu-x from nixpkgs.
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cpu-x";
|
||||
version = "5.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "X0rg";
|
||||
repo = "CPU-X";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8jJP0gxH3B6qLrhKNa4P9ZfSjxaXTeBB1+UuadflLQo=";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-8jJP0gxH3B6qLrhKNa4P9ZfSjxaXTeBB1+UuadflLQo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 nasm makeWrapper ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
wrapGAppsHook3
|
||||
nasm
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3 ncurses libcpuid pciutils procps
|
||||
vulkan-headers vulkan-loader glfw
|
||||
opencl-headers ocl-icd
|
||||
libXdmcp pcre util-linux
|
||||
libselinux libsepol
|
||||
libthai libdatrie libxkbcommon libepoxy
|
||||
dbus at-spi2-core
|
||||
gtk3
|
||||
gtkmm3
|
||||
ncurses
|
||||
libcpuid
|
||||
pciutils
|
||||
procps
|
||||
vulkan-headers
|
||||
vulkan-loader
|
||||
glfw
|
||||
opencl-headers
|
||||
ocl-icd
|
||||
libXdmcp
|
||||
pcre
|
||||
util-linux
|
||||
libselinux
|
||||
libsepol
|
||||
libthai
|
||||
libdatrie
|
||||
libxkbcommon
|
||||
libepoxy
|
||||
dbus
|
||||
at-spi2-core
|
||||
libXtst
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/cpu-x \
|
||||
--prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} \
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix PATH : ${lib.makeBinPath [ stdenv.cc ]}
|
||||
--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib
|
||||
)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
passthru = {
|
||||
tests = {
|
||||
version = testers.testVersion { package = finalAttrs.finalPackage; };
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Free software that gathers information on CPU, motherboard and more";
|
||||
mainProgram = "cpu-x";
|
||||
homepage = "https://thetumultuousunicornofdarkness.github.io/CPU-X";
|
||||
license = licenses.gpl3Plus;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ viraptor ];
|
||||
maintainers = with lib.maintainers; [ viraptor ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
62
pkgs/by-name/da/databricks-cli/package.nix
Normal file
62
pkgs/by-name/da/databricks-cli/package.nix
Normal file
@ -0,0 +1,62 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
git,
|
||||
python3,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "databricks-cli";
|
||||
version = "0.227.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "databricks";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bmTPtxkVtGzjxgmXpIHus7vUUg3IKGWmlUT8iOU+dtM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ItcGzgGIDQOnAwUA/mPy+oNjChKPTVo7QK3gsidB1xQ=";
|
||||
|
||||
excludedPackages = [ "bundle/internal" ];
|
||||
|
||||
postBuild = ''
|
||||
mv "$GOPATH/bin/cli" "$GOPATH/bin/databricks"
|
||||
'';
|
||||
|
||||
checkFlags =
|
||||
"-skip="
|
||||
+ (lib.concatStringsSep "|" [
|
||||
# Need network
|
||||
"TestTerraformArchiveChecksums"
|
||||
"TestExpandPipelineGlobPaths"
|
||||
"TestRelativePathTranslationDefault"
|
||||
"TestRelativePathTranslationOverride"
|
||||
]);
|
||||
|
||||
nativeCheckInputs = [
|
||||
git
|
||||
(python3.withPackages (
|
||||
ps: with ps; [
|
||||
setuptools
|
||||
wheel
|
||||
]
|
||||
))
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
# Some tested depends on git and remote url
|
||||
git init
|
||||
git remote add origin https://github.com/databricks/cli.git
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Databricks CLI";
|
||||
mainProgram = "databricks";
|
||||
homepage = "https://github.com/databricks/cli";
|
||||
changelog = "https://github.com/databricks/cli/releases/tag/v${version}";
|
||||
license = licenses.databricks;
|
||||
maintainers = with maintainers; [ kfollesdal ];
|
||||
};
|
||||
}
|
||||
@ -37,16 +37,16 @@ let
|
||||
in
|
||||
buildNpmPackage rec {
|
||||
pname = "deltachat-desktop";
|
||||
version = "1.46.5";
|
||||
version = "1.46.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-desktop";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-u/2/lCQpUf5bxKPseHz6SFmiW0m9SywuA5Ng3BBnX88=";
|
||||
hash = "sha256-gsgw075YitYgx5WkNdPnh96w58FJaa2r8wOJyUsSAu0=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-jnuSL0yr6E8P0Tev9rMsfCLs59WStaH19DhZe0zthmw=";
|
||||
npmDepsHash = "sha256-Va/Aber3uwTFTy/XnYILkU3s66/xQAvGDFh2p/ZYYUo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
|
||||
@ -76,6 +76,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
substituteAllInPlace src/scmversion/gen_scmversion.sh
|
||||
'';
|
||||
|
||||
# error: cannot convert 'int16x8_t' to '__Int32x4_t'
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isAarch64 "-flax-vector-conversions";
|
||||
|
||||
installCheckPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
diff --git a/package.json b/package.json
|
||||
index e25221f2..5268d11a 100644
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -1,4 +1,5 @@
|
||||
{
|
||||
+ "name": "element-call",
|
||||
"version": "0.0.0",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
@ -6,32 +6,29 @@
|
||||
, yarnBuildHook
|
||||
, nodejs
|
||||
, npmHooks
|
||||
, olm
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
throwSystem = throw "Unsupported system: ${system}";
|
||||
offlineCacheHash = {
|
||||
x86_64-linux = "sha256-mZCnvX6hzkdi/zjPiefcmbyC2kGemjS4w7WTVkyq8W0=";
|
||||
aarch64-linux = "sha256-mZCnvX6hzkdi/zjPiefcmbyC2kGemjS4w7WTVkyq8W0=";
|
||||
x86_64-darwin = "sha256-G4doEnZORJqcl3bWaKZPuQmBeXNXud06nLO12Afr9kM=";
|
||||
aarch64-darwin = "sha256-G4doEnZORJqcl3bWaKZPuQmBeXNXud06nLO12Afr9kM=";
|
||||
x86_64-linux = "sha256-g4PWB1EstNB7gd/yZyrXf+U8Py8OLeea0gDlEXhInhU=";
|
||||
aarch64-linux = "sha256-g4PWB1EstNB7gd/yZyrXf+U8Py8OLeea0gDlEXhInhU=";
|
||||
x86_64-darwin = "sha256-g4PWB1EstNB7gd/yZyrXf+U8Py8OLeea0gDlEXhInhU=";
|
||||
aarch64-darwin = "sha256-g4PWB1EstNB7gd/yZyrXf+U8Py8OLeea0gDlEXhInhU=";
|
||||
}.${system} or throwSystem;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "element-call";
|
||||
version = "0.5.16";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "element-hq";
|
||||
repo = "element-call";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-GTHM27i716RZk+kDELMg/lYy355/SZoQLXGPQ90M4xg=";
|
||||
hash = "sha256-PyxqUhnlWfcACsoFYrppO7g5e74jI4/xxXBi6oWyWsg=";
|
||||
};
|
||||
|
||||
patches = [ ./name.patch ];
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${finalAttrs.src}/yarn.lock";
|
||||
hash = offlineCacheHash;
|
||||
@ -53,6 +50,5 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ kilimnik ];
|
||||
mainProgram = "element-call";
|
||||
inherit (olm.meta) knownVulnerabilities;
|
||||
};
|
||||
})
|
||||
|
||||
@ -22,13 +22,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "feather";
|
||||
version = "2.6.7";
|
||||
version = "2.6.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "feather-wallet";
|
||||
repo = "feather";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-zXNpNhBOtDvuuxzZ8o2XDLqNSi/XK4I6eYAfWuiCgRI=";
|
||||
hash = "sha256-l1kyNpUIqezMfInhrKgnTnArqeSjvhBwdqVi0aUlKF8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
let version = "0.41.1";
|
||||
let version = "0.41.2";
|
||||
in buildGoModule {
|
||||
pname = "geesefs";
|
||||
inherit version;
|
||||
@ -12,7 +12,7 @@ in buildGoModule {
|
||||
owner = "yandex-cloud";
|
||||
repo = "geesefs";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4uPq4NUd6upsOxuKAVqay7UTMfiHlCKwVvJed0jdeyc=";
|
||||
hash = "sha256-W7f3vYjU1f6lxwkz24WjS3UzYy95bxk7nKoLpLsvUwM=";
|
||||
};
|
||||
|
||||
# hashes differ per architecture otherwise.
|
||||
|
||||
@ -70,6 +70,6 @@ buildGoModule rec {
|
||||
license = licenses.mit;
|
||||
homepage = "https://docs.gitlab.com/runner/";
|
||||
platforms = platforms.unix ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ bachp zimbatm ] ++ teams.gitlab.members;
|
||||
maintainers = with maintainers; [ zimbatm ] ++ teams.gitlab.members;
|
||||
};
|
||||
}
|
||||
|
||||
@ -3,15 +3,15 @@
|
||||
}:
|
||||
let
|
||||
pname = "josm";
|
||||
version = "19160";
|
||||
version = "19207";
|
||||
srcs = {
|
||||
jar = fetchurl {
|
||||
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
|
||||
hash = "sha256-a0Tu0GkXH/MYR5llmVaVcEBvmr50sX4oSsCZSzo5dkE=";
|
||||
hash = "sha256-dYDJmGXIKd2GhjyKBpQjoIfz9giBsgFdC0TaKplxiPY=";
|
||||
};
|
||||
macosx = fetchurl {
|
||||
url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java21.zip";
|
||||
hash = "sha256-5sn4Wo4VMIZ79v/FegKrFQ62cngAQLc1luTnvhCO7y8=";
|
||||
hash = "sha256-A34nd+RBipON5zOKBD57L1l2KACYEUHNjxs0N6xqoXc=";
|
||||
};
|
||||
pkg = fetchsvn {
|
||||
url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";
|
||||
|
||||
66
pkgs/by-name/k8/k8s-manifest-sigstore/package.nix
Normal file
66
pkgs/by-name/k8/k8s-manifest-sigstore/package.nix
Normal file
@ -0,0 +1,66 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
testers,
|
||||
k8s-manifest-sigstore,
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "k8s-manifest-sigstore";
|
||||
version = "0.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sigstore";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-BDBkPXDg9DruIt5f7RrpStFeuTGiOOpsb6JiKaCTOOk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
vendorHash = "sha256-dIReCe+Qoq/chBrd/X5s4hucuDquvd7OTUSj0WpcIDE=";
|
||||
|
||||
subPackages = [ "cmd/kubectl-sigstore" ];
|
||||
|
||||
ldflags =
|
||||
let
|
||||
prefix = "github.com/sigstore/k8s-manifest-sigstore/pkg/util";
|
||||
in
|
||||
[
|
||||
"-s"
|
||||
"-w"
|
||||
# https://github.com/sigstore/k8s-manifest-sigstore/blob/e740581a4652dd44eb65495ed071fd0258dcbeb4/Makefile#L22
|
||||
"-X ${prefix}.buildDate=1970-01-01T00:00:00Z"
|
||||
"-X ${prefix}.gitCommit=v${version}"
|
||||
"-X ${prefix}.gitTreeState=clean"
|
||||
"-X ${prefix}.GitVersion=v${version}"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd kubectl-sigstore \
|
||||
--bash <($out/bin/kubectl-sigstore completion bash) \
|
||||
--fish <($out/bin/kubectl-sigstore completion fish) \
|
||||
--zsh <($out/bin/kubectl-sigstore completion zsh)
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gitUpdater { rev-prefix = "v"; };
|
||||
tests.version = testers.testVersion {
|
||||
package = k8s-manifest-sigstore;
|
||||
command = "kubectl-sigstore version";
|
||||
version = "v${version}";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/sigstore/k8s-manifest-sigstore";
|
||||
changelog = "https://github.com/sigstore/k8s-manifest-sigstore/releases/tag/v${version}";
|
||||
description = "Kubectl plugin for signing Kubernetes manifest YAML files with sigstore";
|
||||
mainProgram = "kubectl-sigstore";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ bbigras ];
|
||||
};
|
||||
}
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcyaml";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tlsa";
|
||||
repo = "libcyaml";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-iS1T8R0SW+qu0TlP5FVlDzUfQitiZMUkbJUigbxeW0Y=";
|
||||
sha256 = "sha256-JIN/cvh9PRl4/K0Z3WZtSCA3casBxyaxNxjXZZdQRWQ=";
|
||||
};
|
||||
|
||||
buildInputs = [ libyaml ];
|
||||
10
pkgs/by-name/li/libdeltachat/Cargo.lock
generated
10
pkgs/by-name/li/libdeltachat/Cargo.lock
generated
@ -1353,7 +1353,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "deltachat"
|
||||
version = "1.142.7"
|
||||
version = "1.142.11"
|
||||
dependencies = [
|
||||
"ansi_term",
|
||||
"anyhow",
|
||||
@ -1444,7 +1444,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "deltachat-jsonrpc"
|
||||
version = "1.142.7"
|
||||
version = "1.142.11"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-channel 2.3.1",
|
||||
@ -1469,7 +1469,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "deltachat-repl"
|
||||
version = "1.142.7"
|
||||
version = "1.142.11"
|
||||
dependencies = [
|
||||
"ansi_term",
|
||||
"anyhow",
|
||||
@ -1484,7 +1484,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "deltachat-rpc-server"
|
||||
version = "1.142.7"
|
||||
version = "1.142.11"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"deltachat",
|
||||
@ -1513,7 +1513,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "deltachat_ffi"
|
||||
version = "1.142.7"
|
||||
version = "1.142.11"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"deltachat",
|
||||
|
||||
@ -29,13 +29,13 @@ let
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "libdeltachat";
|
||||
version = "1.142.7";
|
||||
version = "1.142.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-core-rust";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Wj7fmhp67a3OtzxPbfqOpZCzM9WokzKiaWNQS9qYyCo=";
|
||||
hash = "sha256-60RkdwfLl2oncRKdAP0GD50WkrCBcrJ5Pkkue+UUJ0g=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
812
pkgs/by-name/li/libsignal-ffi/Cargo.lock
generated
812
pkgs/by-name/li/libsignal-ffi/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -1,4 +1,14 @@
|
||||
{ lib, stdenv, fetchFromGitHub, rustPlatform, runCommand, xcodebuild, protobuf, boringssl, darwin }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
runCommand,
|
||||
xcodebuild,
|
||||
protobuf,
|
||||
boringssl,
|
||||
darwin,
|
||||
}:
|
||||
let
|
||||
# boring-sys expects the static libraries in build/ instead of lib/
|
||||
boringssl-wrapper = runCommand "boringssl-wrapper" { } ''
|
||||
@ -12,13 +22,14 @@ rustPlatform.buildRustPackage rec {
|
||||
pname = "libsignal-ffi";
|
||||
# must match the version used in mautrix-signal
|
||||
# see https://github.com/mautrix/signal/issues/401
|
||||
version = "0.52.0";
|
||||
version = "0.55.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
fetchSubmodules = true;
|
||||
owner = "signalapp";
|
||||
repo = "libsignal";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MFTTrIJ9+1NgaL9KD4t0KYR2feHow+HtyYXQWJgKilM=";
|
||||
hash = "sha256-hQ3iWGLef1y3yyzjWH2MWcs32A7HxUSxGG8fCyMn/KE=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
|
||||
@ -34,12 +45,15 @@ rustPlatform.buildRustPackage rec {
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"boring-4.6.0" = "sha256-IjkpCKZ4Y1UTrFPg4g/bak+/mJFiyfUyxtTtT5uzcUY=";
|
||||
"boring-4.9.0" = "sha256-RSpaMzMUXp+WuqqDwLErP5yLT0YhYGoOUWCuSt4jR3I=";
|
||||
"curve25519-dalek-4.1.3" = "sha256-bPh7eEgcZnq9C3wmSnnYv0C4aAP+7pnwk9Io29GrI4A=";
|
||||
};
|
||||
};
|
||||
|
||||
cargoBuildFlags = [ "-p" "libsignal-ffi" ];
|
||||
cargoBuildFlags = [
|
||||
"-p"
|
||||
"libsignal-ffi"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "C ABI library which exposes Signal protocol logic";
|
||||
|
||||
@ -38,7 +38,10 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://github.com/henriklovhaug/md-tui";
|
||||
changelog = "https://github.com/henriklovhaug/md-tui/blob/${src.rev}/CHANGELOG.md";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
maintainers = with lib.maintainers; [
|
||||
GaetanLepage
|
||||
anas
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
mainProgram = "mdt";
|
||||
};
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, darwin
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mdt";
|
||||
version = "0.8.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "henriklovhaug";
|
||||
repo = "md-tui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3lNipCYhzqeAAUQZ2ajcOakNDlwSwbUUvP8Dtu6gBsI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-wY/FV0evsz+SZYTL63gReqsy/jfPE39eISs5N7vc3ZU=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ];
|
||||
|
||||
meta = {
|
||||
description = "Markdown renderer in the terminal";
|
||||
homepage = "https://github.com/henriklovhaug/md-tui";
|
||||
changelog = "https://github.com/henriklovhaug/md-tui/releases/tag/v${version}";
|
||||
license = lib.licenses.agpl3Only;
|
||||
mainProgram = "mdt";
|
||||
maintainers = with lib.maintainers; [ anas ];
|
||||
platforms = with lib.platforms; unix ++ windows;
|
||||
};
|
||||
}
|
||||
844
pkgs/by-name/me/measureme/Cargo.lock
generated
Normal file
844
pkgs/by-name/me/measureme/Cargo.lock
generated
Normal file
@ -0,0 +1,844 @@
|
||||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
version = 3
|
||||
|
||||
[[package]]
|
||||
name = "adler2"
|
||||
version = "2.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
|
||||
|
||||
[[package]]
|
||||
name = "ahash"
|
||||
version = "0.8.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"getrandom",
|
||||
"once_cell",
|
||||
"version_check",
|
||||
"zerocopy",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "analyzeme"
|
||||
version = "12.0.0"
|
||||
dependencies = [
|
||||
"decodeme 10.1.3",
|
||||
"decodeme 12.0.0",
|
||||
"flate2",
|
||||
"measureme 10.1.3",
|
||||
"measureme 12.0.0",
|
||||
"memchr",
|
||||
"rustc-hash",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "anstream"
|
||||
version = "0.6.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
|
||||
dependencies = [
|
||||
"anstyle",
|
||||
"anstyle-parse",
|
||||
"anstyle-query",
|
||||
"anstyle-wincon",
|
||||
"colorchoice",
|
||||
"is_terminal_polyfill",
|
||||
"utf8parse",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "anstyle"
|
||||
version = "1.0.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
|
||||
|
||||
[[package]]
|
||||
name = "anstyle-parse"
|
||||
version = "0.2.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
|
||||
dependencies = [
|
||||
"utf8parse",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "anstyle-query"
|
||||
version = "1.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
|
||||
dependencies = [
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "anstyle-wincon"
|
||||
version = "3.0.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
|
||||
dependencies = [
|
||||
"anstyle",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "arrayvec"
|
||||
version = "0.7.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
|
||||
|
||||
[[package]]
|
||||
name = "autocfg"
|
||||
version = "1.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "2.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
|
||||
|
||||
[[package]]
|
||||
name = "bytemuck"
|
||||
version = "1.17.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2"
|
||||
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "4.5.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019"
|
||||
dependencies = [
|
||||
"clap_builder",
|
||||
"clap_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap_builder"
|
||||
version = "4.5.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6"
|
||||
dependencies = [
|
||||
"anstream",
|
||||
"anstyle",
|
||||
"clap_lex",
|
||||
"strsim",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap_derive"
|
||||
version = "4.5.13"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap_lex"
|
||||
version = "0.7.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
|
||||
|
||||
[[package]]
|
||||
name = "colorchoice"
|
||||
version = "1.0.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
|
||||
|
||||
[[package]]
|
||||
name = "crc32fast"
|
||||
version = "1.4.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crox"
|
||||
version = "12.0.0"
|
||||
dependencies = [
|
||||
"analyzeme",
|
||||
"clap",
|
||||
"measureme 12.0.0",
|
||||
"rustc-hash",
|
||||
"serde",
|
||||
"serde_json",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "csv"
|
||||
version = "1.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe"
|
||||
dependencies = [
|
||||
"csv-core",
|
||||
"itoa",
|
||||
"ryu",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "csv-core"
|
||||
version = "0.1.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "decodeme"
|
||||
version = "10.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8907b810935b1fc70e90f415d88e5e3fb1fc0d17058c7da49d5e294eab89decf"
|
||||
dependencies = [
|
||||
"measureme 10.1.3",
|
||||
"memchr",
|
||||
"rustc-hash",
|
||||
"serde",
|
||||
"serde_json",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "decodeme"
|
||||
version = "12.0.0"
|
||||
dependencies = [
|
||||
"measureme 12.0.0",
|
||||
"memchr",
|
||||
"rustc-hash",
|
||||
"serde",
|
||||
"serde_json",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "dirs-next"
|
||||
version = "2.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"dirs-sys-next",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "dirs-sys-next"
|
||||
version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"redox_users",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "encode_unicode"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
|
||||
|
||||
[[package]]
|
||||
name = "flamegraph"
|
||||
version = "12.0.0"
|
||||
dependencies = [
|
||||
"analyzeme",
|
||||
"clap",
|
||||
"inferno",
|
||||
"measureme 12.0.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "flate2"
|
||||
version = "1.0.33"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
|
||||
dependencies = [
|
||||
"crc32fast",
|
||||
"miniz_oxide",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.2.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"wasi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "heck"
|
||||
version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
|
||||
|
||||
[[package]]
|
||||
name = "hermit-abi"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
|
||||
|
||||
[[package]]
|
||||
name = "inferno"
|
||||
version = "0.11.21"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "232929e1d75fe899576a3d5c7416ad0d88dbfbb3c3d6aa00873a7408a50ddb88"
|
||||
dependencies = [
|
||||
"ahash",
|
||||
"is-terminal",
|
||||
"itoa",
|
||||
"log",
|
||||
"num-format",
|
||||
"once_cell",
|
||||
"quick-xml",
|
||||
"rgb",
|
||||
"str_stack",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "is-terminal"
|
||||
version = "0.4.13"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b"
|
||||
dependencies = [
|
||||
"hermit-abi",
|
||||
"libc",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "is_terminal_polyfill"
|
||||
version = "1.70.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
|
||||
|
||||
[[package]]
|
||||
name = "itoa"
|
||||
version = "1.0.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
|
||||
|
||||
[[package]]
|
||||
name = "lazy_static"
|
||||
version = "1.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.158"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
|
||||
|
||||
[[package]]
|
||||
name = "libredox"
|
||||
version = "0.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "lock_api"
|
||||
version = "0.4.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"scopeguard",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "log"
|
||||
version = "0.4.22"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
|
||||
|
||||
[[package]]
|
||||
name = "measureme"
|
||||
version = "10.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4f0c6afa424b30bee598dc5e8116cd01359bc57919cb10ac38cf9e0914f16c0b"
|
||||
dependencies = [
|
||||
"log",
|
||||
"memmap2",
|
||||
"parking_lot",
|
||||
"perf-event-open-sys",
|
||||
"rustc-hash",
|
||||
"smallvec",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "measureme"
|
||||
version = "12.0.0"
|
||||
dependencies = [
|
||||
"log",
|
||||
"memmap2",
|
||||
"parking_lot",
|
||||
"perf-event-open-sys",
|
||||
"rustc-hash",
|
||||
"smallvec",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "memchr"
|
||||
version = "2.7.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
|
||||
|
||||
[[package]]
|
||||
name = "memmap2"
|
||||
version = "0.2.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "723e3ebdcdc5c023db1df315364573789f8857c11b631a2fdfad7c00f5c046b4"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "miniz_oxide"
|
||||
version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
|
||||
dependencies = [
|
||||
"adler2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "mmedit"
|
||||
version = "12.0.0"
|
||||
dependencies = [
|
||||
"clap",
|
||||
"decodeme 12.0.0",
|
||||
"measureme 12.0.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "mmview"
|
||||
version = "12.0.0"
|
||||
dependencies = [
|
||||
"analyzeme",
|
||||
"clap",
|
||||
"measureme 12.0.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-format"
|
||||
version = "0.4.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3"
|
||||
dependencies = [
|
||||
"arrayvec",
|
||||
"itoa",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "once_cell"
|
||||
version = "1.19.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
|
||||
|
||||
[[package]]
|
||||
name = "parking_lot"
|
||||
version = "0.12.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
|
||||
dependencies = [
|
||||
"lock_api",
|
||||
"parking_lot_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "parking_lot_core"
|
||||
version = "0.9.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"redox_syscall",
|
||||
"smallvec",
|
||||
"windows-targets",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "perf-event-open-sys"
|
||||
version = "3.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b29be2ba35c12c6939f6bc73187f728bba82c3c062ecdc5fa90ea739282a1f58"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "prettytable-rs"
|
||||
version = "0.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "eea25e07510aa6ab6547308ebe3c036016d162b8da920dbb079e3ba8acf3d95a"
|
||||
dependencies = [
|
||||
"csv",
|
||||
"encode_unicode",
|
||||
"is-terminal",
|
||||
"lazy_static",
|
||||
"term",
|
||||
"unicode-width",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.86"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quick-xml"
|
||||
version = "0.26.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.37"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "redox_syscall"
|
||||
version = "0.5.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "redox_users"
|
||||
version = "0.4.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
|
||||
dependencies = [
|
||||
"getrandom",
|
||||
"libredox",
|
||||
"thiserror",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rgb"
|
||||
version = "0.8.50"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rustc-hash"
|
||||
version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
|
||||
|
||||
[[package]]
|
||||
name = "rustversion"
|
||||
version = "1.0.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
|
||||
|
||||
[[package]]
|
||||
name = "ryu"
|
||||
version = "1.0.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
|
||||
|
||||
[[package]]
|
||||
name = "scopeguard"
|
||||
version = "1.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.209"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.209"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "1.0.127"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
|
||||
dependencies = [
|
||||
"itoa",
|
||||
"memchr",
|
||||
"ryu",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "smallvec"
|
||||
version = "1.13.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
|
||||
|
||||
[[package]]
|
||||
name = "stack_collapse"
|
||||
version = "12.0.0"
|
||||
dependencies = [
|
||||
"analyzeme",
|
||||
"clap",
|
||||
"measureme 12.0.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "str_stack"
|
||||
version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9091b6114800a5f2141aee1d1b9d6ca3592ac062dc5decb3764ec5895a47b4eb"
|
||||
|
||||
[[package]]
|
||||
name = "strsim"
|
||||
version = "0.11.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
|
||||
|
||||
[[package]]
|
||||
name = "summarize"
|
||||
version = "12.0.0"
|
||||
dependencies = [
|
||||
"analyzeme",
|
||||
"clap",
|
||||
"measureme 12.0.0",
|
||||
"prettytable-rs",
|
||||
"rustc-hash",
|
||||
"serde",
|
||||
"serde_json",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.77"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "term"
|
||||
version = "0.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f"
|
||||
dependencies = [
|
||||
"dirs-next",
|
||||
"rustversion",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror"
|
||||
version = "1.0.63"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
|
||||
dependencies = [
|
||||
"thiserror-impl",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror-impl"
|
||||
version = "1.0.63"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "unicode-ident"
|
||||
version = "1.0.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-width"
|
||||
version = "0.1.13"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
|
||||
|
||||
[[package]]
|
||||
name = "utf8parse"
|
||||
version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
|
||||
|
||||
[[package]]
|
||||
name = "version_check"
|
||||
version = "0.9.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
|
||||
|
||||
[[package]]
|
||||
name = "wasi"
|
||||
version = "0.11.0+wasi-snapshot-preview1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
|
||||
|
||||
[[package]]
|
||||
name = "winapi"
|
||||
version = "0.3.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
|
||||
dependencies = [
|
||||
"winapi-i686-pc-windows-gnu",
|
||||
"winapi-x86_64-pc-windows-gnu",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "winapi-i686-pc-windows-gnu"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
||||
|
||||
[[package]]
|
||||
name = "winapi-x86_64-pc-windows-gnu"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
||||
|
||||
[[package]]
|
||||
name = "windows-sys"
|
||||
version = "0.52.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
|
||||
dependencies = [
|
||||
"windows-targets",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-targets"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
|
||||
dependencies = [
|
||||
"windows_aarch64_gnullvm",
|
||||
"windows_aarch64_msvc",
|
||||
"windows_i686_gnu",
|
||||
"windows_i686_gnullvm",
|
||||
"windows_i686_msvc",
|
||||
"windows_x86_64_gnu",
|
||||
"windows_x86_64_gnullvm",
|
||||
"windows_x86_64_msvc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_gnullvm"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnullvm"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnullvm"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
|
||||
|
||||
[[package]]
|
||||
name = "zerocopy"
|
||||
version = "0.7.35"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
|
||||
dependencies = [
|
||||
"zerocopy-derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "zerocopy-derive"
|
||||
version = "0.7.35"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
@ -1,23 +1,21 @@
|
||||
{ lib, fetchFromGitHub, rustPlatform }:
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "measureme";
|
||||
version = "11.0.1";
|
||||
version = "12.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-lang";
|
||||
repo = "measureme";
|
||||
rev = version;
|
||||
hash = "sha256-p8XSe/LyHrEHEuxe1uK0Iy1YoJFw/jWtFvTDMhJMmnM=";
|
||||
hash = "sha256-Zgl8iyBDVwqZnbfqC06DMuo0S/hV6pl812hkiovmS+I=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"analyzeme-9.2.0" = "sha256-YOZiux4ouWBToGFx0+fiqjcyrnSjwc+8Qfi2rLGT/18=";
|
||||
"decodeme-10.1.2" = "sha256-20PJnBS6TCnltRuCiYkHKJcivKGDDQUrBc70hAX89bc=";
|
||||
};
|
||||
};
|
||||
cargoLock.lockFile = ./Cargo.lock;
|
||||
|
||||
postPatch = ''
|
||||
ln -s ${./Cargo.lock} Cargo.lock
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mihomo";
|
||||
version = "1.18.7";
|
||||
version = "1.18.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MetaCubeX";
|
||||
repo = "mihomo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+9tVkMOOGwdmOXhoXanOpp8/7TEGGLR2aTeOsw+FzKc=";
|
||||
hash = "sha256-UImkDjfNbC59SkoR0SsmlxGO5UPjMA0IURj+2+zgsVQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-wbJgJY1EH3ajmoWXWRCSpD2C0eknajkwD1DaQz2EsUU=";
|
||||
vendorHash = "sha256-Lrd+og6bOopbV/JDwfWY4X+D/2iOCMgDA+JlHJlxwXE=";
|
||||
|
||||
excludedPackages = [ "./test" ];
|
||||
|
||||
|
||||
2
pkgs/by-name/mo/mouse-actions-gui/80-mouse-actions.rules
Normal file
2
pkgs/by-name/mo/mouse-actions-gui/80-mouse-actions.rules
Normal file
@ -0,0 +1,2 @@
|
||||
KERNEL=="uinput", SUBSYSTEM=="misc", TAG+="uaccess", OPTIONS+="static_node=uinput"
|
||||
KERNEL=="/dev/input/event*", SUBSYSTEM=="misc", TAG+="uaccess", OPTIONS+="static_node=uinput"
|
||||
97
pkgs/by-name/mo/mouse-actions-gui/package.nix
Normal file
97
pkgs/by-name/mo/mouse-actions-gui/package.nix
Normal file
@ -0,0 +1,97 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
|
||||
npmHooks,
|
||||
fetchNpmDeps,
|
||||
nodejs,
|
||||
|
||||
rustPlatform,
|
||||
cargo,
|
||||
rustc,
|
||||
cargo-tauri,
|
||||
|
||||
pkg-config,
|
||||
wrapGAppsHook3,
|
||||
libXtst,
|
||||
libevdev,
|
||||
gtk3,
|
||||
libsoup,
|
||||
webkitgtk,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mouse-actions-gui";
|
||||
version = "0.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jersou";
|
||||
repo = "mouse-actions";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-02E4HrKIoBV3qZPVH6Tjz9Bv/mh5C8amO1Ilmd+YO5g=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/config-editor";
|
||||
|
||||
nativeBuildInputs = [
|
||||
npmHooks.npmConfigHook
|
||||
nodejs
|
||||
rustPlatform.cargoSetupHook
|
||||
cargo
|
||||
rustc
|
||||
cargo-tauri
|
||||
pkg-config
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
# Base deps
|
||||
libXtst
|
||||
libevdev
|
||||
|
||||
# Tauri deps
|
||||
gtk3
|
||||
libsoup
|
||||
webkitgtk
|
||||
];
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit (finalAttrs) src sourceRoot;
|
||||
hash = "sha256-Rnr5jRupdUu6mIsWvdN6AnQnsxB5h31n/24pYslGs5g=";
|
||||
};
|
||||
|
||||
cargoRoot = "src-tauri";
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}";
|
||||
inherit (finalAttrs) src;
|
||||
sourceRoot = "${finalAttrs.sourceRoot}/${finalAttrs.cargoRoot}";
|
||||
hash = "sha256-VQFRatnxzmywAiMLfkVgB7g8AFoqfWFYjt/vezpE1o8=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
cargo-tauri build -b deb
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm644 ${./80-mouse-actions.rules} $out/etc/udev/rules.d/80-mouse-actions.rules
|
||||
cp -r src-tauri/target/release/bundle/deb/*/data/usr/* $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/jersou/mouse-actions/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
description = "Mouse event based command executor, a mix between Easystroke and Comiz edge commands";
|
||||
homepage = "https://github.com/jersou/mouse-actions";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "mouse-actions-gui";
|
||||
maintainers = with lib.maintainers; [ tomasajt ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
48
pkgs/by-name/ne/netfetch/package.nix
Normal file
48
pkgs/by-name/ne/netfetch/package.nix
Normal file
@ -0,0 +1,48 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
stdenv,
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "netfetch";
|
||||
version = "5.2.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deggja";
|
||||
repo = "netfetch";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-N3wKpWdG92cXH0TwAkcsld9TRrfPRkbw0uZY/X4d+xk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-/Em3hx5tiQjThLBPJDHGsqxUV3eXeymJ5pY9c601OW0=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
subPackages = [ "backend" ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/deggja/netfetch/backend/cmd.Version=${version}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
mv $out/bin/backend $out/bin/$pname
|
||||
installShellCompletion --cmd $pname \
|
||||
--bash <($out/bin/$pname completion bash) \
|
||||
--fish <($out/bin/$pname completion fish) \
|
||||
--zsh <($out/bin/$pname completion zsh)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/deggja/netfetch";
|
||||
description = "Kubernetes tool for scanning clusters for network policies and identifying unprotected workloads";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "netfetch";
|
||||
maintainers = with lib.maintainers; [ banh-canh ];
|
||||
};
|
||||
}
|
||||
@ -25,6 +25,8 @@ buildDotnetModule (finalAttrs: {
|
||||
hash = "sha256-FzQphMhiC1g+6qmk/R1v4rq2ldy35NcaWm0RR1UlwLA=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = false;
|
||||
|
||||
# If the whole solution is published, there seems to be a race condition where
|
||||
# it will sometimes publish the wrong version of a dependent assembly, for
|
||||
# example: Microsoft.Extensions.Hosting.dll 6.0.0 instead of 8.0.0.
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "nuclei-templates";
|
||||
version = "9.9.3";
|
||||
version = "9.9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "nuclei-templates";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Iw2TbDQWRy3W7eaybtGG3C+RaciKfjWpYblrCPa8SCE=";
|
||||
hash = "sha256-1o9FvE8wuvswTXbVncTr77p7oWg0c2bVQQZvOxsgxFw=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
haskell,
|
||||
haskellPackages,
|
||||
lib,
|
||||
stdenv,
|
||||
}:
|
||||
let
|
||||
inherit (haskell.lib.compose) overrideCabal justStaticExecutables;
|
||||
@ -25,5 +26,7 @@ let
|
||||
in
|
||||
lib.pipe raw-pkg [
|
||||
(overrideCabal overrides)
|
||||
justStaticExecutables
|
||||
# FIXME: eliminate all erroneous references on aarch64-darwin manually,
|
||||
# see https://github.com/NixOS/nixpkgs/issues/318013
|
||||
(if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then lib.id else justStaticExecutables)
|
||||
]
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "oink";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rlado";
|
||||
repo = "oink";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ojvuA5IlayPMNajl2+a4lx8NU06Da0vp9TJHCQVMtlo=";
|
||||
hash = "sha256-XbS4DPNPYfIEnATIG0u+7HPQmtX5rvl77j/3mdVB//8=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user