Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
+6
-3
@@ -55,10 +55,13 @@ trim_trailing_whitespace = unset
|
||||
[*.lock]
|
||||
indent_size = unset
|
||||
|
||||
# trailing whitespace is an actual syntax element of classic Markdown/
|
||||
# CommonMark to enforce a line break
|
||||
# Although Markdown/CommonMark allows using two trailing spaces to denote
|
||||
# a hard line break, we do not use that feature in nixpkgs since
|
||||
# it forces the surrounding paragraph to become a <literallayout> which
|
||||
# does not wrap reasonably.
|
||||
# Instead of a hard line break, start a new paragraph by inserting a blank line.
|
||||
[*.md]
|
||||
trim_trailing_whitespace = unset
|
||||
trim_trailing_whitespace = true
|
||||
|
||||
# binaries
|
||||
[*.nib]
|
||||
|
||||
@@ -38,10 +38,6 @@ jobs:
|
||||
into: staging-next-22.11
|
||||
- from: staging-next-22.11
|
||||
into: staging-22.11
|
||||
- from: release-22.05
|
||||
into: staging-next-22.05
|
||||
- from: staging-next-22.05
|
||||
into: staging-22.05
|
||||
name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }}
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
Copyright (c) 2003-2022 Eelco Dolstra and the Nixpkgs/NixOS contributors
|
||||
Copyright (c) 2003-2023 Eelco Dolstra and the Nixpkgs/NixOS contributors
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of this software and associated documentation files (the
|
||||
|
||||
@@ -20,7 +20,7 @@ Features are separated in various sections depending on if you opt for a Nix-sto
|
||||
### Common
|
||||
|
||||
- arbitrary NixOS configuration
|
||||
- automatic or bound disk size: `diskSize` parameter, `additionalSpace` can be set when `diskSize` is `auto` to add a constant of disk space
|
||||
- automatic or bound disk size: `diskSize` parameter, `additionalSpace` can be set when `diskSize` is `auto` to add a constant of disk space
|
||||
- multiple partition table layouts: EFI, legacy, legacy + GPT, hybrid, none through `partitionTableType` parameter
|
||||
- OVMF or EFI firmwares and variables templates can be customized
|
||||
- root filesystem `fsType` can be customized to whatever `mkfs.${fsType}` exist during operations
|
||||
|
||||
@@ -62,7 +62,7 @@ runCommand "example" {
|
||||
'';
|
||||
```
|
||||
|
||||
While `testBuildFailure` is designed to keep changes to the original builder's
|
||||
While `testBuildFailure` is designed to keep changes to the original builder's
|
||||
environment to a minimum, some small changes are inevitable.
|
||||
|
||||
- The file `$TMPDIR/testBuildFailure.log` is present. It should not be deleted.
|
||||
|
||||
@@ -16,7 +16,8 @@ In the following is an example expression using `buildGoModule`, the following a
|
||||
`vendorHash` can also be set to `null`.
|
||||
In that case, rather than fetching the dependencies and vendoring them, the dependencies vendored in the source repo will be used.
|
||||
|
||||
To avoid updating this field when dependencies change, run `go mod vendor` in your source repo and set `vendorHash = null;`
|
||||
To avoid updating this field when dependencies change, run `go mod vendor` in your source repo and set `vendorHash = null;`
|
||||
|
||||
To obtain the actual hash, set `vendorHash = lib.fakeSha256;` and run the build ([more details here](#sec-source-hashes)).
|
||||
- `proxyVendor`: Fetches (go mod download) and proxies the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build or if any dependency has case-insensitive conflicts which will produce platform dependant `vendorHash` checksums.
|
||||
|
||||
|
||||
@@ -63,7 +63,7 @@ You should prefer `overrideAttrs` in almost all cases, see its documentation for
|
||||
:::
|
||||
|
||||
::: {.warning}
|
||||
Do not use this function in Nixpkgs as it evaluates a Derivation before modifying it, which breaks package abstraction and removes error-checking of function arguments. In addition, this evaluation-per-function application incurs a performance penalty, which can become a problem if many overrides are used. It is only intended for ad-hoc customisation, such as in `~/.config/nixpkgs/config.nix`.
|
||||
Do not use this function in Nixpkgs as it evaluates a derivation before modifying it, which breaks package abstraction. In addition, this evaluation-per-function application incurs a performance penalty, which can become a problem if many overrides are used. It is only intended for ad-hoc customisation, such as in `~/.config/nixpkgs/config.nix`.
|
||||
:::
|
||||
|
||||
The function `overrideDerivation` creates a new derivation based on an existing one by overriding the original's attributes with the attribute set produced by the specified function. This function is available on all derivations defined using the `makeOverridable` function. Most standard derivation-producing functions, such as `stdenv.mkDerivation`, are defined using this function, which means most packages in the nixpkgs expression, `pkgs`, have this function.
|
||||
|
||||
@@ -27,11 +27,19 @@ rec {
|
||||
For another application, see build-support/vm, where this
|
||||
function is used to build arbitrary derivations inside a QEMU
|
||||
virtual machine.
|
||||
|
||||
Note that in order to preserve evaluation errors, the new derivation's
|
||||
outPath depends on the old one's, which means that this function cannot
|
||||
be used in circular situations when the old derivation also depends on the
|
||||
new one.
|
||||
|
||||
You should in general prefer `drv.overrideAttrs` over this function;
|
||||
see the nixpkgs manual for more information on overriding.
|
||||
*/
|
||||
overrideDerivation = drv: f:
|
||||
let
|
||||
newDrv = derivation (drv.drvAttrs // (f drv));
|
||||
in lib.flip (extendDerivation true) newDrv (
|
||||
in lib.flip (extendDerivation (builtins.seq drv.drvPath true)) newDrv (
|
||||
{ meta = drv.meta or {};
|
||||
passthru = if drv ? passthru then drv.passthru else {};
|
||||
}
|
||||
|
||||
+5
-3
@@ -63,7 +63,7 @@ let
|
||||
|
||||
inherit (builtins) add addErrorContext attrNames concatLists
|
||||
deepSeq elem elemAt filter genericClosure genList getAttr
|
||||
hasAttr head isAttrs isBool isInt isList isString length
|
||||
hasAttr head isAttrs isBool isInt isList isPath isString length
|
||||
lessThan listToAttrs pathExists readFile replaceStrings seq
|
||||
stringLength sub substring tail trace;
|
||||
inherit (self.trivial) id const pipe concat or and bitAnd bitOr bitXor
|
||||
@@ -96,14 +96,16 @@ let
|
||||
concatImapStringsSep makeSearchPath makeSearchPathOutput
|
||||
makeLibraryPath makeBinPath optionalString
|
||||
hasInfix hasPrefix hasSuffix stringToCharacters stringAsChars escape
|
||||
escapeShellArg escapeShellArgs isValidPosixName toShellVar toShellVars
|
||||
escapeShellArg escapeShellArgs
|
||||
isStorePath isStringLike
|
||||
isValidPosixName toShellVar toShellVars
|
||||
escapeRegex escapeXML replaceChars lowerChars
|
||||
upperChars toLower toUpper addContextFrom splitString
|
||||
removePrefix removeSuffix versionOlder versionAtLeast
|
||||
getName getVersion
|
||||
mesonOption mesonBool mesonEnable
|
||||
nameFromURL enableFeature enableFeatureAs withFeature
|
||||
withFeatureAs fixedWidthString fixedWidthNumber isStorePath
|
||||
withFeatureAs fixedWidthString fixedWidthNumber
|
||||
toInt toIntBase10 readPathsFromFile fileContents;
|
||||
inherit (self.stringsWithDeps) textClosureList textClosureMap
|
||||
noDepEntry fullDepEntry packEntry stringAfter;
|
||||
|
||||
+4
-2
@@ -289,7 +289,9 @@ rec {
|
||||
(This means fn is type Val -> String.) */
|
||||
allowPrettyValues ? false,
|
||||
/* If this option is true, the output is indented with newlines for attribute sets and lists */
|
||||
multiline ? true
|
||||
multiline ? true,
|
||||
/* Initial indentation level */
|
||||
indent ? ""
|
||||
}:
|
||||
let
|
||||
go = indent: v: with builtins;
|
||||
@@ -348,7 +350,7 @@ rec {
|
||||
};") v)
|
||||
+ outroSpace + "}"
|
||||
else abort "generators.toPretty: should never happen (v = ${v})";
|
||||
in go "";
|
||||
in go indent;
|
||||
|
||||
# PLIST handling
|
||||
toPlist = {}: v: let
|
||||
|
||||
+28
-6
@@ -18,6 +18,7 @@ rec {
|
||||
isInt
|
||||
isList
|
||||
isAttrs
|
||||
isPath
|
||||
isString
|
||||
match
|
||||
parseDrvName
|
||||
@@ -395,7 +396,7 @@ rec {
|
||||
*/
|
||||
toShellVar = name: value:
|
||||
lib.throwIfNot (isValidPosixName name) "toShellVar: ${name} is not a valid shell variable name" (
|
||||
if isAttrs value && ! isCoercibleToString value then
|
||||
if isAttrs value && ! isStringLike value then
|
||||
"declare -A ${name}=(${
|
||||
concatStringsSep " " (lib.mapAttrsToList (n: v:
|
||||
"[${escapeShellArg n}]=${escapeShellArg v}"
|
||||
@@ -798,10 +799,31 @@ rec {
|
||||
in lib.warnIf (!precise) "Imprecise conversion from float to string ${result}"
|
||||
result;
|
||||
|
||||
/* Check whether a value can be coerced to a string */
|
||||
isCoercibleToString = x:
|
||||
elem (typeOf x) [ "path" "string" "null" "int" "float" "bool" ] ||
|
||||
(isList x && lib.all isCoercibleToString x) ||
|
||||
/* Soft-deprecated function. While the original implementation is available as
|
||||
isConvertibleWithToString, consider using isStringLike instead, if suitable. */
|
||||
isCoercibleToString = lib.warnIf (lib.isInOldestRelease 2305)
|
||||
"lib.strings.isCoercibleToString is deprecated in favor of either isStringLike or isConvertibleWithToString. Only use the latter if it needs to return true for null, numbers, booleans and list of similarly coercibles."
|
||||
isConvertibleWithToString;
|
||||
|
||||
/* Check whether a list or other value can be passed to toString.
|
||||
|
||||
Many types of value are coercible to string this way, including int, float,
|
||||
null, bool, list of similarly coercible values.
|
||||
*/
|
||||
isConvertibleWithToString = x:
|
||||
isStringLike x ||
|
||||
elem (typeOf x) [ "null" "int" "float" "bool" ] ||
|
||||
(isList x && lib.all isConvertibleWithToString x);
|
||||
|
||||
/* Check whether a value can be coerced to a string.
|
||||
The value must be a string, path, or attribute set.
|
||||
|
||||
String-like values can be used without explicit conversion in
|
||||
string interpolations and in most functions that expect a string.
|
||||
*/
|
||||
isStringLike = x:
|
||||
isString x ||
|
||||
isPath x ||
|
||||
x ? outPath ||
|
||||
x ? __toString;
|
||||
|
||||
@@ -818,7 +840,7 @@ rec {
|
||||
=> false
|
||||
*/
|
||||
isStorePath = x:
|
||||
if !(isList x) && isCoercibleToString x then
|
||||
if isStringLike x then
|
||||
let str = toString x; in
|
||||
substring 0 1 str == "/"
|
||||
&& dirOf str == storeDir
|
||||
|
||||
+1
-1
@@ -179,7 +179,7 @@ rec {
|
||||
they take effect as soon as the oldest release reaches end of life. */
|
||||
oldestSupportedRelease =
|
||||
# Update on master only. Do not backport.
|
||||
2205;
|
||||
2211;
|
||||
|
||||
/* Whether a feature is supported in all supported releases (at the time of
|
||||
release branch-off, if applicable). See `oldestSupportedRelease`. */
|
||||
|
||||
+3
-3
@@ -54,7 +54,7 @@ let
|
||||
concatStringsSep
|
||||
escapeNixString
|
||||
hasInfix
|
||||
isCoercibleToString
|
||||
isStringLike
|
||||
;
|
||||
inherit (lib.trivial)
|
||||
boolToString
|
||||
@@ -227,7 +227,7 @@ rec {
|
||||
merge = loc: defs:
|
||||
let
|
||||
getType = value:
|
||||
if isAttrs value && isCoercibleToString value
|
||||
if isAttrs value && isStringLike value
|
||||
then "stringCoercibleSet"
|
||||
else builtins.typeOf value;
|
||||
|
||||
@@ -479,7 +479,7 @@ rec {
|
||||
path = mkOptionType {
|
||||
name = "path";
|
||||
descriptionClass = "noun";
|
||||
check = x: isCoercibleToString x && builtins.substring 0 1 (toString x) == "/";
|
||||
check = x: isStringLike x && builtins.substring 0 1 (toString x) == "/";
|
||||
merge = mergeEqualOption;
|
||||
};
|
||||
|
||||
|
||||
@@ -16068,7 +16068,7 @@
|
||||
githubId = 17733984;
|
||||
};
|
||||
wesleyjrz = {
|
||||
email = "wesleyjr2002@gmail.com";
|
||||
email = "dev@wesleyjrz.com";
|
||||
name = "Wesley V. Santos Jr.";
|
||||
github = "wesleyjrz";
|
||||
githubId = 60184588;
|
||||
|
||||
@@ -16,8 +16,20 @@
|
||||
</para>
|
||||
<itemizedlist>
|
||||
<listitem>
|
||||
<literallayout>Nix has been updated from 2.3 to 2.8. This mainly brings experimental support for Flakes, but also marks the <literal>nix</literal> command as experimental which now has to be enabled via the configuration explicitly. For more information and instructions for upgrades, see the relase notes for <link xlink:href="https://nixos.org/manual/nix/stable/release-notes/rl-2.4.html">nix-2.4</link>,
|
||||
<link xlink:href="https://nixos.org/manual/nix/stable/release-notes/rl-2.5.html">nix-2.5</link>, <link xlink:href="https://nixos.org/manual/nix/stable/release-notes/rl-2.6.html">nix-2.6</link>, <link xlink:href="https://nixos.org/manual/nix/stable/release-notes/rl-2.7.html">nix-2.7</link> and <link xlink:href="https://nixos.org/manual/nix/stable/release-notes/rl-2.8.html">nix-2.8</link></literallayout>
|
||||
<para>
|
||||
Nix has been updated from 2.3 to 2.8. This mainly brings
|
||||
experimental support for Flakes, but also marks the
|
||||
<literal>nix</literal> command as experimental which now has
|
||||
to be enabled via the configuration explicitly. For more
|
||||
information and instructions for upgrades, see the relase
|
||||
notes for
|
||||
<link xlink:href="https://nixos.org/manual/nix/stable/release-notes/rl-2.4.html">nix-2.4</link>,
|
||||
<link xlink:href="https://nixos.org/manual/nix/stable/release-notes/rl-2.5.html">nix-2.5</link>,
|
||||
<link xlink:href="https://nixos.org/manual/nix/stable/release-notes/rl-2.6.html">nix-2.6</link>,
|
||||
<link xlink:href="https://nixos.org/manual/nix/stable/release-notes/rl-2.7.html">nix-2.7</link>
|
||||
and
|
||||
<link xlink:href="https://nixos.org/manual/nix/stable/release-notes/rl-2.8.html">nix-2.8</link>
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
|
||||
@@ -9,8 +9,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
- Nix has been updated from 2.3 to 2.8. This mainly brings experimental support
|
||||
for Flakes, but also marks the `nix` command as experimental which now has to
|
||||
be enabled via the configuration explicitly. For more information and
|
||||
instructions for upgrades, see the
|
||||
relase notes for [nix-2.4](https://nixos.org/manual/nix/stable/release-notes/rl-2.4.html),
|
||||
instructions for upgrades, see the
|
||||
relase notes for [nix-2.4](https://nixos.org/manual/nix/stable/release-notes/rl-2.4.html),
|
||||
[nix-2.5](https://nixos.org/manual/nix/stable/release-notes/rl-2.5.html),
|
||||
[nix-2.6](https://nixos.org/manual/nix/stable/release-notes/rl-2.6.html),
|
||||
[nix-2.7](https://nixos.org/manual/nix/stable/release-notes/rl-2.7.html) and
|
||||
@@ -30,7 +30,7 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
- Systemd has been upgraded to the version 250.
|
||||
|
||||
- Pulseaudio has been updated to version 15.0 and now optionally
|
||||
- Pulseaudio has been updated to version 15.0 and now optionally
|
||||
[supports additional Bluetooth audio codecs](https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/15.0/#supportforldacandaptxbluetoothcodecsplussbcxqsbcwithhigher-qualityparameters)
|
||||
such as aptX or LDAC, with codec switching available in `pavucontrol`. This
|
||||
feature is disabled by default, but can be enabled with the option
|
||||
@@ -50,7 +50,7 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
settings for many certificates at once. This also opens up the option to use
|
||||
DNS-01 validation when using `enableACME` web server virtual hosts (e.g.
|
||||
`services.nginx.virtualHosts.*.enableACME`).
|
||||
|
||||
|
||||
## New Services {#sec-release-22.05-new-services}
|
||||
|
||||
- [1password](https://1password.com/), command-lines and graphic interface for 1Password. Available as [programs._1password](#opt-programs._1password.enable) and [programs._1password-gui](#opt-programs._1password.enable).
|
||||
@@ -743,11 +743,11 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
- The configuration portion of the `nix-daemon` module has been reworked and exposed as [nix.settings](options.html#opt-nix-settings):
|
||||
* Legacy options have been mapped to the corresponding options under under [nix.settings](options.html#opt-nix.settings) and will be deprecated when NixOS 21.11 reaches end of life.
|
||||
* [nix.buildMachines.publicHostKey](options.html#opt-nix.buildMachines.publicHostKey) has been added.
|
||||
|
||||
|
||||
- [`kops`](https://kops.sigs.k8s.io) defaults to 1.23.2, which will enable [Instance Metadata Service Version 2](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-service.html) and require tokens on new clusters with Kubernetes >= 1.22. This will increase security by default, but may break some types of workloads. The default behaviour for `spec.kubeDNS.nodeLocalDNS.forwardToKubeDNS` has changed from `true` to `false`. Cilium now has `disable-cnp-status-updates: true` by default. Set this to false if you rely on the CiliumNetworkPolicy status fields. Support for Kubernetes 1.17, the Lyft CNI, Weave CNI on Kubernetes >= 1.23, CentOS 7 and 8, Debian 9, RHEL 7, and Ubuntu 16.05 (Xenial) has been removed. See the [1.22 release notes](https://kops.sigs.k8s.io/releases/1.22-notes/) and [1.23 release notes](https://kops.sigs.k8s.io/releases/1.23-notes/) for more details, including other significant changes.
|
||||
|
||||
- Mattermost has been upgraded to extended support version 6.3 as the previously
|
||||
packaged extended support version 5.37 is [reaching end of life](https://docs.mattermost.com/upgrade/extended-support-release.html).
|
||||
packaged extended support version 5.37 is [reaching end of life](https://docs.mattermost.com/upgrade/extended-support-release.html).
|
||||
Migration may take some time, see the [changelog](https://docs.mattermost.com/install/self-managed-changelog.html#release-v6-3-extended-support-release)
|
||||
and [important upgrade notes](https://docs.mattermost.com/upgrade/important-upgrade-notes.html).
|
||||
|
||||
@@ -762,14 +762,14 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
By default auto-upgrade will now run immediately if it would have been triggered at least
|
||||
once during the time when the timer was inactive.
|
||||
|
||||
- Mastodon now uses `services.redis.servers` to start a new redis server, instead of using a global redis server.
|
||||
- Mastodon now uses `services.redis.servers` to start a new redis server, instead of using a global redis server.
|
||||
This improves compatibility with other services that use redis.
|
||||
|
||||
Note that this will recreate the redis database, although according to the [Mastodon docs](https://docs.joinmastodon.org/admin/backups/),
|
||||
|
||||
Note that this will recreate the redis database, although according to the [Mastodon docs](https://docs.joinmastodon.org/admin/backups/),
|
||||
this is almost harmless:
|
||||
> Losing the Redis database is almost harmless: The only irrecoverable data will be the contents of the Sidekiq queues and scheduled retries of previously failed jobs.
|
||||
> Losing the Redis database is almost harmless: The only irrecoverable data will be the contents of the Sidekiq queues and scheduled retries of previously failed jobs.
|
||||
> The home and list feeds are stored in Redis, but can be regenerated with tootctl.
|
||||
|
||||
|
||||
If you do want to save the redis database, you can use the following commands:
|
||||
```bash
|
||||
redis-cli save
|
||||
@@ -980,7 +980,7 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
or `wl*` with priority 99 (which means that it doesn't have any effect if such an interface is matched
|
||||
by a `.network-`unit with a lower priority). In case of scripted networking, no behavior
|
||||
was changed.
|
||||
|
||||
|
||||
- The new [`postgresqlTestHook`](https://nixos.org/manual/nixpkgs/stable/#sec-postgresqlTestHook) runs a PostgreSQL server for the duration of package checks.
|
||||
|
||||
- `zfs` was updated from 2.1.4 to 2.1.5, enabling it to be used with Linux kernel 5.18.
|
||||
|
||||
@@ -38,7 +38,7 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
- `carnix` and `cratesIO` has been removed due to being unmaintained, use alternatives such as [naersk](https://github.com/nix-community/naersk) and [crate2nix](https://github.com/kolloch/crate2nix) instead.
|
||||
|
||||
- `borgbackup` module now has an option for inhibiting system sleep while backups are running, defaulting to off (not inhibiting sleep), available as [`services.borgbackup.jobs.<name>.inhibitsSleep`](#opt-services.borgbackup.jobs._name_.inhibitsSleep).
|
||||
- `borgbackup` module now has an option for inhibiting system sleep while backups are running, defaulting to off (not inhibiting sleep), available as [`services.borgbackup.jobs.<name>.inhibitsSleep`](#opt-services.borgbackup.jobs._name_.inhibitsSleep).
|
||||
|
||||
- The EC2 image module no longer fetches instance metadata in stage-1. This results in a significantly smaller initramfs, since network drivers no longer need to be included, and faster boots, since metadata fetching can happen in parallel with startup of other services.
|
||||
This breaks services which rely on metadata being present by the time stage-2 is entered. Anything which reads EC2 metadata from `/etc/ec2-metadata` should now have an `after` dependency on `fetch-ec2-metadata.service`
|
||||
|
||||
@@ -101,7 +101,7 @@ chroot_add_resolv_conf "$mountPoint" || echo "$0: failed to set up resolv.conf"
|
||||
LOCALE_ARCHIVE="$system/sw/lib/locale/locale-archive" IN_NIXOS_ENTER=1 chroot "$mountPoint" "$system/activate" 1>&2 || true
|
||||
|
||||
# Create /tmp
|
||||
chroot "$mountPoint" systemd-tmpfiles --create --remove --exclude-prefix=/dev 1>&2 || true
|
||||
chroot "$mountPoint" "$system/sw/bin/systemd-tmpfiles" --create --remove --exclude-prefix=/dev 1>&2 || true
|
||||
)
|
||||
|
||||
unset TMPDIR
|
||||
|
||||
@@ -42,7 +42,7 @@ let
|
||||
else if isDerivation v then toString v
|
||||
else if builtins.isPath v then toString v
|
||||
else if isString v then v
|
||||
else if strings.isCoercibleToString v then toString v
|
||||
else if strings.isConvertibleWithToString v then toString v
|
||||
else abort "The nix conf value: ${toPretty {} v} can not be encoded";
|
||||
|
||||
mkKeyValue = k: v: "${escape [ "=" ] k} = ${mkValueString v}";
|
||||
@@ -792,7 +792,10 @@ in
|
||||
fi
|
||||
'';
|
||||
|
||||
nix.nrBuildUsers = mkDefault (max 32 (if cfg.settings.max-jobs == "auto" then 0 else cfg.settings.max-jobs));
|
||||
nix.nrBuildUsers = mkDefault (
|
||||
if cfg.settings.auto-allocate-uids or false then 0
|
||||
else max 32 (if cfg.settings.max-jobs == "auto" then 0 else cfg.settings.max-jobs)
|
||||
);
|
||||
|
||||
users.users = nixbldUsers;
|
||||
|
||||
|
||||
@@ -302,13 +302,14 @@ in
|
||||
mkConfigFile = pkgs.writeText "cloudflared.yml" (builtins.toJSON fullConfig);
|
||||
in
|
||||
nameValuePair "cloudflared-tunnel-${name}" ({
|
||||
after = [ "network.target" ];
|
||||
after = [ "network.target" "network-online.target" ];
|
||||
wants = [ "network.target" "network-online.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
ExecStart = "${cfg.package}/bin/cloudflared tunnel --config=${mkConfigFile} --no-autoupdate run";
|
||||
Restart = "always";
|
||||
Restart = "on-failure";
|
||||
};
|
||||
})
|
||||
)
|
||||
|
||||
@@ -273,7 +273,11 @@ let
|
||||
after = [ "network.target" "network-online.target" ];
|
||||
wantedBy = optional values.autostart "multi-user.target";
|
||||
environment.DEVICE = name;
|
||||
path = [ pkgs.kmod pkgs.wireguard-tools config.networking.resolvconf.package ];
|
||||
path = [
|
||||
pkgs.wireguard-tools
|
||||
config.networking.firewall.package # iptables or nftables
|
||||
config.networking.resolvconf.package # openresolv or systemd
|
||||
];
|
||||
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
@@ -281,7 +285,7 @@ let
|
||||
};
|
||||
|
||||
script = ''
|
||||
${optionalString (!config.boot.isContainer) "modprobe wireguard"}
|
||||
${optionalString (!config.boot.isContainer) "${pkgs.kmod}/bin/modprobe wireguard"}
|
||||
${optionalString (values.configFile != null) ''
|
||||
cp ${values.configFile} ${configPath}
|
||||
''}
|
||||
|
||||
@@ -18,7 +18,7 @@ let
|
||||
in
|
||||
lib.concatStrings (lib.mapAttrsToList toArg args);
|
||||
|
||||
isPathType = x: lib.strings.isCoercibleToString x && builtins.substring 0 1 (toString x) == "/";
|
||||
isPathType = x: lib.types.path.check x;
|
||||
|
||||
in
|
||||
{
|
||||
|
||||
@@ -42,7 +42,11 @@ in
|
||||
{
|
||||
config = mkIf (elem "bcachefs" config.boot.supportedFilesystems) (mkMerge [
|
||||
{
|
||||
system.fsPackages = [ pkgs.bcachefs-tools ];
|
||||
# We do not want to include bachefs in the fsPackages for systemd-initrd
|
||||
# because we provide the unwrapped version of mount.bcachefs
|
||||
# through the extraBin option, which will make it available for use.
|
||||
system.fsPackages = lib.optional (!config.boot.initrd.systemd.enable) pkgs.bcachefs-tools;
|
||||
environment.systemPackages = lib.optional (config.boot.initrd.systemd.enable) pkgs.bcachefs-tools;
|
||||
|
||||
# use kernel package with bcachefs support until it's in mainline
|
||||
boot.kernelPackages = pkgs.linuxPackages_testing_bcachefs;
|
||||
@@ -52,7 +56,14 @@ in
|
||||
# chacha20 and poly1305 are required only for decryption attempts
|
||||
boot.initrd.availableKernelModules = [ "bcachefs" "sha256" "chacha20" "poly1305" ];
|
||||
|
||||
boot.initrd.extraUtilsCommands = ''
|
||||
boot.initrd.systemd.extraBin = {
|
||||
"bcachefs" = "${pkgs.bcachefs-tools}/bin/bcachefs";
|
||||
"mount.bcachefs" = pkgs.runCommand "mount.bcachefs" {} ''
|
||||
cp -pdv ${pkgs.bcachefs-tools}/bin/.mount.bcachefs.sh-wrapped $out
|
||||
'';
|
||||
};
|
||||
|
||||
boot.initrd.extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable) ''
|
||||
copy_bin_and_libs ${pkgs.bcachefs-tools}/bin/bcachefs
|
||||
'';
|
||||
boot.initrd.extraUtilsCommandsTest = ''
|
||||
|
||||
@@ -465,8 +465,12 @@ let
|
||||
'';
|
||||
testSpecialisationConfig = true;
|
||||
};
|
||||
|
||||
|
||||
# disable zfs so we can support latest kernel if needed
|
||||
no-zfs-module = {
|
||||
nixpkgs.overlays = [(final: super: {
|
||||
zfs = super.zfs.overrideAttrs(_: {meta.platforms = [];});}
|
||||
)];
|
||||
};
|
||||
in {
|
||||
|
||||
# !!! `parted mkpart' seems to silently create overlapping partitions.
|
||||
@@ -714,6 +718,7 @@ in {
|
||||
bcachefsSimple = makeInstallerTest "bcachefs-simple" {
|
||||
extraInstallerConfig = {
|
||||
boot.supportedFilesystems = [ "bcachefs" ];
|
||||
imports = [ no-zfs-module ];
|
||||
};
|
||||
|
||||
createPartitions = ''
|
||||
@@ -737,13 +742,22 @@ in {
|
||||
bcachefsEncrypted = makeInstallerTest "bcachefs-encrypted" {
|
||||
extraInstallerConfig = {
|
||||
boot.supportedFilesystems = [ "bcachefs" ];
|
||||
|
||||
# disable zfs so we can support latest kernel if needed
|
||||
imports = [ no-zfs-module ];
|
||||
|
||||
environment.systemPackages = with pkgs; [ keyutils ];
|
||||
};
|
||||
|
||||
# We don't want to use the normal way of unlocking bcachefs defined in tasks/filesystems/bcachefs.nix.
|
||||
# So, override initrd.postDeviceCommands completely and simply unlock with the predefined password.
|
||||
extraConfig = ''
|
||||
boot.initrd.postDeviceCommands = lib.mkForce "echo password | bcachefs unlock /dev/vda3";
|
||||
boot.kernelParams = lib.mkAfter [ "console=tty0" ];
|
||||
'';
|
||||
|
||||
enableOCR = true;
|
||||
preBootCommands = ''
|
||||
machine.start()
|
||||
machine.wait_for_text("enter passphrase for ")
|
||||
machine.send_chars("password\n")
|
||||
'';
|
||||
|
||||
createPartitions = ''
|
||||
@@ -769,6 +783,9 @@ in {
|
||||
bcachefsMulti = makeInstallerTest "bcachefs-multi" {
|
||||
extraInstallerConfig = {
|
||||
boot.supportedFilesystems = [ "bcachefs" ];
|
||||
|
||||
# disable zfs so we can support latest kernel if needed
|
||||
imports = [ no-zfs-module ];
|
||||
};
|
||||
|
||||
createPartitions = ''
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ kernelPackages ? null }:
|
||||
import ../make-test-python.nix ({ pkgs, lib, ...} :
|
||||
import ../make-test-python.nix ({ pkgs, lib, kernelPackages ? null, ...} :
|
||||
let
|
||||
wg-snakeoil-keys = import ./snakeoil-keys.nix;
|
||||
peer = (import ./make-peer.nix) { inherit lib; };
|
||||
|
||||
@@ -7,10 +7,11 @@
|
||||
with pkgs.lib;
|
||||
|
||||
let
|
||||
tests = let callTest = p: flip (import p) { inherit system pkgs; }; in {
|
||||
tests = let callTest = p: args: import p ({ inherit system pkgs; } // args); in {
|
||||
basic = callTest ./basic.nix;
|
||||
namespaces = callTest ./namespaces.nix;
|
||||
wg-quick = callTest ./wg-quick.nix;
|
||||
wg-quick-nftables = args: callTest ./wg-quick.nix ({ nftables = true; } // args);
|
||||
generated = callTest ./generated.nix;
|
||||
};
|
||||
in
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ kernelPackages ? null }:
|
||||
import ../make-test-python.nix ({ pkgs, lib, ... } : {
|
||||
import ../make-test-python.nix ({ pkgs, lib, kernelPackages ? null, ... } : {
|
||||
name = "wireguard-generated";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ ma27 grahamc ];
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
{ kernelPackages ? null }:
|
||||
|
||||
let
|
||||
listenPort = 12345;
|
||||
socketNamespace = "foo";
|
||||
@@ -15,7 +13,7 @@ let
|
||||
|
||||
in
|
||||
|
||||
import ../make-test-python.nix ({ pkgs, lib, ... } : {
|
||||
import ../make-test-python.nix ({ pkgs, lib, kernelPackages ? null, ... } : {
|
||||
name = "wireguard-with-namespaces";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ asymmetric ];
|
||||
|
||||
@@ -1,9 +1,13 @@
|
||||
{ kernelPackages ? null }:
|
||||
|
||||
import ../make-test-python.nix ({ pkgs, lib, ... }:
|
||||
import ../make-test-python.nix ({ pkgs, lib, kernelPackages ? null, nftables ? false, ... }:
|
||||
let
|
||||
wg-snakeoil-keys = import ./snakeoil-keys.nix;
|
||||
peer = (import ./make-peer.nix) { inherit lib; };
|
||||
peer = import ./make-peer.nix { inherit lib; };
|
||||
commonConfig = {
|
||||
boot.kernelPackages = lib.mkIf (kernelPackages != null) kernelPackages;
|
||||
networking.nftables.enable = nftables;
|
||||
# Make sure iptables doesn't work with nftables enabled
|
||||
boot.blacklistedKernelModules = lib.mkIf nftables [ "nft_compat" ];
|
||||
};
|
||||
in
|
||||
{
|
||||
name = "wg-quick";
|
||||
@@ -15,47 +19,51 @@ import ../make-test-python.nix ({ pkgs, lib, ... }:
|
||||
peer0 = peer {
|
||||
ip4 = "192.168.0.1";
|
||||
ip6 = "fd00::1";
|
||||
extraConfig = {
|
||||
boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; };
|
||||
networking.firewall.allowedUDPPorts = [ 23542 ];
|
||||
networking.wg-quick.interfaces.wg0 = {
|
||||
address = [ "10.23.42.1/32" "fc00::1/128" ];
|
||||
listenPort = 23542;
|
||||
extraConfig = lib.mkMerge [
|
||||
commonConfig
|
||||
{
|
||||
networking.firewall.allowedUDPPorts = [ 23542 ];
|
||||
networking.wg-quick.interfaces.wg0 = {
|
||||
address = [ "10.23.42.1/32" "fc00::1/128" ];
|
||||
listenPort = 23542;
|
||||
|
||||
inherit (wg-snakeoil-keys.peer0) privateKey;
|
||||
inherit (wg-snakeoil-keys.peer0) privateKey;
|
||||
|
||||
peers = lib.singleton {
|
||||
allowedIPs = [ "10.23.42.2/32" "fc00::2/128" ];
|
||||
peers = lib.singleton {
|
||||
allowedIPs = [ "10.23.42.2/32" "fc00::2/128" ];
|
||||
|
||||
inherit (wg-snakeoil-keys.peer1) publicKey;
|
||||
inherit (wg-snakeoil-keys.peer1) publicKey;
|
||||
};
|
||||
|
||||
dns = [ "10.23.42.2" "fc00::2" "wg0" ];
|
||||
};
|
||||
|
||||
dns = [ "10.23.42.2" "fc00::2" "wg0" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
peer1 = peer {
|
||||
ip4 = "192.168.0.2";
|
||||
ip6 = "fd00::2";
|
||||
extraConfig = {
|
||||
boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; };
|
||||
networking.useNetworkd = true;
|
||||
networking.wg-quick.interfaces.wg0 = {
|
||||
address = [ "10.23.42.2/32" "fc00::2/128" ];
|
||||
inherit (wg-snakeoil-keys.peer1) privateKey;
|
||||
extraConfig = lib.mkMerge [
|
||||
commonConfig
|
||||
{
|
||||
networking.useNetworkd = true;
|
||||
networking.wg-quick.interfaces.wg0 = {
|
||||
address = [ "10.23.42.2/32" "fc00::2/128" ];
|
||||
inherit (wg-snakeoil-keys.peer1) privateKey;
|
||||
|
||||
peers = lib.singleton {
|
||||
allowedIPs = [ "0.0.0.0/0" "::/0" ];
|
||||
endpoint = "192.168.0.1:23542";
|
||||
persistentKeepalive = 25;
|
||||
peers = lib.singleton {
|
||||
allowedIPs = [ "0.0.0.0/0" "::/0" ];
|
||||
endpoint = "192.168.0.1:23542";
|
||||
persistentKeepalive = 25;
|
||||
|
||||
inherit (wg-snakeoil-keys.peer0) publicKey;
|
||||
inherit (wg-snakeoil-keys.peer0) publicKey;
|
||||
};
|
||||
|
||||
dns = [ "10.23.42.1" "fc00::1" "wg0" ];
|
||||
};
|
||||
|
||||
dns = [ "10.23.42.1" "fc00::1" "wg0" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -18,14 +18,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "eartag";
|
||||
version = "0.2.1";
|
||||
version = "0.3.1";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "knuxify";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-TlY2F2y7ZZ9f+vkYYkES5zoIGcuTWP1+rOJI62wc4SU=";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-gN3V5ZHlhHp52Jg/i+hDLEDpSvP8yFngujyw5ZncQQg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -21,14 +21,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "furnace";
|
||||
version = "0.6pre2";
|
||||
version = "0.6pre3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tildearrow";
|
||||
repo = "furnace";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-ydywnlZ6HEcTiBIB92yduCzPsOljvypP1KpCVjETzBc=";
|
||||
sha256 = "sha256-bHVeTw69k6LLcrfkmGxvjlFfR/hWiCfm/P3utknid1o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,6 @@
|
||||
# generated by pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py
|
||||
|
||||
{ buildGrammar, fetchFromGitHub, fetchFromGitLab, fetchFromSourcehut, fetchgit }:
|
||||
{ buildGrammar, fetchFromBitbucket, fetchFromGitHub, fetchFromGitLab, fetchFromGitea, fetchFromGitiles, fetchFromRepoOrCz, fetchFromSourcehut, fetchgit }:
|
||||
|
||||
{
|
||||
ada = buildGrammar {
|
||||
@@ -38,12 +38,12 @@
|
||||
};
|
||||
astro = buildGrammar {
|
||||
language = "astro";
|
||||
version = "22697b0";
|
||||
version = "a1f66bf";
|
||||
source = fetchFromGitHub {
|
||||
owner = "virchau13";
|
||||
repo = "tree-sitter-astro";
|
||||
rev = "22697b0e2413464b7abaea9269c5e83a59e39a83";
|
||||
hash = "sha256-vp2VjkfBEYEUwUCjBlbVjPIB49QIikdFAITzzFLZX+U=";
|
||||
rev = "a1f66bf72ed68b87f779bce9a52e5c6521fc867e";
|
||||
hash = "sha256-Q+nOJQAAHqvyH8PVckh38q0TJ6b9jjb/pZHC/U2Hs5Q=";
|
||||
};
|
||||
meta.homepage = "https://github.com/virchau13/tree-sitter-astro";
|
||||
};
|
||||
@@ -758,12 +758,12 @@
|
||||
};
|
||||
julia = buildGrammar {
|
||||
language = "julia";
|
||||
version = "f254ff9";
|
||||
version = "1cd300b";
|
||||
source = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-julia";
|
||||
rev = "f254ff9c52e994f629a60821662917d2c6c0e8eb";
|
||||
hash = "sha256-918mGh91hAl8hx4HoGOXr2BFoDtMz5yPkQRMDrkk1Mg=";
|
||||
rev = "1cd300bda52e680872053cd55a228c1809cb0c3a";
|
||||
hash = "sha256-qdKC1yk2CQGQlVWI/0XHrsTF81rRFUlmKSNJ3RoZcdI=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia";
|
||||
};
|
||||
@@ -791,12 +791,12 @@
|
||||
};
|
||||
latex = buildGrammar {
|
||||
language = "latex";
|
||||
version = "1ec3941";
|
||||
version = "6b7ea83";
|
||||
source = fetchFromGitHub {
|
||||
owner = "latex-lsp";
|
||||
repo = "tree-sitter-latex";
|
||||
rev = "1ec3941b971dccfa36cb1cd6221a2e4a1cd3e250";
|
||||
hash = "sha256-m/6GWV797gaJnWVU07RvHjfAeRzGT9GZH3M9HkcjUq0=";
|
||||
rev = "6b7ea839307670e6bda011f888717d3a882ecc09";
|
||||
hash = "sha256-fmMm6HM9ZCnTyDxKmouoKFPYWkbrM//gHwVEFsICzUs=";
|
||||
};
|
||||
meta.homepage = "https://github.com/latex-lsp/tree-sitter-latex";
|
||||
};
|
||||
@@ -958,24 +958,24 @@
|
||||
};
|
||||
ocaml = buildGrammar {
|
||||
language = "ocaml";
|
||||
version = "de07323";
|
||||
version = "f1106bf";
|
||||
source = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-ocaml";
|
||||
rev = "de07323343946c32759933cb3b7c78e821098cad";
|
||||
hash = "sha256-JhJSg6Ht3dy94hAP2yy0fg9U/IeYNGaHYoys/++yOwg=";
|
||||
rev = "f1106bf834703f1f2f795da1a3b5f8f40174ffcc";
|
||||
hash = "sha256-5X2c2Deb8xNlp0LPQKFWIT3jwxKuuKdFlp9b3iA818Y=";
|
||||
};
|
||||
location = "ocaml";
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml";
|
||||
};
|
||||
ocaml_interface = buildGrammar {
|
||||
language = "ocaml_interface";
|
||||
version = "de07323";
|
||||
version = "f1106bf";
|
||||
source = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-ocaml";
|
||||
rev = "de07323343946c32759933cb3b7c78e821098cad";
|
||||
hash = "sha256-JhJSg6Ht3dy94hAP2yy0fg9U/IeYNGaHYoys/++yOwg=";
|
||||
rev = "f1106bf834703f1f2f795da1a3b5f8f40174ffcc";
|
||||
hash = "sha256-5X2c2Deb8xNlp0LPQKFWIT3jwxKuuKdFlp9b3iA818Y=";
|
||||
};
|
||||
location = "interface";
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml";
|
||||
@@ -1115,12 +1115,12 @@
|
||||
};
|
||||
qmljs = buildGrammar {
|
||||
language = "qmljs";
|
||||
version = "0b2b25b";
|
||||
version = "ab75be9";
|
||||
source = fetchFromGitHub {
|
||||
owner = "yuja";
|
||||
repo = "tree-sitter-qmljs";
|
||||
rev = "0b2b25bcaa7d4925d5f0dda16f6a99c588a437f1";
|
||||
hash = "sha256-Hf8LfrN3YjN9hpGtTVmK3ZjJ/b/fsRCg9FG7hSSj/mk=";
|
||||
rev = "ab75be9750e6f2f804638824d1790034286a830c";
|
||||
hash = "sha256-UP/+svGOSMlUOMmNMpXKtDDPY9ZIldjWF5sM+PMbE9M=";
|
||||
};
|
||||
meta.homepage = "https://github.com/yuja/tree-sitter-qmljs";
|
||||
};
|
||||
@@ -1269,12 +1269,12 @@
|
||||
};
|
||||
slint = buildGrammar {
|
||||
language = "slint";
|
||||
version = "d422300";
|
||||
version = "0754752";
|
||||
source = fetchFromGitHub {
|
||||
owner = "jrmoulton";
|
||||
repo = "tree-sitter-slint";
|
||||
rev = "d422300f5d6ccce8f9a617dfed57aafb636fadb2";
|
||||
hash = "sha256-j6NBJaix0oOUKLAaeo+/1XdYatStqyaTyLKawq/nFvc=";
|
||||
rev = "07547525cdf4627343dca5891f1743ae45e879bb";
|
||||
hash = "sha256-FB5uDzvJKBN3KH+g71kn2/SX8KIZdLv3OamX8f1NeVE=";
|
||||
};
|
||||
meta.homepage = "https://github.com/jrmoulton/tree-sitter-slint";
|
||||
};
|
||||
@@ -1371,8 +1371,10 @@
|
||||
t32 = buildGrammar {
|
||||
language = "t32";
|
||||
version = "f8106fc";
|
||||
source = fetchgit {
|
||||
url = "https://codeberg.org/xasc/tree-sitter-t32";
|
||||
source = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "xasc";
|
||||
repo = "tree-sitter-t32";
|
||||
rev = "f8106fcf5a27f905b3d9d55d9cd3e910bea70c60";
|
||||
hash = "sha256-hKddSekx67Yqm4+LqVaH8Sf1+73RlCnXE6th2FTHB34=";
|
||||
};
|
||||
@@ -1390,6 +1392,18 @@
|
||||
generate = true;
|
||||
meta.homepage = "https://github.com/euclidianAce/tree-sitter-teal";
|
||||
};
|
||||
terraform = buildGrammar {
|
||||
language = "terraform";
|
||||
version = "0ff887f";
|
||||
source = fetchFromGitHub {
|
||||
owner = "MichaHoffmann";
|
||||
repo = "tree-sitter-hcl";
|
||||
rev = "0ff887f2a60a147452d52db060de6b42f42f1441";
|
||||
hash = "sha256-L4B2qtGqrtyLHyUMx1p0t4aKncm72dUE+e19Fv5iqUA=";
|
||||
};
|
||||
location = "dialects/terraform";
|
||||
meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl";
|
||||
};
|
||||
tiger = buildGrammar {
|
||||
language = "tiger";
|
||||
version = "a233ebe";
|
||||
@@ -1403,12 +1417,12 @@
|
||||
};
|
||||
tlaplus = buildGrammar {
|
||||
language = "tlaplus";
|
||||
version = "27e6d23";
|
||||
version = "f2ad727";
|
||||
source = fetchFromGitHub {
|
||||
owner = "tlaplus-community";
|
||||
repo = "tree-sitter-tlaplus";
|
||||
rev = "27e6d238a5708b0490f43351f6e0baeaab4c9c1f";
|
||||
hash = "sha256-4RwHJN1N2DupVIYqWk2sioiiTtEKBmuLT+t+THr71os=";
|
||||
rev = "f2ad7272d145598ff2d27fda15379d26aa33a7e1";
|
||||
hash = "sha256-lnl0q9vJiIoqU3Lo+uCIcMdMueXTQ/MVgZUCHvXeqhs=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus";
|
||||
};
|
||||
@@ -1558,6 +1572,17 @@
|
||||
};
|
||||
meta.homepage = "https://github.com/szebniok/tree-sitter-wgsl";
|
||||
};
|
||||
wgsl_bevy = buildGrammar {
|
||||
language = "wgsl_bevy";
|
||||
version = "c81dc77";
|
||||
source = fetchFromGitHub {
|
||||
owner = "theHamsta";
|
||||
repo = "tree-sitter-wgsl-bevy";
|
||||
rev = "c81dc770310795caea5e00996505deba024ec698";
|
||||
hash = "sha256-CNEZ8GKfcT5YOdlrqEFE8q2FF0Zs+GsWisd1DA6mnUk=";
|
||||
};
|
||||
meta.homepage = "https://github.com/theHamsta/tree-sitter-wgsl-bevy";
|
||||
};
|
||||
yaml = buildGrammar {
|
||||
language = "yaml";
|
||||
version = "0e36bed";
|
||||
|
||||
@@ -60,7 +60,12 @@ def generate_grammar(item):
|
||||
|
||||
generated_file = """# generated by pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py
|
||||
|
||||
{ buildGrammar, fetchFromGitHub, fetchFromGitLab, fetchFromSourcehut, fetchgit }:
|
||||
{ buildGrammar"""
|
||||
|
||||
for fetcher in subprocess.check_output(["nurl", "-L"], text=True).splitlines():
|
||||
generated_file += f", {fetcher}"
|
||||
|
||||
generated_file += """ }:
|
||||
|
||||
{
|
||||
"""
|
||||
|
||||
@@ -669,6 +669,10 @@ self: super: {
|
||||
dontBuild = true;
|
||||
});
|
||||
|
||||
vim-mediawiki-editor = super.vim-mediawiki-editor.overrideAttrs (old: {
|
||||
passthru.python3Dependencies = [ python3.pkgs.mwclient ];
|
||||
});
|
||||
|
||||
nvim-spectre = super.nvim-spectre.overrideAttrs (old: {
|
||||
dependencies = with self; [ plenary-nvim ];
|
||||
});
|
||||
|
||||
@@ -393,6 +393,7 @@ https://github.com/vim-scripts/matchit.zip/,,
|
||||
https://github.com/marko-cerovac/material.nvim/,,
|
||||
https://github.com/kaicataldo/material.vim/,HEAD,
|
||||
https://github.com/vim-scripts/mayansmoke/,,
|
||||
https://github.com/chikamichi/mediawiki.vim/,HEAD,
|
||||
https://github.com/echasnovski/mini.nvim/,,
|
||||
https://github.com/wfxr/minimap.vim/,,
|
||||
https://github.com/jose-elias-alvarez/minsnip.nvim/,,
|
||||
@@ -932,6 +933,7 @@ https://github.com/preservim/vim-markdown/,,
|
||||
https://github.com/euclio/vim-markdown-composer/,,
|
||||
https://github.com/mzlogin/vim-markdown-toc/,,
|
||||
https://github.com/andymass/vim-matchup/,,
|
||||
https://github.com/aquach/vim-mediawiki-editor/,HEAD,
|
||||
https://github.com/samoshkin/vim-mergetool/,,
|
||||
https://github.com/idanarye/vim-merginal/,,
|
||||
https://github.com/david-a-wheeler/vim-metamath/,,
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, which
|
||||
, wrapGAppsHook
|
||||
, libicns
|
||||
, SDL2
|
||||
@@ -42,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
which
|
||||
wrapGAppsHook
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
libicns
|
||||
@@ -72,6 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"hiro=gtk3"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"hiro=cocoa"
|
||||
"lto=false"
|
||||
"vulkan=false"
|
||||
] ++ [
|
||||
"local=false"
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildDotnetModule
|
||||
, fetchFromGitHub
|
||||
, dotnetCorePackages
|
||||
@@ -12,26 +13,36 @@
|
||||
buildDotnetModule rec {
|
||||
pname = "archisteamfarm";
|
||||
# nixpkgs-update: no auto update
|
||||
version = "5.3.2.4";
|
||||
version = "5.4.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "justarchinet";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-qjU5TcYkAFJVYTOCwePGOVR9hYKNtinzLt5P4aTs578=";
|
||||
sha256 = "sha256-+S0nvgiMxSUQI/TzAMES6bAix1iudj1+EkOcXO+6igE=";
|
||||
};
|
||||
|
||||
dotnet-runtime = dotnetCorePackages.aspnetcore_6_0;
|
||||
dotnet-runtime = dotnetCorePackages.aspnetcore_7_0;
|
||||
dotnet-sdk = dotnetCorePackages.sdk_7_0;
|
||||
|
||||
nugetDeps = ./deps.nix;
|
||||
|
||||
projectFile = "ArchiSteamFarm.sln";
|
||||
executables = [ "ArchiSteamFarm" ];
|
||||
dotnetFlags = [
|
||||
"-p:PublishSingleFile=true"
|
||||
"-p:PublishTrimmed=true"
|
||||
];
|
||||
selfContainedBuild = true;
|
||||
|
||||
runtimeDeps = [ libkrb5 zlib openssl ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
preBuild = ''
|
||||
export projectFile=(ArchiSteamFarm)
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
# A mutable path, with this directory tree must be set. By default, this would point at the nix store causing errors.
|
||||
makeWrapperArgs+=(
|
||||
@@ -40,7 +51,17 @@ buildDotnetModule rec {
|
||||
)
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
buildPlugin() {
|
||||
dotnet publish $1 -p:ContinuousIntegrationBuild=true -p:Deterministic=true \
|
||||
--output $out/lib/${pname}/plugins/$1 --configuration Release \
|
||||
-p:TargetLatestRuntimePatch=false -p:UseAppHost=false --no-restore
|
||||
}
|
||||
buildPlugin ArchiSteamFarm.OfficialPlugins.SteamTokenDumper
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
# nix-shell maintainers/scripts/update.nix --argstr package ArchiSteamFarm
|
||||
updateScript = ./update.sh;
|
||||
ui = callPackage ./web-ui { };
|
||||
};
|
||||
|
||||
+16
-51
@@ -56,13 +56,12 @@
|
||||
(fetchNuGet { pname = "Humanizer.Core.zh-CN"; version = "2.14.1"; sha256 = "1k6nnawd016xpwgzdzy84z1lcv2vc1cygcksw19wbgd8dharyyk7"; })
|
||||
(fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "2.14.1"; sha256 = "0zn99311zfn602phxyskfjq9vly0w5712z6fly8r4q0h94qa8c85"; })
|
||||
(fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; })
|
||||
(fetchNuGet { pname = "JetBrains.Annotations"; version = "2022.1.0"; sha256 = "0lsqpssain0v9i3jhpi1c42r5s329y31cvqk5x7gqvy17f29y002"; })
|
||||
(fetchNuGet { pname = "JetBrains.Annotations"; version = "2022.3.1"; sha256 = "0lkhyyz25q82ygnxy26lwy5cl8fvkdc13pcn433xpjj8akzbmgd6"; })
|
||||
(fetchNuGet { pname = "Markdig.Signed"; version = "0.30.4"; sha256 = "1bzc2vqpsq4mx6rw2rnk4hr14gqd5w8rf2h026gh7rqkwqd3r2dj"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "6.0.0-rc.1.21452.15"; sha256 = "0c3vnaag8gxlxij77n18m3hawpjkjjamsnq5kfjz5cvc7sfg3fwh"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "6.0.0-rc.1.21452.15"; sha256 = "1xyx358w4fqzxr9cy358agnm86rjijbnvikiqlngz2msgmldxi2z"; })
|
||||
(fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.3.2"; sha256 = "1f05l2vm8inlwhk36lfbyszjlcnvdd2qw2832npaah0dldn6dz00"; })
|
||||
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.4.0"; sha256 = "17lm9gvz48ay8xxrjacxjsknnva8i939prg26z6fq3svgcy0nc30"; })
|
||||
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; })
|
||||
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; })
|
||||
@@ -73,15 +72,13 @@
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; })
|
||||
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.3.2"; sha256 = "0pm06nxqi8aw04lciqy7iz8ln1qm5mx06cpwgqa2dfwvnjp7zxnm"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
|
||||
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.4.0"; sha256 = "1l1q2zi2091ac2cbynpsj0c8vff074y4c3vcnm4q7js1wv08jwld"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; })
|
||||
(fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; })
|
||||
(fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.3.2"; sha256 = "0bs38r5kdw1xpbjbi5l82xbhfnfbzr5xhg5520lk05pg914d1ln1"; })
|
||||
(fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.3.2"; sha256 = "089nmaxzvm5xcf20pm4iiavz2k6lwh69r51xlbqg0ry605mnl869"; })
|
||||
(fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.4.0"; sha256 = "0dl81q9k7jaymxpg995nsicjz1b1cs481a12c4znxkpjkddqa82b"; })
|
||||
(fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.4.0"; sha256 = "1ip6gadn54k59nrz2l3a62rrxh2ldni33v9vkxlgcjg99sj2dyy4"; })
|
||||
(fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; })
|
||||
(fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; })
|
||||
(fetchNuGet { pname = "MSTest.TestAdapter"; version = "2.2.10"; sha256 = "0w6c55n30w6imm0rjafl2sg0x8vf9852xmil9dzqb4h36cs7v6y6"; })
|
||||
@@ -89,15 +86,15 @@
|
||||
(fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; })
|
||||
(fetchNuGet { pname = "Newtonsoft.Json"; version = "10.0.3"; sha256 = "06vy67bkshclpz69kps4vgzc9h2cgg41c8vlqmdbwclfky7c4haq"; })
|
||||
(fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; })
|
||||
(fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; })
|
||||
(fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; sha256 = "1p9splg1min274dpz7xdfgzrwkyfd3xlkygwpr1xgjvvyjvs6b0i"; })
|
||||
(fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; })
|
||||
(fetchNuGet { pname = "Nito.AsyncEx.Coordination"; version = "5.1.2"; sha256 = "0sxvmqnv8a94k3pq1w3lh1vgjb8l62h1qamxcjl3pkq634h2fwrl"; })
|
||||
(fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; })
|
||||
(fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; })
|
||||
(fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; })
|
||||
(fetchNuGet { pname = "NLog"; version = "5.0.5"; sha256 = "1lrdpq5xikmda2rkh1b9jrhvi5r0d7nqdh5dglng92a7mkq2g75j"; })
|
||||
(fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.1.0"; sha256 = "0iq4gmaknz6yzb3qzbhrqqyfphqszgj05klipym3gs98qka6n568"; })
|
||||
(fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.1.5"; sha256 = "13mrmwfk26sn79zslr30wqkir0svg0njasc17px853sf78wqp9k0"; })
|
||||
(fetchNuGet { pname = "NLog"; version = "5.1.0"; sha256 = "0z6z405cy2knvg7c9fgg0bc9721ccc1ga23sh8d430a6lr3mznxr"; })
|
||||
(fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.2.0"; sha256 = "0bnyp44vnwbgiw8p0qab1zzmgxg66dsypbs3hv8415wb08b5vxvp"; })
|
||||
(fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.2.0"; sha256 = "06dcv75g902x0q7swkmb58c5lb0rn3m7w178vs5dha3w9xy2nxkc"; })
|
||||
(fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; })
|
||||
(fetchNuGet { pname = "protobuf-net"; version = "3.0.101"; sha256 = "0594qckbc0lh61sw74ihaq4qmvf1lf133vfa88n443mh7lxm2fwf"; })
|
||||
(fetchNuGet { pname = "protobuf-net.Core"; version = "3.0.101"; sha256 = "1kvn9rnm6f0jxs0s9scyyx2f2p8rk03qzc1f6ijv1g6xgkpxkq1m"; })
|
||||
@@ -152,7 +149,6 @@
|
||||
(fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; })
|
||||
(fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; })
|
||||
(fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; })
|
||||
(fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; })
|
||||
(fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; })
|
||||
(fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; })
|
||||
(fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; })
|
||||
@@ -161,78 +157,55 @@
|
||||
(fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; })
|
||||
(fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; })
|
||||
(fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; })
|
||||
(fetchNuGet { pname = "System.Composition"; version = "6.0.0"; sha256 = "1p7hysns39cc24af6dwd4m48bqjsrr3clvi4aws152mh2fgyg50z"; })
|
||||
(fetchNuGet { pname = "System.Composition.AttributedModel"; version = "6.0.0"; sha256 = "1mqrblb0l65hw39d0hnspqcv85didpn4wbiwhfgj4784wzqx2w6k"; })
|
||||
(fetchNuGet { pname = "System.Composition.Convention"; version = "6.0.0"; sha256 = "02km3yb94p1c4s7liyhkmda0g71zm1rc8ijsfmy4bnlkq15xjw3b"; })
|
||||
(fetchNuGet { pname = "System.Composition.Hosting"; version = "6.0.0"; sha256 = "0big5nk8c44rxp6cfykhk7rxvn2cgwa99w6c3v2a36adc3lj36ky"; })
|
||||
(fetchNuGet { pname = "System.Composition.Runtime"; version = "6.0.0"; sha256 = "0vq5ik63yii1784gsa2f2kx9w6xllmm8b8rk0arid1jqdj1nyrlw"; })
|
||||
(fetchNuGet { pname = "System.Composition.TypedParts"; version = "6.0.0"; sha256 = "0y9pq3y60nyrpfy51f576a0qjjdh61mcv8vnik32pm4bz56h9q72"; })
|
||||
(fetchNuGet { pname = "System.Composition"; version = "7.0.0"; sha256 = "1aii681g7a4gv8fvgd6hbnbbwi6lpzfcnl3k0k8hqx4m7fxp2f32"; })
|
||||
(fetchNuGet { pname = "System.Composition.AttributedModel"; version = "7.0.0"; sha256 = "1cxrp0sk5b2gihhkn503iz8fa99k860js2qyzjpsw9rn547pdkny"; })
|
||||
(fetchNuGet { pname = "System.Composition.Convention"; version = "7.0.0"; sha256 = "1nbyn42xys0kv247jf45r748av6fp8kp27f1582lfhnj2n8290rp"; })
|
||||
(fetchNuGet { pname = "System.Composition.Hosting"; version = "7.0.0"; sha256 = "0wqbjxgggskfn45ilvg86grqci3zx9xj34r5sradca4mqqc90n7f"; })
|
||||
(fetchNuGet { pname = "System.Composition.Runtime"; version = "7.0.0"; sha256 = "1p9xpqzx42s8cdizv6nh15hcjvl2km0rwby66nfkj4cb472l339s"; })
|
||||
(fetchNuGet { pname = "System.Composition.TypedParts"; version = "7.0.0"; sha256 = "0syz7y6wgnxxgjvfqgymn9mnaa5fjy1qp06qnsvh3agr9mvcv779"; })
|
||||
(fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; })
|
||||
(fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; })
|
||||
(fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; })
|
||||
(fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; })
|
||||
(fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.0"; sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; })
|
||||
(fetchNuGet { pname = "System.Diagnostics.TextWriterTraceListener"; version = "4.3.0"; sha256 = "09db74f36wkwg30f7v7zhz1yhkyrnl5v6bdwljq1jdfgzcfch7c3"; })
|
||||
(fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; })
|
||||
(fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; })
|
||||
(fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.3.0"; sha256 = "1kyw4d7dpjczhw6634nrmg7yyyzq72k75x38y0l0nwhigdlp1766"; })
|
||||
(fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; })
|
||||
(fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; })
|
||||
(fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; })
|
||||
(fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; })
|
||||
(fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; })
|
||||
(fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; })
|
||||
(fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; })
|
||||
(fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; })
|
||||
(fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; })
|
||||
(fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; })
|
||||
(fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; })
|
||||
(fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; })
|
||||
(fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; })
|
||||
(fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; })
|
||||
(fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; })
|
||||
(fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; })
|
||||
(fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; })
|
||||
(fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; sha256 = "10ira8hmv0i54yp9ggrrdm1c06j538sijfjpn1kmnh9j2xk5yzmq"; })
|
||||
(fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; })
|
||||
(fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; })
|
||||
(fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; })
|
||||
(fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; })
|
||||
(fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; })
|
||||
(fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; })
|
||||
(fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; })
|
||||
(fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; })
|
||||
(fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; })
|
||||
(fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; })
|
||||
(fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; })
|
||||
(fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; })
|
||||
(fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; })
|
||||
(fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; })
|
||||
(fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; })
|
||||
(fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; })
|
||||
(fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; })
|
||||
(fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; })
|
||||
(fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; })
|
||||
(fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; })
|
||||
(fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; })
|
||||
(fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; })
|
||||
(fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; })
|
||||
(fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; })
|
||||
(fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; })
|
||||
(fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; })
|
||||
(fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; })
|
||||
(fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; })
|
||||
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; })
|
||||
(fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; })
|
||||
(fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; })
|
||||
(fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; })
|
||||
(fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; })
|
||||
(fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; })
|
||||
(fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; })
|
||||
(fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; })
|
||||
(fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; })
|
||||
(fetchNuGet { pname = "System.Runtime.Serialization.Formatters"; version = "4.3.0"; sha256 = "114j35n8gcvn3sqv9ar36r1jjq0y1yws9r0yk8i6wm4aq7n9rs0m"; })
|
||||
(fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; })
|
||||
(fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.3.0"; sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; })
|
||||
(fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; })
|
||||
(fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; })
|
||||
@@ -242,29 +215,21 @@
|
||||
(fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; })
|
||||
(fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; })
|
||||
(fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; })
|
||||
(fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; sha256 = "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"; })
|
||||
(fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "7.0.0"; sha256 = "15s9s6hsj9bz0nzw41mxbqdjgjd71w2djqbv0aj413gfi9amybk9"; })
|
||||
(fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; })
|
||||
(fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; })
|
||||
(fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; })
|
||||
(fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; })
|
||||
(fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; })
|
||||
(fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; })
|
||||
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; })
|
||||
(fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; })
|
||||
(fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; })
|
||||
(fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; })
|
||||
(fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; })
|
||||
(fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; })
|
||||
(fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; })
|
||||
(fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; })
|
||||
(fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; })
|
||||
(fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; })
|
||||
(fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; })
|
||||
(fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; })
|
||||
(fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; })
|
||||
(fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; })
|
||||
(fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; })
|
||||
(fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; })
|
||||
(fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; })
|
||||
(fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; })
|
||||
(fetchNuGet { pname = "zxcvbn-core"; version = "7.0.92"; sha256 = "1pbi0n3za8zsnkbvq19njy4h4hy12a6rv4rknf4a2m1kdhxb3cgx"; })
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -I nixpkgs=../../../.. -i bash -p curl gnused jq common-updater-scripts
|
||||
#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq common-updater-scripts
|
||||
set -euo pipefail
|
||||
cd "$(dirname "${BASH_SOURCE[0]}")"
|
||||
|
||||
@@ -16,7 +16,7 @@ if [[ "$new_version" == "$old_version" ]]; then
|
||||
fi
|
||||
|
||||
asf_path=$PWD
|
||||
cd ../../../..
|
||||
push ../../../..
|
||||
|
||||
if [[ "${1:-}" != "--deps-only" ]]; then
|
||||
update-source-version ArchiSteamFarm "$new_version"
|
||||
@@ -24,5 +24,5 @@ fi
|
||||
|
||||
$(nix-build -A ArchiSteamFarm.fetch-deps --no-out-link) "$deps_file"
|
||||
|
||||
cd "$asf_path"
|
||||
exec "$asf_path/web-ui/update.sh"
|
||||
popd
|
||||
"$asf_path/web-ui/update.sh"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, pkgs, fetchFromGitHub, nodejs, stdenv, ArchiSteamFarm, ... }:
|
||||
{ lib, pkgs, fetchFromGitHub, nodejs, nodePackages, stdenv, ArchiSteamFarm }:
|
||||
|
||||
let
|
||||
nodePackages = import ./node-composition.nix {
|
||||
@@ -11,8 +11,8 @@ let
|
||||
repo = "ASF-ui";
|
||||
# updated by the update script
|
||||
# this is always the commit that should be used with asf-ui from the latest asf version
|
||||
rev = "5f9969bf17e4c6915418655b35fc6b790cd2da0b";
|
||||
sha256 = "03y4ahq958rxjnddwnc6h95drdpnvpy16adk434aak4l8hqr24sg";
|
||||
rev = "c348d6897324aac1d899a977f9c7d467ea934796";
|
||||
sha256 = "1nvglb1wahz20my29jhi3j7824d12pdqf0xfpymnganzfkpj9zjk";
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
+220
-230
@@ -22,22 +22,22 @@ let
|
||||
sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==";
|
||||
};
|
||||
};
|
||||
"@babel/compat-data-7.19.4" = {
|
||||
"@babel/compat-data-7.20.1" = {
|
||||
name = "_at_babel_slash_compat-data";
|
||||
packageName = "@babel/compat-data";
|
||||
version = "7.19.4";
|
||||
version = "7.20.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.4.tgz";
|
||||
sha512 = "CHIGpJcUQ5lU9KrPHTjBMhVwQG6CQjxfg36fGXl3qk/Gik1WwWachaXFuo0uCWJT/mStOKtcbFJCaVLihC1CMw==";
|
||||
url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.1.tgz";
|
||||
sha512 = "EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ==";
|
||||
};
|
||||
};
|
||||
"@babel/core-7.19.6" = {
|
||||
"@babel/core-7.20.5" = {
|
||||
name = "_at_babel_slash_core";
|
||||
packageName = "@babel/core";
|
||||
version = "7.19.6";
|
||||
version = "7.20.5";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@babel/core/-/core-7.19.6.tgz";
|
||||
sha512 = "D2Ue4KHpc6Ys2+AxpIx1BZ8+UegLLLE2p3KJEuJRKmokHOtl49jQ5ny1773KsGLZs8MQvBidAF6yWUJxRqtKtg==";
|
||||
url = "https://registry.npmjs.org/@babel/core/-/core-7.20.5.tgz";
|
||||
sha512 = "UdOWmk4pNWTm/4DlPUl/Pt4Gz4rcEMb7CY0Y3eJl5Yz1vI8ZJGmHWaVE55LoxRjdpx0z259GE9U5STA9atUinQ==";
|
||||
};
|
||||
};
|
||||
"@babel/eslint-parser-7.19.1" = {
|
||||
@@ -49,13 +49,13 @@ let
|
||||
sha512 = "AqNf2QWt1rtu2/1rLswy6CDP7H9Oh3mMhk177Y67Rg8d7RD9WfOLLv8CGn6tisFvS2htm86yIe1yLF6I1UDaGQ==";
|
||||
};
|
||||
};
|
||||
"@babel/generator-7.19.6" = {
|
||||
"@babel/generator-7.20.5" = {
|
||||
name = "_at_babel_slash_generator";
|
||||
packageName = "@babel/generator";
|
||||
version = "7.19.6";
|
||||
version = "7.20.5";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@babel/generator/-/generator-7.19.6.tgz";
|
||||
sha512 = "oHGRUQeoX1QrKeJIKVe0hwjGqNnVYsM5Nep5zo0uE0m42sLH+Fsd2pStJ5sRM1bNyTUUoz0pe2lTeMJrb/taTA==";
|
||||
url = "https://registry.npmjs.org/@babel/generator/-/generator-7.20.5.tgz";
|
||||
sha512 = "jl7JY2Ykn9S0yj4DQP82sYvPU+T3g0HFcWTqDLqiuA9tGRNIj9VfbtXGAYTTkyNEnQk1jkMGOdYka8aG/lulCA==";
|
||||
};
|
||||
};
|
||||
"@babel/helper-annotate-as-pure-7.18.6" = {
|
||||
@@ -76,13 +76,13 @@ let
|
||||
sha512 = "KT10c1oWEpmrIRYnthbzHgoOf6B+Xd6a5yhdbNtdhtG7aO1or5HViuf1TQR36xY/QprXA5nvxO6nAjhJ4y38jw==";
|
||||
};
|
||||
};
|
||||
"@babel/helper-compilation-targets-7.19.3" = {
|
||||
"@babel/helper-compilation-targets-7.20.0" = {
|
||||
name = "_at_babel_slash_helper-compilation-targets";
|
||||
packageName = "@babel/helper-compilation-targets";
|
||||
version = "7.19.3";
|
||||
version = "7.20.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.3.tgz";
|
||||
sha512 = "65ESqLGyGmLvgR0mst5AdW1FkNlj9rQsCKduzEoEPhBCDFGXvz2jW6bXFG6i0/MrV2s7hhXjjb2yAzcPuQlLwg==";
|
||||
url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz";
|
||||
sha512 = "0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==";
|
||||
};
|
||||
};
|
||||
"@babel/helper-create-class-features-plugin-7.18.6" = {
|
||||
@@ -166,13 +166,13 @@ let
|
||||
sha512 = "0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==";
|
||||
};
|
||||
};
|
||||
"@babel/helper-module-transforms-7.19.6" = {
|
||||
"@babel/helper-module-transforms-7.20.2" = {
|
||||
name = "_at_babel_slash_helper-module-transforms";
|
||||
packageName = "@babel/helper-module-transforms";
|
||||
version = "7.19.6";
|
||||
version = "7.20.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.6.tgz";
|
||||
sha512 = "fCmcfQo/KYr/VXXDIyd3CBGZ6AFhPFy1TfSEJ+PilGVlQT6jcbqtHAM4C1EciRqMza7/TpOUZliuSH+U6HAhJw==";
|
||||
url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz";
|
||||
sha512 = "zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA==";
|
||||
};
|
||||
};
|
||||
"@babel/helper-optimise-call-expression-7.18.6" = {
|
||||
@@ -184,13 +184,13 @@ let
|
||||
sha512 = "HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==";
|
||||
};
|
||||
};
|
||||
"@babel/helper-plugin-utils-7.19.0" = {
|
||||
"@babel/helper-plugin-utils-7.20.2" = {
|
||||
name = "_at_babel_slash_helper-plugin-utils";
|
||||
packageName = "@babel/helper-plugin-utils";
|
||||
version = "7.19.0";
|
||||
version = "7.20.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz";
|
||||
sha512 = "40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw==";
|
||||
url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz";
|
||||
sha512 = "8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==";
|
||||
};
|
||||
};
|
||||
"@babel/helper-remap-async-to-generator-7.18.9" = {
|
||||
@@ -202,22 +202,22 @@ let
|
||||
sha512 = "dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==";
|
||||
};
|
||||
};
|
||||
"@babel/helper-replace-supers-7.18.9" = {
|
||||
"@babel/helper-replace-supers-7.19.1" = {
|
||||
name = "_at_babel_slash_helper-replace-supers";
|
||||
packageName = "@babel/helper-replace-supers";
|
||||
version = "7.18.9";
|
||||
version = "7.19.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.18.9.tgz";
|
||||
sha512 = "dNsWibVI4lNT6HiuOIBr1oyxo40HvIVmbwPUm3XZ7wMh4k2WxrxTqZwSqw/eEmXDS9np0ey5M2bz9tBmO9c+YQ==";
|
||||
url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz";
|
||||
sha512 = "T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==";
|
||||
};
|
||||
};
|
||||
"@babel/helper-simple-access-7.19.4" = {
|
||||
"@babel/helper-simple-access-7.20.2" = {
|
||||
name = "_at_babel_slash_helper-simple-access";
|
||||
packageName = "@babel/helper-simple-access";
|
||||
version = "7.19.4";
|
||||
version = "7.20.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz";
|
||||
sha512 = "f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg==";
|
||||
url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz";
|
||||
sha512 = "+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==";
|
||||
};
|
||||
};
|
||||
"@babel/helper-skip-transparent-expression-wrappers-7.18.9" = {
|
||||
@@ -274,13 +274,13 @@ let
|
||||
sha512 = "95NLBP59VWdfK2lyLKe6eTMq9xg+yWKzxzxbJ1wcYNi1Auz200+83fMDADjRxBvc2QQor5zja2yTQzXGhk2GtQ==";
|
||||
};
|
||||
};
|
||||
"@babel/helpers-7.19.4" = {
|
||||
"@babel/helpers-7.20.6" = {
|
||||
name = "_at_babel_slash_helpers";
|
||||
packageName = "@babel/helpers";
|
||||
version = "7.19.4";
|
||||
version = "7.20.6";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.19.4.tgz";
|
||||
sha512 = "G+z3aOx2nfDHwX/kyVii5fJq+bgscg89/dJNWpYeKeBv3v9xX8EIabmx1k6u9LS04H7nROFVRVK+e3k0VHp+sw==";
|
||||
url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.6.tgz";
|
||||
sha512 = "Pf/OjgfgFRW5bApskEz5pvidpim7tEDPlFtKcNRXWmfHGn9IEI2W2flqRQXTFb7gIPTyK++N6rVHuwKut4XK6w==";
|
||||
};
|
||||
};
|
||||
"@babel/highlight-7.18.6" = {
|
||||
@@ -292,13 +292,13 @@ let
|
||||
sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==";
|
||||
};
|
||||
};
|
||||
"@babel/parser-7.19.6" = {
|
||||
"@babel/parser-7.20.5" = {
|
||||
name = "_at_babel_slash_parser";
|
||||
packageName = "@babel/parser";
|
||||
version = "7.19.6";
|
||||
version = "7.20.5";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@babel/parser/-/parser-7.19.6.tgz";
|
||||
sha512 = "h1IUp81s2JYJ3mRkdxJgs4UvmSsRvDrx5ICSJbPvtWYv5i1nTBGcBpnog+89rAFMwvvru6E5NUHdBe01UeSzYA==";
|
||||
url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.5.tgz";
|
||||
sha512 = "r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA==";
|
||||
};
|
||||
};
|
||||
"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" = {
|
||||
@@ -319,13 +319,13 @@ let
|
||||
sha512 = "AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg==";
|
||||
};
|
||||
};
|
||||
"@babel/plugin-proposal-async-generator-functions-7.19.1" = {
|
||||
"@babel/plugin-proposal-async-generator-functions-7.20.1" = {
|
||||
name = "_at_babel_slash_plugin-proposal-async-generator-functions";
|
||||
packageName = "@babel/plugin-proposal-async-generator-functions";
|
||||
version = "7.19.1";
|
||||
version = "7.20.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.19.1.tgz";
|
||||
sha512 = "0yu8vNATgLy4ivqMNBIwb1HebCelqN7YX8SL3FDXORv/RqT0zEEWUCH4GH44JsSrvCu6GqnAdR5EBFAPeNBB4Q==";
|
||||
url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.1.tgz";
|
||||
sha512 = "Gh5rchzSwE4kC+o/6T8waD0WHEQIsDmjltY8WnWRXHUdH8axZhuH86Ov9M72YhJfDrZseQwuuWaaIT/TmePp3g==";
|
||||
};
|
||||
};
|
||||
"@babel/plugin-proposal-class-properties-7.18.6" = {
|
||||
@@ -400,13 +400,13 @@ let
|
||||
sha512 = "ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==";
|
||||
};
|
||||
};
|
||||
"@babel/plugin-proposal-object-rest-spread-7.19.4" = {
|
||||
"@babel/plugin-proposal-object-rest-spread-7.20.2" = {
|
||||
name = "_at_babel_slash_plugin-proposal-object-rest-spread";
|
||||
packageName = "@babel/plugin-proposal-object-rest-spread";
|
||||
version = "7.19.4";
|
||||
version = "7.20.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.19.4.tgz";
|
||||
sha512 = "wHmj6LDxVDnL+3WhXteUBaoM1aVILZODAUjg11kHqG4cOlfgMQGxw6aCgvrXrmaJR3Bn14oZhImyCPZzRpC93Q==";
|
||||
url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.2.tgz";
|
||||
sha512 = "Ks6uej9WFK+fvIMesSqbAto5dD8Dz4VuuFvGJFKgIGSkJuRGcrwGECPA1fDgQK3/DbExBJpEkTeYeB8geIFCSQ==";
|
||||
};
|
||||
};
|
||||
"@babel/plugin-proposal-optional-catch-binding-7.18.6" = {
|
||||
@@ -499,13 +499,13 @@ let
|
||||
sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==";
|
||||
};
|
||||
};
|
||||
"@babel/plugin-syntax-import-assertions-7.18.6" = {
|
||||
"@babel/plugin-syntax-import-assertions-7.20.0" = {
|
||||
name = "_at_babel_slash_plugin-syntax-import-assertions";
|
||||
packageName = "@babel/plugin-syntax-import-assertions";
|
||||
version = "7.18.6";
|
||||
version = "7.20.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.18.6.tgz";
|
||||
sha512 = "/DU3RXad9+bZwrgWJQKbr39gYbJpLJHezqEzRzi/BHRlJ9zsQb4CK2CA/5apllXNomwA1qHwzvHl+AdEmC5krQ==";
|
||||
url = "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz";
|
||||
sha512 = "IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==";
|
||||
};
|
||||
};
|
||||
"@babel/plugin-syntax-json-strings-7.8.3" = {
|
||||
@@ -616,22 +616,22 @@ let
|
||||
sha512 = "ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==";
|
||||
};
|
||||
};
|
||||
"@babel/plugin-transform-block-scoping-7.19.4" = {
|
||||
"@babel/plugin-transform-block-scoping-7.20.2" = {
|
||||
name = "_at_babel_slash_plugin-transform-block-scoping";
|
||||
packageName = "@babel/plugin-transform-block-scoping";
|
||||
version = "7.19.4";
|
||||
version = "7.20.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.19.4.tgz";
|
||||
sha512 = "934S2VLLlt2hRJwPf4MczaOr4hYF0z+VKPwqTNxyKX7NthTiPfhuKFWQZHXRM0vh/wo/VyXB3s4bZUNA08l+tQ==";
|
||||
url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.2.tgz";
|
||||
sha512 = "y5V15+04ry69OV2wULmwhEA6jwSWXO1TwAtIwiPXcvHcoOQUqpyMVd2bDsQJMW8AurjulIyUV8kDqtjSwHy1uQ==";
|
||||
};
|
||||
};
|
||||
"@babel/plugin-transform-classes-7.19.0" = {
|
||||
"@babel/plugin-transform-classes-7.20.2" = {
|
||||
name = "_at_babel_slash_plugin-transform-classes";
|
||||
packageName = "@babel/plugin-transform-classes";
|
||||
version = "7.19.0";
|
||||
version = "7.20.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz";
|
||||
sha512 = "YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A==";
|
||||
url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.2.tgz";
|
||||
sha512 = "9rbPp0lCVVoagvtEyQKSo5L8oo0nQS/iif+lwlAz29MccX2642vWDlSZK+2T2buxbopotId2ld7zZAzRfz9j1g==";
|
||||
};
|
||||
};
|
||||
"@babel/plugin-transform-computed-properties-7.18.9" = {
|
||||
@@ -643,13 +643,13 @@ let
|
||||
sha512 = "+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==";
|
||||
};
|
||||
};
|
||||
"@babel/plugin-transform-destructuring-7.19.4" = {
|
||||
"@babel/plugin-transform-destructuring-7.20.2" = {
|
||||
name = "_at_babel_slash_plugin-transform-destructuring";
|
||||
packageName = "@babel/plugin-transform-destructuring";
|
||||
version = "7.19.4";
|
||||
version = "7.20.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.19.4.tgz";
|
||||
sha512 = "t0j0Hgidqf0aM86dF8U+vXYReUgJnlv4bZLsyoPnwZNrGY+7/38o8YjaELrvHeVfTZao15kjR0PVv0nju2iduA==";
|
||||
url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.2.tgz";
|
||||
sha512 = "mENM+ZHrvEgxLTBXUiQ621rRXZes3KWUv6NdQlrnr1TkWVw+hUjQBZuP2X32qKlrlG2BzgR95gkuCRSkJl8vIw==";
|
||||
};
|
||||
};
|
||||
"@babel/plugin-transform-dotall-regex-7.18.6" = {
|
||||
@@ -715,31 +715,31 @@ let
|
||||
sha512 = "qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==";
|
||||
};
|
||||
};
|
||||
"@babel/plugin-transform-modules-amd-7.18.6" = {
|
||||
"@babel/plugin-transform-modules-amd-7.19.6" = {
|
||||
name = "_at_babel_slash_plugin-transform-modules-amd";
|
||||
packageName = "@babel/plugin-transform-modules-amd";
|
||||
version = "7.18.6";
|
||||
version = "7.19.6";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.6.tgz";
|
||||
sha512 = "Pra5aXsmTsOnjM3IajS8rTaLCy++nGM4v3YR4esk5PCsyg9z8NA5oQLwxzMUtDBd8F+UmVza3VxoAaWCbzH1rg==";
|
||||
url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz";
|
||||
sha512 = "uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg==";
|
||||
};
|
||||
};
|
||||
"@babel/plugin-transform-modules-commonjs-7.18.6" = {
|
||||
"@babel/plugin-transform-modules-commonjs-7.19.6" = {
|
||||
name = "_at_babel_slash_plugin-transform-modules-commonjs";
|
||||
packageName = "@babel/plugin-transform-modules-commonjs";
|
||||
version = "7.18.6";
|
||||
version = "7.19.6";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz";
|
||||
sha512 = "Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q==";
|
||||
url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz";
|
||||
sha512 = "8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ==";
|
||||
};
|
||||
};
|
||||
"@babel/plugin-transform-modules-systemjs-7.19.0" = {
|
||||
"@babel/plugin-transform-modules-systemjs-7.19.6" = {
|
||||
name = "_at_babel_slash_plugin-transform-modules-systemjs";
|
||||
packageName = "@babel/plugin-transform-modules-systemjs";
|
||||
version = "7.19.0";
|
||||
version = "7.19.6";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.0.tgz";
|
||||
sha512 = "x9aiR0WXAWmOWsqcsnrzGR+ieaTMVyGyffPVA7F8cXAGt/UxefYv6uSHZLkAFChN5M5Iy1+wjE+xJuPt22H39A==";
|
||||
url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz";
|
||||
sha512 = "fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ==";
|
||||
};
|
||||
};
|
||||
"@babel/plugin-transform-modules-umd-7.18.6" = {
|
||||
@@ -778,13 +778,13 @@ let
|
||||
sha512 = "uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==";
|
||||
};
|
||||
};
|
||||
"@babel/plugin-transform-parameters-7.18.8" = {
|
||||
"@babel/plugin-transform-parameters-7.20.1" = {
|
||||
name = "_at_babel_slash_plugin-transform-parameters";
|
||||
packageName = "@babel/plugin-transform-parameters";
|
||||
version = "7.18.8";
|
||||
version = "7.20.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz";
|
||||
sha512 = "ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg==";
|
||||
url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.1.tgz";
|
||||
sha512 = "nDvKLrAvl+kf6BOy1UJ3MGwzzfTMgppxwiD2Jb4LO3xjYyZq30oQzDNJbCQpMdG9+j2IXHoiMrw5Cm/L6ZoxXQ==";
|
||||
};
|
||||
};
|
||||
"@babel/plugin-transform-property-literals-7.18.6" = {
|
||||
@@ -877,13 +877,13 @@ let
|
||||
sha512 = "gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==";
|
||||
};
|
||||
};
|
||||
"@babel/preset-env-7.19.4" = {
|
||||
"@babel/preset-env-7.20.2" = {
|
||||
name = "_at_babel_slash_preset-env";
|
||||
packageName = "@babel/preset-env";
|
||||
version = "7.19.4";
|
||||
version = "7.20.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.19.4.tgz";
|
||||
sha512 = "5QVOTXUdqTCjQuh2GGtdd7YEhoRXBMVGROAtsBeLGIbIz3obCBIfRMT1I3ZKkMgNzwkyCkftDXSSkHxnfVf4qg==";
|
||||
url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.20.2.tgz";
|
||||
sha512 = "1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg==";
|
||||
};
|
||||
};
|
||||
"@babel/preset-modules-0.1.5" = {
|
||||
@@ -913,22 +913,22 @@ let
|
||||
sha512 = "TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==";
|
||||
};
|
||||
};
|
||||
"@babel/traverse-7.19.6" = {
|
||||
"@babel/traverse-7.20.5" = {
|
||||
name = "_at_babel_slash_traverse";
|
||||
packageName = "@babel/traverse";
|
||||
version = "7.19.6";
|
||||
version = "7.20.5";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.6.tgz";
|
||||
sha512 = "6l5HrUCzFM04mfbG09AagtYyR2P0B71B1wN7PfSPiksDPz2k5H9CBC1tcZpz2M8OxbKTPccByoOJ22rUKbpmQQ==";
|
||||
url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.5.tgz";
|
||||
sha512 = "WM5ZNN3JITQIq9tFZaw1ojLU3WgWdtkxnhM1AegMS+PvHjkM5IXjmYEGY7yukz5XS4sJyEf2VzWjI8uAavhxBQ==";
|
||||
};
|
||||
};
|
||||
"@babel/types-7.19.4" = {
|
||||
"@babel/types-7.20.5" = {
|
||||
name = "_at_babel_slash_types";
|
||||
packageName = "@babel/types";
|
||||
version = "7.19.4";
|
||||
version = "7.20.5";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@babel/types/-/types-7.19.4.tgz";
|
||||
sha512 = "M5LK7nAeS6+9j7hAq+b3fQs+pNfUtTGq+yFFfHnauFA8zQtLRfmuipmsKDKKLuyG+wC8ABW43A153YNawNTEtw==";
|
||||
url = "https://registry.npmjs.org/@babel/types/-/types-7.20.5.tgz";
|
||||
sha512 = "c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg==";
|
||||
};
|
||||
};
|
||||
"@discoveryjs/json-ext-0.5.5" = {
|
||||
@@ -949,49 +949,49 @@ let
|
||||
sha512 = "uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==";
|
||||
};
|
||||
};
|
||||
"@fortawesome/fontawesome-common-types-6.2.0" = {
|
||||
"@fortawesome/fontawesome-common-types-6.2.1" = {
|
||||
name = "_at_fortawesome_slash_fontawesome-common-types";
|
||||
packageName = "@fortawesome/fontawesome-common-types";
|
||||
version = "6.2.0";
|
||||
version = "6.2.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.0.tgz";
|
||||
sha512 = "rBevIsj2nclStJ7AxTdfsa3ovHb1H+qApwrxcTVo+NNdeJiB9V75hsKfrkG5AwNcRUNxrPPiScGYCNmLMoh8pg==";
|
||||
url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.1.tgz";
|
||||
sha512 = "Sz07mnQrTekFWLz5BMjOzHl/+NooTdW8F8kDQxjWwbpOJcnoSg4vUDng8d/WR1wOxM0O+CY9Zw0nR054riNYtQ==";
|
||||
};
|
||||
};
|
||||
"@fortawesome/fontawesome-svg-core-6.2.0" = {
|
||||
"@fortawesome/fontawesome-svg-core-6.2.1" = {
|
||||
name = "_at_fortawesome_slash_fontawesome-svg-core";
|
||||
packageName = "@fortawesome/fontawesome-svg-core";
|
||||
version = "6.2.0";
|
||||
version = "6.2.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.2.0.tgz";
|
||||
sha512 = "Cf2mAAeMWFMzpLC7Y9H1I4o3wEU+XovVJhTiNG8ZNgSQj53yl7OCJaS80K4YjrABWZzbAHVaoHE1dVJ27AAYXw==";
|
||||
url = "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.2.1.tgz";
|
||||
sha512 = "HELwwbCz6C1XEcjzyT1Jugmz2NNklMrSPjZOWMlc+ZsHIVk+XOvOXLGGQtFBwSyqfJDNgRq4xBCwWOaZ/d9DEA==";
|
||||
};
|
||||
};
|
||||
"@fortawesome/free-brands-svg-icons-6.2.0" = {
|
||||
"@fortawesome/free-brands-svg-icons-6.2.1" = {
|
||||
name = "_at_fortawesome_slash_free-brands-svg-icons";
|
||||
packageName = "@fortawesome/free-brands-svg-icons";
|
||||
version = "6.2.0";
|
||||
version = "6.2.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.2.0.tgz";
|
||||
sha512 = "fm1y4NyZ2qKYNmYhdMz9VAWRw1Et7PMHNunSw3W0SVAwKwv6o0qiJworLH3Y9SnmhHzAymXJwCX1op22FFvGiA==";
|
||||
url = "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.2.1.tgz";
|
||||
sha512 = "L8l4MfdHPmZlJ72PvzdfwOwbwcCAL0vx48tJRnI6u1PJXh+j2f3yDoKyQgO3qjEsgD5Fr2tQV/cPP8F/k6aUig==";
|
||||
};
|
||||
};
|
||||
"@fortawesome/free-solid-svg-icons-6.2.0" = {
|
||||
"@fortawesome/free-solid-svg-icons-6.2.1" = {
|
||||
name = "_at_fortawesome_slash_free-solid-svg-icons";
|
||||
packageName = "@fortawesome/free-solid-svg-icons";
|
||||
version = "6.2.0";
|
||||
version = "6.2.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.2.0.tgz";
|
||||
sha512 = "UjCILHIQ4I8cN46EiQn0CZL/h8AwCGgR//1c4R96Q5viSRwuKVo0NdQEc4bm+69ZwC0dUvjbDqAHF1RR5FA3XA==";
|
||||
url = "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.2.1.tgz";
|
||||
sha512 = "oKuqrP5jbfEPJWTij4sM+/RvgX+RMFwx3QZCZcK9PrBDgxC35zuc7AOFsyMjMd/PIFPeB2JxyqDr5zs/DZFPPw==";
|
||||
};
|
||||
};
|
||||
"@fortawesome/vue-fontawesome-2.0.8" = {
|
||||
"@fortawesome/vue-fontawesome-2.0.9" = {
|
||||
name = "_at_fortawesome_slash_vue-fontawesome";
|
||||
packageName = "@fortawesome/vue-fontawesome";
|
||||
version = "2.0.8";
|
||||
version = "2.0.9";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.8.tgz";
|
||||
sha512 = "SRmP0q9Ox4zq8ydDR/hrH+23TVU1bdwYVnugLVaAIwklOHbf56gx6JUGlwES7zjuNYqzKgl8e39iYf6ph8qSQw==";
|
||||
url = "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.9.tgz";
|
||||
sha512 = "tUmO92PFHbLOplitjHNBVGMJm6S57vp16tBXJVPKSI/6CfjrgLycqKxEpC6f7qsOqUdoXs5nIv4HLUfrOMHzuw==";
|
||||
};
|
||||
};
|
||||
"@humanwhocodes/config-array-0.11.6" = {
|
||||
@@ -1336,13 +1336,13 @@ let
|
||||
sha512 = "6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==";
|
||||
};
|
||||
};
|
||||
"@vue/compiler-sfc-2.7.13" = {
|
||||
"@vue/compiler-sfc-2.7.14" = {
|
||||
name = "_at_vue_slash_compiler-sfc";
|
||||
packageName = "@vue/compiler-sfc";
|
||||
version = "2.7.13";
|
||||
version = "2.7.14";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.13.tgz";
|
||||
sha512 = "zzu2rLRZlgIU+OT3Atbr7Y6PG+LW4wVQpPfNRrGDH3dM9PsrcVfa+1pKb8bW467bGM3aDOvAnsYLWVpYIv3GRg==";
|
||||
url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.14.tgz";
|
||||
sha512 = "aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA==";
|
||||
};
|
||||
};
|
||||
"@vue/component-compiler-utils-3.2.2" = {
|
||||
@@ -1777,22 +1777,13 @@ let
|
||||
sha512 = "t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==";
|
||||
};
|
||||
};
|
||||
"babel-loader-8.2.5" = {
|
||||
"babel-loader-8.3.0" = {
|
||||
name = "babel-loader";
|
||||
packageName = "babel-loader";
|
||||
version = "8.2.5";
|
||||
version = "8.3.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.5.tgz";
|
||||
sha512 = "OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==";
|
||||
};
|
||||
};
|
||||
"babel-plugin-dynamic-import-node-2.3.3" = {
|
||||
name = "babel-plugin-dynamic-import-node";
|
||||
packageName = "babel-plugin-dynamic-import-node";
|
||||
version = "2.3.3";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz";
|
||||
sha512 = "jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==";
|
||||
url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.3.0.tgz";
|
||||
sha512 = "H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==";
|
||||
};
|
||||
};
|
||||
"babel-plugin-polyfill-corejs2-0.3.3" = {
|
||||
@@ -2254,13 +2245,13 @@ let
|
||||
sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c";
|
||||
};
|
||||
};
|
||||
"copy-to-clipboard-3.3.2" = {
|
||||
"copy-to-clipboard-3.3.3" = {
|
||||
name = "copy-to-clipboard";
|
||||
packageName = "copy-to-clipboard";
|
||||
version = "3.3.2";
|
||||
version = "3.3.3";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.2.tgz";
|
||||
sha512 = "Vme1Z6RUDzrb6xAI7EZlVZ5uvOk2F//GaxKUxajDqm9LhOVM1inxNAD2vy+UZDYsd0uyA9s7b3/FVZPSxqrCfg==";
|
||||
url = "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz";
|
||||
sha512 = "2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA==";
|
||||
};
|
||||
};
|
||||
"copy-webpack-plugin-11.0.0" = {
|
||||
@@ -2299,13 +2290,13 @@ let
|
||||
sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==";
|
||||
};
|
||||
};
|
||||
"css-loader-6.7.1" = {
|
||||
"css-loader-6.7.2" = {
|
||||
name = "css-loader";
|
||||
packageName = "css-loader";
|
||||
version = "6.7.1";
|
||||
version = "6.7.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/css-loader/-/css-loader-6.7.1.tgz";
|
||||
sha512 = "yB5CNFa14MbPJcomwNh3wLThtkZgcNyI2bNMRt8iE5Z8Vwl7f8vQXFAzn2HDOJvtDq2NTZBUGMSUNNyrv3/+cw==";
|
||||
url = "https://registry.npmjs.org/css-loader/-/css-loader-6.7.2.tgz";
|
||||
sha512 = "oqGbbVcBJkm8QwmnNzrFrWTnudnRZC+1eXikLJl0n4ljcfotgRifpg2a1lKy8jTrc4/d9A/ap1GFq1jDKG7J+Q==";
|
||||
};
|
||||
};
|
||||
"css-select-4.1.3" = {
|
||||
@@ -2713,13 +2704,13 @@ let
|
||||
sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==";
|
||||
};
|
||||
};
|
||||
"eslint-8.26.0" = {
|
||||
"eslint-8.28.0" = {
|
||||
name = "eslint";
|
||||
packageName = "eslint";
|
||||
version = "8.26.0";
|
||||
version = "8.28.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/eslint/-/eslint-8.26.0.tgz";
|
||||
sha512 = "kzJkpaw1Bfwheq4VXUezFriD1GxszX6dUekM7Z3aC2o4hju+tsR/XyTC3RcoSD7jmy9VkPU3+N6YjVU2e96Oyg==";
|
||||
url = "https://registry.npmjs.org/eslint/-/eslint-8.28.0.tgz";
|
||||
sha512 = "S27Di+EVyMxcHiwDrFzk8dJYAaD+/5SoWKxL1ri/71CRHsnJnRDPNt2Kzj24+MT9FDupf4aqqyqPrvI8MvQ4VQ==";
|
||||
};
|
||||
};
|
||||
"eslint-config-airbnb-base-15.0.0" = {
|
||||
@@ -2758,13 +2749,13 @@ let
|
||||
sha512 = "hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==";
|
||||
};
|
||||
};
|
||||
"eslint-plugin-vue-9.6.0" = {
|
||||
"eslint-plugin-vue-9.8.0" = {
|
||||
name = "eslint-plugin-vue";
|
||||
packageName = "eslint-plugin-vue";
|
||||
version = "9.6.0";
|
||||
version = "9.8.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.6.0.tgz";
|
||||
sha512 = "zzySkJgVbFCylnG2+9MDF7N+2Rjze2y0bF8GyUNpFOnT8mCMfqqtLDJkHBuYu9N/psW1A6DVbQhPkP92E+qakA==";
|
||||
url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.8.0.tgz";
|
||||
sha512 = "E/AXwcTzunyzM83C2QqDHxepMzvI2y6x+mmeYHbVDQlKFqmKYvRrhaVixEeeG27uI44p9oKDFiyCRw4XxgtfHA==";
|
||||
};
|
||||
};
|
||||
"eslint-scope-5.1.1" = {
|
||||
@@ -3253,13 +3244,13 @@ let
|
||||
sha512 = "bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==";
|
||||
};
|
||||
};
|
||||
"globals-13.17.0" = {
|
||||
"globals-13.18.0" = {
|
||||
name = "globals";
|
||||
packageName = "globals";
|
||||
version = "13.17.0";
|
||||
version = "13.18.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz";
|
||||
sha512 = "1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==";
|
||||
url = "https://registry.npmjs.org/globals/-/globals-13.18.0.tgz";
|
||||
sha512 = "/mR4KI8Ps2spmoc0Ulu9L7agOF0du1CZNQ3dke8yItYlyKNmGrkONemBbd6V8UTc1Wgcqn21t3WYB7dbRmh6/A==";
|
||||
};
|
||||
};
|
||||
"globby-13.1.1" = {
|
||||
@@ -4117,13 +4108,13 @@ let
|
||||
sha512 = "rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==";
|
||||
};
|
||||
};
|
||||
"loader-utils-2.0.2" = {
|
||||
"loader-utils-2.0.3" = {
|
||||
name = "loader-utils";
|
||||
packageName = "loader-utils";
|
||||
version = "2.0.2";
|
||||
version = "2.0.3";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz";
|
||||
sha512 = "TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==";
|
||||
url = "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz";
|
||||
sha512 = "THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==";
|
||||
};
|
||||
};
|
||||
"locate-path-2.0.0" = {
|
||||
@@ -4936,13 +4927,13 @@ let
|
||||
sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==";
|
||||
};
|
||||
};
|
||||
"postcss-8.4.14" = {
|
||||
"postcss-8.4.19" = {
|
||||
name = "postcss";
|
||||
packageName = "postcss";
|
||||
version = "8.4.14";
|
||||
version = "8.4.19";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz";
|
||||
sha512 = "E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==";
|
||||
url = "https://registry.npmjs.org/postcss/-/postcss-8.4.19.tgz";
|
||||
sha512 = "h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA==";
|
||||
};
|
||||
};
|
||||
"postcss-modules-extract-imports-3.0.0" = {
|
||||
@@ -5359,22 +5350,22 @@ let
|
||||
sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
|
||||
};
|
||||
};
|
||||
"sass-1.55.0" = {
|
||||
"sass-1.56.1" = {
|
||||
name = "sass";
|
||||
packageName = "sass";
|
||||
version = "1.55.0";
|
||||
version = "1.56.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/sass/-/sass-1.55.0.tgz";
|
||||
sha512 = "Pk+PMy7OGLs9WaxZGJMn7S96dvlyVBwwtToX895WmCpAOr5YiJYEUJfiJidMuKb613z2xNWcXCHEuOvjZbqC6A==";
|
||||
url = "https://registry.npmjs.org/sass/-/sass-1.56.1.tgz";
|
||||
sha512 = "VpEyKpyBPCxE7qGDtOcdJ6fFbcpOM+Emu7uZLxVrkX8KVU/Dp5UF7WLvzqRuUhB6mqqQt1xffLoG+AndxTZrCQ==";
|
||||
};
|
||||
};
|
||||
"sass-loader-13.1.0" = {
|
||||
"sass-loader-13.2.0" = {
|
||||
name = "sass-loader";
|
||||
packageName = "sass-loader";
|
||||
version = "13.1.0";
|
||||
version = "13.2.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/sass-loader/-/sass-loader-13.1.0.tgz";
|
||||
sha512 = "tZS1RJQ2n2+QNyf3CCAo1H562WjL/5AM6Gi8YcPVVoNxQX8d19mx8E+8fRrMWsyc93ZL6Q8vZDSM0FHVTJaVnQ==";
|
||||
url = "https://registry.npmjs.org/sass-loader/-/sass-loader-13.2.0.tgz";
|
||||
sha512 = "JWEp48djQA4nbZxmgC02/Wh0eroSUutulROUusYJO9P9zltRbNN80JCBHqRGzjd4cmZCa/r88xgfkjGD0TXsHg==";
|
||||
};
|
||||
};
|
||||
"schema-utils-2.7.1" = {
|
||||
@@ -5440,13 +5431,13 @@ let
|
||||
sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==";
|
||||
};
|
||||
};
|
||||
"semver-7.3.7" = {
|
||||
"semver-7.3.8" = {
|
||||
name = "semver";
|
||||
packageName = "semver";
|
||||
version = "7.3.7";
|
||||
version = "7.3.8";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz";
|
||||
sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==";
|
||||
url = "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz";
|
||||
sha512 = "NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==";
|
||||
};
|
||||
};
|
||||
"send-0.17.2" = {
|
||||
@@ -6025,13 +6016,13 @@ let
|
||||
sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc";
|
||||
};
|
||||
};
|
||||
"vue-2.7.13" = {
|
||||
"vue-2.7.14" = {
|
||||
name = "vue";
|
||||
packageName = "vue";
|
||||
version = "2.7.13";
|
||||
version = "2.7.14";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/vue/-/vue-2.7.13.tgz";
|
||||
sha512 = "QnM6ULTNnPmn71eUO+4hdjfBIA3H0GLsBnchnI/kS678tjI45GOUZhXd0oP/gX9isikXz1PAzSnkPspp9EUNfQ==";
|
||||
url = "https://registry.npmjs.org/vue/-/vue-2.7.14.tgz";
|
||||
sha512 = "b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ==";
|
||||
};
|
||||
};
|
||||
"vue-eslint-parser-8.3.0" = {
|
||||
@@ -6061,13 +6052,13 @@ let
|
||||
sha512 = "BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==";
|
||||
};
|
||||
};
|
||||
"vue-loader-15.10.0" = {
|
||||
"vue-loader-15.10.1" = {
|
||||
name = "vue-loader";
|
||||
packageName = "vue-loader";
|
||||
version = "15.10.0";
|
||||
version = "15.10.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.0.tgz";
|
||||
sha512 = "VU6tuO8eKajrFeBzMssFUP9SvakEeeSi1BxdTH5o3+1yUyrldp8IERkSdXlMI2t4kxF2sqYUDsQY+WJBxzBmZg==";
|
||||
url = "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.1.tgz";
|
||||
sha512 = "SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA==";
|
||||
};
|
||||
};
|
||||
"vue-meta-2.4.0" = {
|
||||
@@ -6124,13 +6115,13 @@ let
|
||||
sha512 = "sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg==";
|
||||
};
|
||||
};
|
||||
"vue-template-compiler-2.7.13" = {
|
||||
"vue-template-compiler-2.7.14" = {
|
||||
name = "vue-template-compiler";
|
||||
packageName = "vue-template-compiler";
|
||||
version = "2.7.13";
|
||||
version = "2.7.14";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.13.tgz";
|
||||
sha512 = "jYM6TClwDS9YqP48gYrtAtaOhRKkbYmbzE+Q51gX5YDr777n7tNI/IZk4QV4l/PjQPNh/FVa/E92sh/RqKMrog==";
|
||||
url = "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.14.tgz";
|
||||
sha512 = "zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ==";
|
||||
};
|
||||
};
|
||||
"vue-template-es2015-compiler-1.9.1" = {
|
||||
@@ -6169,13 +6160,13 @@ let
|
||||
sha512 = "O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==";
|
||||
};
|
||||
};
|
||||
"webpack-5.74.0" = {
|
||||
"webpack-5.75.0" = {
|
||||
name = "webpack";
|
||||
packageName = "webpack";
|
||||
version = "5.74.0";
|
||||
version = "5.75.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz";
|
||||
sha512 = "A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==";
|
||||
url = "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz";
|
||||
sha512 = "piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==";
|
||||
};
|
||||
};
|
||||
"webpack-bundle-analyzer-4.7.0" = {
|
||||
@@ -6367,8 +6358,8 @@ let
|
||||
dependencies = [
|
||||
sources."@ampproject/remapping-2.1.1"
|
||||
sources."@babel/code-frame-7.18.6"
|
||||
sources."@babel/compat-data-7.19.4"
|
||||
(sources."@babel/core-7.19.6" // {
|
||||
sources."@babel/compat-data-7.20.1"
|
||||
(sources."@babel/core-7.20.5" // {
|
||||
dependencies = [
|
||||
sources."debug-4.3.4"
|
||||
sources."json5-2.2.1"
|
||||
@@ -6382,10 +6373,10 @@ let
|
||||
sources."semver-6.3.0"
|
||||
];
|
||||
})
|
||||
sources."@babel/generator-7.19.6"
|
||||
sources."@babel/generator-7.20.5"
|
||||
sources."@babel/helper-annotate-as-pure-7.18.6"
|
||||
sources."@babel/helper-builder-binary-assignment-operator-visitor-7.18.6"
|
||||
(sources."@babel/helper-compilation-targets-7.19.3" // {
|
||||
(sources."@babel/helper-compilation-targets-7.20.0" // {
|
||||
dependencies = [
|
||||
sources."semver-6.3.0"
|
||||
];
|
||||
@@ -6405,24 +6396,24 @@ let
|
||||
sources."@babel/helper-hoist-variables-7.18.6"
|
||||
sources."@babel/helper-member-expression-to-functions-7.18.9"
|
||||
sources."@babel/helper-module-imports-7.18.6"
|
||||
sources."@babel/helper-module-transforms-7.19.6"
|
||||
sources."@babel/helper-module-transforms-7.20.2"
|
||||
sources."@babel/helper-optimise-call-expression-7.18.6"
|
||||
sources."@babel/helper-plugin-utils-7.19.0"
|
||||
sources."@babel/helper-plugin-utils-7.20.2"
|
||||
sources."@babel/helper-remap-async-to-generator-7.18.9"
|
||||
sources."@babel/helper-replace-supers-7.18.9"
|
||||
sources."@babel/helper-simple-access-7.19.4"
|
||||
sources."@babel/helper-replace-supers-7.19.1"
|
||||
sources."@babel/helper-simple-access-7.20.2"
|
||||
sources."@babel/helper-skip-transparent-expression-wrappers-7.18.9"
|
||||
sources."@babel/helper-split-export-declaration-7.18.6"
|
||||
sources."@babel/helper-string-parser-7.19.4"
|
||||
sources."@babel/helper-validator-identifier-7.19.1"
|
||||
sources."@babel/helper-validator-option-7.18.6"
|
||||
sources."@babel/helper-wrap-function-7.18.10"
|
||||
sources."@babel/helpers-7.19.4"
|
||||
sources."@babel/helpers-7.20.6"
|
||||
sources."@babel/highlight-7.18.6"
|
||||
sources."@babel/parser-7.19.6"
|
||||
sources."@babel/parser-7.20.5"
|
||||
sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6"
|
||||
sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9"
|
||||
sources."@babel/plugin-proposal-async-generator-functions-7.19.1"
|
||||
sources."@babel/plugin-proposal-async-generator-functions-7.20.1"
|
||||
sources."@babel/plugin-proposal-class-properties-7.18.6"
|
||||
sources."@babel/plugin-proposal-class-static-block-7.18.6"
|
||||
sources."@babel/plugin-proposal-dynamic-import-7.18.6"
|
||||
@@ -6431,7 +6422,7 @@ let
|
||||
sources."@babel/plugin-proposal-logical-assignment-operators-7.18.9"
|
||||
sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6"
|
||||
sources."@babel/plugin-proposal-numeric-separator-7.18.6"
|
||||
sources."@babel/plugin-proposal-object-rest-spread-7.19.4"
|
||||
sources."@babel/plugin-proposal-object-rest-spread-7.20.2"
|
||||
sources."@babel/plugin-proposal-optional-catch-binding-7.18.6"
|
||||
sources."@babel/plugin-proposal-optional-chaining-7.18.9"
|
||||
sources."@babel/plugin-proposal-private-methods-7.18.6"
|
||||
@@ -6442,7 +6433,7 @@ let
|
||||
sources."@babel/plugin-syntax-class-static-block-7.14.5"
|
||||
sources."@babel/plugin-syntax-dynamic-import-7.8.3"
|
||||
sources."@babel/plugin-syntax-export-namespace-from-7.8.3"
|
||||
sources."@babel/plugin-syntax-import-assertions-7.18.6"
|
||||
sources."@babel/plugin-syntax-import-assertions-7.20.0"
|
||||
sources."@babel/plugin-syntax-json-strings-7.8.3"
|
||||
sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4"
|
||||
sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3"
|
||||
@@ -6455,10 +6446,10 @@ let
|
||||
sources."@babel/plugin-transform-arrow-functions-7.18.6"
|
||||
sources."@babel/plugin-transform-async-to-generator-7.18.6"
|
||||
sources."@babel/plugin-transform-block-scoped-functions-7.18.6"
|
||||
sources."@babel/plugin-transform-block-scoping-7.19.4"
|
||||
sources."@babel/plugin-transform-classes-7.19.0"
|
||||
sources."@babel/plugin-transform-block-scoping-7.20.2"
|
||||
sources."@babel/plugin-transform-classes-7.20.2"
|
||||
sources."@babel/plugin-transform-computed-properties-7.18.9"
|
||||
sources."@babel/plugin-transform-destructuring-7.19.4"
|
||||
sources."@babel/plugin-transform-destructuring-7.20.2"
|
||||
sources."@babel/plugin-transform-dotall-regex-7.18.6"
|
||||
sources."@babel/plugin-transform-duplicate-keys-7.18.9"
|
||||
sources."@babel/plugin-transform-exponentiation-operator-7.18.6"
|
||||
@@ -6466,14 +6457,14 @@ let
|
||||
sources."@babel/plugin-transform-function-name-7.18.9"
|
||||
sources."@babel/plugin-transform-literals-7.18.9"
|
||||
sources."@babel/plugin-transform-member-expression-literals-7.18.6"
|
||||
sources."@babel/plugin-transform-modules-amd-7.18.6"
|
||||
sources."@babel/plugin-transform-modules-commonjs-7.18.6"
|
||||
sources."@babel/plugin-transform-modules-systemjs-7.19.0"
|
||||
sources."@babel/plugin-transform-modules-amd-7.19.6"
|
||||
sources."@babel/plugin-transform-modules-commonjs-7.19.6"
|
||||
sources."@babel/plugin-transform-modules-systemjs-7.19.6"
|
||||
sources."@babel/plugin-transform-modules-umd-7.18.6"
|
||||
sources."@babel/plugin-transform-named-capturing-groups-regex-7.19.1"
|
||||
sources."@babel/plugin-transform-new-target-7.18.6"
|
||||
sources."@babel/plugin-transform-object-super-7.18.6"
|
||||
sources."@babel/plugin-transform-parameters-7.18.8"
|
||||
sources."@babel/plugin-transform-parameters-7.20.1"
|
||||
sources."@babel/plugin-transform-property-literals-7.18.6"
|
||||
sources."@babel/plugin-transform-regenerator-7.18.6"
|
||||
sources."@babel/plugin-transform-reserved-words-7.18.6"
|
||||
@@ -6484,7 +6475,7 @@ let
|
||||
sources."@babel/plugin-transform-typeof-symbol-7.18.9"
|
||||
sources."@babel/plugin-transform-unicode-escapes-7.18.10"
|
||||
sources."@babel/plugin-transform-unicode-regex-7.18.6"
|
||||
(sources."@babel/preset-env-7.19.4" // {
|
||||
(sources."@babel/preset-env-7.20.2" // {
|
||||
dependencies = [
|
||||
sources."semver-6.3.0"
|
||||
];
|
||||
@@ -6492,13 +6483,13 @@ let
|
||||
sources."@babel/preset-modules-0.1.5"
|
||||
sources."@babel/runtime-7.14.6"
|
||||
sources."@babel/template-7.18.10"
|
||||
(sources."@babel/traverse-7.19.6" // {
|
||||
(sources."@babel/traverse-7.20.5" // {
|
||||
dependencies = [
|
||||
sources."debug-4.3.3"
|
||||
sources."ms-2.1.2"
|
||||
];
|
||||
})
|
||||
sources."@babel/types-7.19.4"
|
||||
sources."@babel/types-7.20.5"
|
||||
sources."@discoveryjs/json-ext-0.5.5"
|
||||
(sources."@eslint/eslintrc-1.3.3" // {
|
||||
dependencies = [
|
||||
@@ -6507,11 +6498,11 @@ let
|
||||
sources."ms-2.1.2"
|
||||
];
|
||||
})
|
||||
sources."@fortawesome/fontawesome-common-types-6.2.0"
|
||||
sources."@fortawesome/fontawesome-svg-core-6.2.0"
|
||||
sources."@fortawesome/free-brands-svg-icons-6.2.0"
|
||||
sources."@fortawesome/free-solid-svg-icons-6.2.0"
|
||||
sources."@fortawesome/vue-fontawesome-2.0.8"
|
||||
sources."@fortawesome/fontawesome-common-types-6.2.1"
|
||||
sources."@fortawesome/fontawesome-svg-core-6.2.1"
|
||||
sources."@fortawesome/free-brands-svg-icons-6.2.1"
|
||||
sources."@fortawesome/free-solid-svg-icons-6.2.1"
|
||||
sources."@fortawesome/vue-fontawesome-2.0.9"
|
||||
(sources."@humanwhocodes/config-array-0.11.6" // {
|
||||
dependencies = [
|
||||
sources."debug-4.3.3"
|
||||
@@ -6555,7 +6546,7 @@ let
|
||||
sources."@types/serve-static-1.13.10"
|
||||
sources."@types/sockjs-0.3.33"
|
||||
sources."@types/ws-8.5.3"
|
||||
sources."@vue/compiler-sfc-2.7.13"
|
||||
sources."@vue/compiler-sfc-2.7.14"
|
||||
(sources."@vue/component-compiler-utils-3.2.2" // {
|
||||
dependencies = [
|
||||
sources."picocolors-0.2.1"
|
||||
@@ -6619,14 +6610,13 @@ let
|
||||
})
|
||||
sources."asynckit-0.4.0"
|
||||
sources."axios-0.27.2"
|
||||
(sources."babel-loader-8.2.5" // {
|
||||
(sources."babel-loader-8.3.0" // {
|
||||
dependencies = [
|
||||
sources."json5-2.2.1"
|
||||
sources."loader-utils-2.0.2"
|
||||
sources."loader-utils-2.0.3"
|
||||
sources."schema-utils-2.7.1"
|
||||
];
|
||||
})
|
||||
sources."babel-plugin-dynamic-import-node-2.3.3"
|
||||
(sources."babel-plugin-polyfill-corejs2-0.3.3" // {
|
||||
dependencies = [
|
||||
sources."semver-6.3.0"
|
||||
@@ -6688,7 +6678,7 @@ let
|
||||
sources."convert-source-map-1.8.0"
|
||||
sources."cookie-0.4.2"
|
||||
sources."cookie-signature-1.0.6"
|
||||
sources."copy-to-clipboard-3.3.2"
|
||||
sources."copy-to-clipboard-3.3.3"
|
||||
(sources."copy-webpack-plugin-11.0.0" // {
|
||||
dependencies = [
|
||||
sources."ajv-8.11.0"
|
||||
@@ -6702,7 +6692,7 @@ let
|
||||
sources."core-js-compat-3.25.1"
|
||||
sources."core-util-is-1.0.3"
|
||||
sources."cross-spawn-7.0.3"
|
||||
sources."css-loader-6.7.1"
|
||||
sources."css-loader-6.7.2"
|
||||
sources."css-select-4.1.3"
|
||||
sources."css-what-5.1.0"
|
||||
sources."cssesc-3.0.0"
|
||||
@@ -6762,7 +6752,7 @@ let
|
||||
sources."escalade-3.1.1"
|
||||
sources."escape-html-1.0.3"
|
||||
sources."escape-string-regexp-1.0.5"
|
||||
(sources."eslint-8.26.0" // {
|
||||
(sources."eslint-8.28.0" // {
|
||||
dependencies = [
|
||||
sources."ansi-styles-4.3.0"
|
||||
sources."chalk-4.1.2"
|
||||
@@ -6774,7 +6764,7 @@ let
|
||||
sources."estraverse-5.3.0"
|
||||
sources."find-up-5.0.0"
|
||||
sources."glob-parent-6.0.2"
|
||||
sources."globals-13.17.0"
|
||||
sources."globals-13.18.0"
|
||||
sources."has-flag-4.0.0"
|
||||
sources."is-path-inside-3.0.3"
|
||||
sources."locate-path-6.0.0"
|
||||
@@ -6807,7 +6797,7 @@ let
|
||||
sources."doctrine-2.1.0"
|
||||
];
|
||||
})
|
||||
(sources."eslint-plugin-vue-9.6.0" // {
|
||||
(sources."eslint-plugin-vue-9.8.0" // {
|
||||
dependencies = [
|
||||
sources."debug-4.3.4"
|
||||
sources."eslint-scope-7.1.1"
|
||||
@@ -7143,7 +7133,7 @@ let
|
||||
sources."pinkie-promise-2.0.1"
|
||||
sources."plurals-cldr-2.0.1"
|
||||
sources."popper.js-1.16.1"
|
||||
sources."postcss-8.4.14"
|
||||
sources."postcss-8.4.19"
|
||||
sources."postcss-modules-extract-imports-3.0.0"
|
||||
sources."postcss-modules-local-by-default-4.0.0"
|
||||
sources."postcss-modules-scope-3.0.0"
|
||||
@@ -7198,12 +7188,12 @@ let
|
||||
sources."run-parallel-1.2.0"
|
||||
sources."safe-buffer-5.1.2"
|
||||
sources."safer-buffer-2.1.2"
|
||||
sources."sass-1.55.0"
|
||||
sources."sass-loader-13.1.0"
|
||||
sources."sass-1.56.1"
|
||||
sources."sass-loader-13.2.0"
|
||||
sources."schema-utils-3.1.1"
|
||||
sources."select-hose-2.0.0"
|
||||
sources."selfsigned-2.1.1"
|
||||
(sources."semver-7.3.7" // {
|
||||
(sources."semver-7.3.8" // {
|
||||
dependencies = [
|
||||
sources."lru-cache-6.0.0"
|
||||
sources."yallist-4.0.0"
|
||||
@@ -7313,7 +7303,7 @@ let
|
||||
sources."uuid-8.3.2"
|
||||
sources."v-tooltip-2.1.3"
|
||||
sources."vary-1.1.2"
|
||||
sources."vue-2.7.13"
|
||||
sources."vue-2.7.14"
|
||||
(sources."vue-eslint-parser-8.3.0" // {
|
||||
dependencies = [
|
||||
sources."debug-4.3.3"
|
||||
@@ -7323,19 +7313,19 @@ let
|
||||
];
|
||||
})
|
||||
sources."vue-hot-reload-api-2.3.4"
|
||||
sources."vue-loader-15.10.0"
|
||||
sources."vue-loader-15.10.1"
|
||||
sources."vue-meta-2.4.0"
|
||||
sources."vue-multiselect-2.1.6"
|
||||
sources."vue-resize-1.0.1"
|
||||
sources."vue-router-3.6.5"
|
||||
sources."vue-snotify-3.2.1"
|
||||
sources."vue-style-loader-4.1.3"
|
||||
sources."vue-template-compiler-2.7.13"
|
||||
sources."vue-template-compiler-2.7.14"
|
||||
sources."vue-template-es2015-compiler-1.9.1"
|
||||
sources."vuex-3.6.2"
|
||||
sources."watchpack-2.4.0"
|
||||
sources."wbuf-1.7.3"
|
||||
sources."webpack-5.74.0"
|
||||
sources."webpack-5.75.0"
|
||||
(sources."webpack-bundle-analyzer-4.7.0" // {
|
||||
dependencies = [
|
||||
sources."ansi-styles-4.3.0"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -I nixpkgs=../../../../.. -i bash -p nodePackages.node2nix gnused jq curl
|
||||
set -eoux pipefail
|
||||
#! nix-shell -I nixpkgs=../../../.. -i bash -p nodePackages.node2nix gnused jq curl
|
||||
set -eou pipefail
|
||||
|
||||
cd "$(dirname "$0")"
|
||||
pushd ../../../../..
|
||||
|
||||
@@ -17,7 +17,7 @@ let
|
||||
homepage = "https://keepass.info/plugins.html#otpkeyprov";
|
||||
platforms = with lib.platforms; linux;
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = [ lib.maintainers.ente ];
|
||||
maintainers = [ lib.maintainers.Enteee ];
|
||||
};
|
||||
|
||||
pluginFilename = "OtpKeyProv.plgx";
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tippecanoe";
|
||||
version = "2.16.0";
|
||||
version = "2.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "felt";
|
||||
repo = "tippecanoe";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-C0FCdCgycCh+3iG4D9HMOzx/r+MoYdJUgWL5fs8T1rU=";
|
||||
hash = "sha256-GQPex+NX1DDOBWs/tBUsCtIWZ/+jxeblTRQEvfS2WuA=";
|
||||
};
|
||||
|
||||
buildInputs = [ sqlite zlib ];
|
||||
|
||||
@@ -231,6 +231,5 @@ in stdenv.mkDerivation {
|
||||
inherit (chromium) upstream-info browser;
|
||||
mkDerivation = chromium.mkChromiumDerivation;
|
||||
inherit chromeSrc sandboxExecutableName;
|
||||
updateScript = ./update.py;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -32,15 +32,15 @@
|
||||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "110.0.5464.2",
|
||||
"sha256": "18k4rrwszk4xz416xi6li9b5pdajlscfgg4cyv67y10z7f28qwby",
|
||||
"sha256bin64": "0hzv55bba4041400zjysgzz1n8svzvi156xyrayfr5ynapf7g2rd",
|
||||
"version": "110.0.5478.4",
|
||||
"sha256": "0sn07gk53mc6xcmbq1jrxwf4lp2hmw6k9rmhsw36qf5alcdkx94h",
|
||||
"sha256bin64": "0r63qj6gc74vrjp7fyygzf49prsyim03s3cv43fm85lnab9m4x6i",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-11-29",
|
||||
"version": "2022-12-12",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "70d6c60823c0233a0f35eccc25b2b640d2980bdc",
|
||||
"sha256": "04md36i6l07c1bq8mqghrnbf308j9avmqkwqjqm8gciclnrnlsii"
|
||||
"rev": "5e19d2fb166fbd4f6f32147fbb2f497091a54ad8",
|
||||
"sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "treesheets";
|
||||
version = "unstable-2022-12-13";
|
||||
version = "unstable-2022-12-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aardappel";
|
||||
repo = "treesheets";
|
||||
rev = "321a1df0b3364ffa9a29c6ad6e6e93d203e4cf48";
|
||||
sha256 = "DGYwJKfWhnCQ5rUgY232k+SuFmj2xEHAPCqPrV2uTXI=";
|
||||
rev = "9607a9a05b20e0c0246358aa90643b5b9699377e";
|
||||
sha256 = "Bg82vZXGTkFLf0cBtPHUEXHuH9rpYYqydWyuEbJm9Gk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, which
|
||||
, gtk3
|
||||
, blas
|
||||
, lapack
|
||||
}:
|
||||
|
||||
assert (!blas.isILP64) && (!lapack.isILP64);
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xnec2c";
|
||||
version = "4.4.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.xnec2c.org/releases/${pname}-v${version}.tar.gz";
|
||||
hash = "sha256-6Yrx6LkJjfnMA/kJUDWLhGzGopZeecARSrcR++UScsU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config which ];
|
||||
buildInputs = [ gtk3 blas lapack ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.xnec2c.org/";
|
||||
description = "Graphical antenna simulation";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ mvs ];
|
||||
platforms = platforms.unix;
|
||||
|
||||
# Darwin support likely to be fixed upstream in the next release
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
@@ -13,7 +13,10 @@ mkDerivation rec {
|
||||
sha256 = "0mrx8wprs8bi42fwwvk6rh634ic9jnn0gkfpd6q9pcawnnbz3vq8";
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DWITH_QT5=TRUE" ];
|
||||
cmakeFlags = [
|
||||
"-DWITH_QT5=TRUE"
|
||||
"-DWITH_GLINJECT=${if stdenv.hostPlatform.isx86 then "TRUE" else "FALSE"}"
|
||||
];
|
||||
|
||||
patches = [ ./fix-paths.patch ];
|
||||
|
||||
@@ -35,7 +38,7 @@ mkDerivation rec {
|
||||
description = "A screen recorder for Linux";
|
||||
homepage = "https://www.maartenbaert.be/simplescreenrecorder";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -17,19 +17,19 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pods";
|
||||
version = "1.0.0-rc.3";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "marhkb";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4dRwrB2M0GooRq3Hi2nmpbQm9RaLqrkZkEDTQpEd7bo=";
|
||||
sha256 = "sha256-oa7A0RMF7kPQXydysGpzAICgGoIRLWUMRibXdiftYyk=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
sha256 = "sha256-wGO2qp8jKHEevQ5vMDxqMzvRr1QazclhZ98M3B29PqQ=";
|
||||
sha256 = "sha256-RMxk7e/z+YneNWI/xsZDmXr7DqB7qHEY8HPvTCeSLjg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-http";
|
||||
version = "0.6.27";
|
||||
version = "0.6.28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "aws-c-http";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-prDQemFMIt33fna44tAaKlnblO4t5UU0vS6qyJKgJxk=";
|
||||
sha256 = "sha256-Yl6+66UHUAQweFh/ziftWQKElamN1Mc9mZCdtFhRKXc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-mqtt";
|
||||
version = "0.8.1";
|
||||
version = "0.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "aws-c-mqtt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nmSNG5o2Ck80OG4ZGYIayVdnw3Z2fn1VkUIuI9RYfL8=";
|
||||
sha256 = "sha256-C8Ge+dSW/n9dh3MyZt/uOya3ONsC6Ji+59yylL7h8kY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-s3";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "aws-c-s3";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tFweXB610Ua8+x05rg+rOqh9QPhXjpvvzGf8EVVIHks=";
|
||||
sha256 = "sha256-PT6ivk6WsM27jaULJ5CBAojaO7rGxzs/cxv7aRf2nn8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-checksums";
|
||||
version = "0.1.13";
|
||||
version = "0.1.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pSUSJTbwKYF2GsJG8DhLxxsv1ssp+/1c2gMY4dXbdFQ=";
|
||||
sha256 = "sha256-yoViXJuM9UQMcn8W0CcWkCXroBLXjAestr+oqWHi5hQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, ninja, pkg-config
|
||||
, zlib, xz, bzip2, zchunk, zstd
|
||||
, expat, rpm, db }:
|
||||
, expat
|
||||
, withRpm ? !stdenv.isDarwin, rpm
|
||||
, db
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.7.22";
|
||||
@@ -15,19 +18,21 @@ stdenv.mkDerivation rec {
|
||||
|
||||
cmakeFlags = [
|
||||
"-DENABLE_COMPLEX_DEPS=true"
|
||||
"-DENABLE_RPMMD=true"
|
||||
"-DENABLE_RPMDB=true"
|
||||
"-DENABLE_PUBKEY=true"
|
||||
"-DENABLE_RPMDB_BYRPMHEADER=true"
|
||||
"-DENABLE_LZMA_COMPRESSION=true"
|
||||
"-DENABLE_BZIP2_COMPRESSION=true"
|
||||
"-DENABLE_ZSTD_COMPRESSION=true"
|
||||
"-DENABLE_ZCHUNK_COMPRESSION=true"
|
||||
"-DWITH_SYSTEM_ZCHUNK=true"
|
||||
] ++ lib.optionals withRpm [
|
||||
"-DENABLE_PUBKEY=true"
|
||||
"-DENABLE_RPMDB=true"
|
||||
"-DENABLE_RPMDB_BYRPMHEADER=true"
|
||||
"-DENABLE_RPMMD=true"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ninja pkg-config ];
|
||||
buildInputs = [ zlib xz bzip2 zchunk zstd expat rpm db ];
|
||||
buildInputs = [ zlib xz bzip2 zchunk zstd expat db ]
|
||||
++ lib.optional withRpm rpm;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A free package dependency solver";
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clhep";
|
||||
version = "2.4.6.2";
|
||||
version = "2.4.6.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-${version}.tgz";
|
||||
hash = "sha256-re1z5JushaW06G9koO49bzz+VVGw93MceLbY+drG6Nw=";
|
||||
hash = "sha256-/NAH8RsQukryjQJyIrYxSNDrRP96CC7uNTvfkh+caEo=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "s2n-tls";
|
||||
version = "1.3.30";
|
||||
version = "1.3.31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gDbQky2tNhtgdHmbMqnB6uIkJp2JhqyOMjPiW6EakK0=";
|
||||
sha256 = "sha256-jdjy5Th73Sd/8NvivB2g9dVRDW3DEvUSYXZ1o2U6Y88=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -3,20 +3,20 @@
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
minimumOCamlVersion = "4.07";
|
||||
version = "20210511";
|
||||
minimalOCamlVersion = "4.08";
|
||||
version = "20221222";
|
||||
pname = "imagelib";
|
||||
|
||||
useDune2 = true;
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/rlepigre/ocaml-imagelib/releases/download/${version}/imagelib-${version}.tbz";
|
||||
sha256 = "1cb94ea3731dc994c205940c9434543ce3f2470cdcb2e93a3e02ed793e80d480";
|
||||
hash = "sha256-BQ2TVxGlpc6temteK84TKXpx0MtHZSykL/TjKN9xGP0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ decompress stdlib-shims ];
|
||||
|
||||
doCheck = lib.versionAtLeast ocaml.version "4.08";
|
||||
doCheck = true;
|
||||
checkInputs = [ alcotest ];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "beancount-parser";
|
||||
version = "0.1.21";
|
||||
version = "0.1.23";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LaunchPlatform";
|
||||
repo = "beancount-parser";
|
||||
rev = version;
|
||||
sha256 = "sha256-0uhH75OEjC9iA0XD0VX7CGoRIP/hpM4y+53JnyXgZpA=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-3pO1HvH3R2RpNFtplWyaXxqZy0caAoAxlmfSKmjkvKQ=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@@ -40,6 +40,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Standalone Lark based Beancount syntax parser";
|
||||
homepage = "https://github.com/LaunchPlatform/beancount-parser/";
|
||||
changelog = "https://github.com/LaunchPlatform/beancount-parser/releases/tag/${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ ambroisie ];
|
||||
};
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
|
||||
# propagates
|
||||
, django
|
||||
, dateutil
|
||||
, scim2-filter-parser
|
||||
, gssapi
|
||||
, ldap
|
||||
, sssd
|
||||
|
||||
# tests
|
||||
, mock
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-scim2";
|
||||
version = "0.17.3";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "15five";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-5zdGPpjooiFoj+2OoglXhhKsPFB/KOHvrZWZd+1nZqU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
django
|
||||
dateutil
|
||||
scim2-filter-parser
|
||||
gssapi
|
||||
ldap
|
||||
sssd
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"django_scim"
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
mock
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A SCIM 2.0 Service Provider Implementation (for Django)";
|
||||
homepage = "https://github.com/15five/django-scim2";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ s1341 ];
|
||||
};
|
||||
}
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hcloud";
|
||||
version = "1.18.1";
|
||||
version = "1.18.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-nhz9fJEcYyt7rhIe0AkYPgG/mV0r87KUj/mM2A70rPE=";
|
||||
hash = "sha256-N71bpWOH48SRxbq9PgirkdXwOQzV6IDk3+oZ4haBvJ4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@@ -39,6 +39,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Library for the Hetzner Cloud API";
|
||||
homepage = "https://github.com/hetznercloud/hcloud-python";
|
||||
changelog = "https://github.com/hetznercloud/hcloud-python/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ liff ];
|
||||
};
|
||||
|
||||
@@ -16,11 +16,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "imageio";
|
||||
version = "2.22.4";
|
||||
version = "2.23.0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
sha256 = "sha256-D64Cet3wK8icc6VswVethFV/i4uEqhm0y3Bv78otiP8=";
|
||||
sha256 = "sha256-y2NXCXZeUnyUiQtPu2hw5ZIT/hgqHICG0WfrNiYHPL0=";
|
||||
inherit pname version;
|
||||
};
|
||||
|
||||
|
||||
@@ -1,14 +1,21 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, pillow, poppler_utils }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pillow
|
||||
, poppler_utils
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pdf2image";
|
||||
version = "1.16.0";
|
||||
version = "1.16.2";
|
||||
format = "setuptools";
|
||||
|
||||
propagatedBuildInputs = [ pillow ];
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d58ed94d978a70c73c2bb7fdf8acbaf2a7089c29ff8141be5f45433c0c4293bb";
|
||||
hash = "sha256-hnYQke7jX0ZB6pjf3bJUJUNh0Bi+aYoZmv98HTczGAM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -16,9 +23,18 @@ buildPythonPackage rec {
|
||||
sed -i '0,/poppler_path=None/s||poppler_path="${poppler_utils}/bin"|' pdf2image/pdf2image.py
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pillow
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pdf2image"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A python module that wraps the pdftoppm utility to convert PDF to PIL Image object";
|
||||
description = "Module that wraps the pdftoppm utility to convert PDF to PIL Image object";
|
||||
homepage = "https://github.com/Belval/pdf2image";
|
||||
changelog = "https://github.com/Belval/pdf2image/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ gerschtli ];
|
||||
platforms = platforms.all;
|
||||
|
||||
@@ -28,12 +28,12 @@ let
|
||||
debuggerName = lib.strings.getName debugger;
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
version = "4.8.0";
|
||||
version = "4.9.0";
|
||||
pname = "pwntools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-QgUuLYg3EOTh2gQekWdabXGftOXvLdJFyyhT2hEmkpA=";
|
||||
sha256 = "sha256-7qZ9GC+RcEiDkpmNmy8d67dYiTgFBVAfB3B2RfrH5xI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -3,24 +3,35 @@
|
||||
, fetchPypi
|
||||
, samba
|
||||
, pkg-config
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysmbc";
|
||||
version = "1.0.23";
|
||||
version = "1.0.24";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1y0n1n6jkzf4mr5lqfc73l2m0qp56gvxwfjnx2vj8c0hh5i1gnq8";
|
||||
hash = "sha256-zq3o1hHmPXKnXSYrNCptyDa2+AqzjqX9WtRD4ve+LO0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [ samba ];
|
||||
buildInputs = [
|
||||
samba
|
||||
];
|
||||
|
||||
# Tests would require a local SMB server
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "smbc" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"smbc"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "libsmbclient binding for Python";
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "schema-salad";
|
||||
version = "8.3.20220913105718";
|
||||
version = "8.3.20221209165047";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-18/xLIq1+yM8iQBIeXvRIO4A5GqZS/3qOKXmi439+sQ=";
|
||||
hash = "sha256-2XzJpNfEJV64AAvOuqisDR0xgBySH9QROrMFHB4ybHw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -57,13 +57,15 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
pycodegen = [ black ];
|
||||
pycodegen = [
|
||||
black
|
||||
];
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
broken = true; # disables on outdated version of mistune
|
||||
description = "Semantic Annotations for Linked Avro Data";
|
||||
homepage = "https://github.com/common-workflow-language/schema_salad";
|
||||
changelog = "https://github.com/common-workflow-language/schema_salad/releases/tag/${version}";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ veprbl ];
|
||||
};
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
{ stdenv, lib, fetchFromGitHub, buildPythonPackage, unittestCheckHook
|
||||
, pytest-runner, django
|
||||
, sly }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "scim2-filter-parser";
|
||||
version = "0.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "15five";
|
||||
repo = pname;
|
||||
# gets rarely updated, we can then just replace the hash
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ZemR5tn+T9WWgNB1FYrPJO6zh8g9zjobFZemi+MHkEE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
sly
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"scim2_filter_parser"
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
django
|
||||
pytest-runner
|
||||
unittestCheckHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A customizable parser/transpiler for SCIM2.0 filters";
|
||||
homepage = "https://github.com/15five/scim2-filter-parser";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ s1341 ];
|
||||
};
|
||||
}
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tflint";
|
||||
version = "0.43.0";
|
||||
version = "0.44.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "terraform-linters";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-a5rTG+4qObdmInVZH8QkMdWmRrDA9ZUl2NL5p53D2MY=";
|
||||
sha256 = "sha256-O758CU70NqRFlbtiy5cmfIHiHdQLxH88BHNZLQVvZ+M=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-hdevIQ0Ugn7+MtvNbF+HjJAMyBtGYuJPCFFcxS8p35E=";
|
||||
vendorSha256 = "sha256-4ODf6Er7V5KsVUdWjqjv+dfH84PPR+5T29V1AJluoJA=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "benthos";
|
||||
version = "4.9.0";
|
||||
version = "4.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "benthosdev";
|
||||
repo = "benthos";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gFtlu+Jg5XC9OlUArTCHPFN4iTF7kdyrcRcymRwSHsw=";
|
||||
sha256 = "sha256-1pzyrXJgVN8kO3BHr/7LMpDvtnLcdioaxoRgKv/46v4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-sRhiTati1EsU+gBv29OkBAxqot+Bjp1BemYR1qbqN1w=";
|
||||
vendorSha256 = "sha256-SfgdSPJ8Blra+KVWtKSjWfXmAm02tULwuYHNPbyJVpI=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "litefs";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "superfly";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Gh1GcIsRNfAwQ2HJq82IlyUHPyaDpA3CpBe4glBbU/I=";
|
||||
sha256 = "sha256-fNZ0PtgMgCGB1b1HLJsmbm/I8wa3auHimL1ktf6wA9M=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-dXCyBY4k9Gxsy/7UwkWFTxihZnFkZGrZKgw9pHD8jco=";
|
||||
vendorSha256 = "sha256-w77JQNk1QZFJVrn9yuvKOemggV9e0FuqhVWK3d4umuY=";
|
||||
|
||||
subPackages = [ "cmd/litefs" ];
|
||||
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "vitess";
|
||||
version = "15.0.1";
|
||||
version = "15.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vitessio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-na7s39Mn6Kn9+edGu8ThCuYB7ZguDGC4MDsq14bOjME=";
|
||||
hash = "sha256-NkJqJYmUf92QiPazxRWNsxZh0Pvc73l35hP1gmk4Fv0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+yCznSxv0EWoKiQIgFEQ/iUxrlQ5A1HYNkoMiRDG3ik=";
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "goresym";
|
||||
version = "2.0";
|
||||
version = "2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mandiant";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ju0xk0oA8eBJ2kUTrv5KgzOTXf5gRJUSSs16B/6NEyU=";
|
||||
sha256 = "sha256-v7rZBVpQMuEoIK9JIXCJnSjMDe3wrtJvL766MN6VmFo=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
@@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "controller-tools";
|
||||
version = "0.10.0";
|
||||
version = "0.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-244o+QZ0BGVe8t8AWf1wU6VHgYyzkATpr5ZTbZezk10=";
|
||||
sha256 = "sha256-mtAP8qRfSdt2koKs6LSI9iiXsyK92q1yWOC9zV8utFg=";
|
||||
};
|
||||
|
||||
patches = [ ./version.patch ];
|
||||
|
||||
vendorSha256 = "sha256-sVdSKu6TDGIDV2o+kuCvGCItbFe9MwlM2Qjiz8n2rZU=";
|
||||
vendorSha256 = "sha256-9IGdsAqvi01Jf0FpxfL+O+LrDchh4dGgJX4JJIvL3vE=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nil";
|
||||
version = "2022-12-01";
|
||||
version = "2023-01-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oxalica";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-E/QGmoL7Q3GDR2/I5o2CAMHMcmPQEJAySke1s+nOaho=";
|
||||
hash = "sha256-xpNlmGG7Qy0SPzXZ9sQ0i9Yo2hMaK+YsTEOTk10rs+k=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-T3i86L6cF6uFbSs7xtKHGzB6XrE9jn2RZghxFzDleXU=";
|
||||
cargoHash = "sha256-mwfM3hIEaHKa2oPVWzXpua+W2Oa5brvNRbRCcV0KapY=";
|
||||
|
||||
CFG_DATE = version;
|
||||
CFG_REV = "release";
|
||||
@@ -25,6 +25,7 @@ rustPlatform.buildRustPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Yet another language server for Nix";
|
||||
homepage = "https://github.com/oxalica/nil";
|
||||
changelog = "https://github.com/oxalica/nil/releases/tag/${version}";
|
||||
license = with licenses; [ mit asl20 ];
|
||||
maintainers = with maintainers; [ figsoda oxalica ];
|
||||
};
|
||||
|
||||
@@ -2,14 +2,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-tally";
|
||||
version = "1.0.19";
|
||||
version = "1.0.21";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-TlHb974Dtmz5qW+4L3BE6GQ3SbkwtIrZxE6FpJrgNdY=";
|
||||
sha256 = "sha256-YEsgXIZ4R2w0HOkTV8LOGi2g32nHRs63nhk9yVR4vak=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-np1rln9tD+J4s410/Pv4/eKAxyzK8qtLoON86JR1T94=";
|
||||
cargoSha256 = "sha256-jLbYC862fZONvMHh0CLsiuUmn/hmAF6sRLuav3P+bck=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [
|
||||
DiskArbitration
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sentry-cli";
|
||||
version = "2.10.0";
|
||||
version = "2.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getsentry";
|
||||
repo = "sentry-cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-1KFKLvF/oFeU05BxShAoHkP24QBT88MHhjbcSXFario=";
|
||||
sha256 = "sha256-08H/aNYUsTORCwTm9pwWiLQjAcWSiZrjg5q6OkkllWg=";
|
||||
};
|
||||
doCheck = false;
|
||||
|
||||
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
cargoSha256 = "sha256-IEcQKAgZfZ3L5+1Kdbsnms6qHXGXLwxSklu1y4kk+0w=";
|
||||
cargoSha256 = "sha256-GEZZXRPfpIhr73SpyP9iLSjRe67wllSpp5oh6N0S9ok=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://docs.sentry.io/cli/";
|
||||
|
||||
@@ -20,21 +20,12 @@ stdenv.mkDerivation rec {
|
||||
SDL2
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
cmake -S . -B build -DCMAKE_BUILD_TYPE=Release
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
cmake --build build
|
||||
runHook postBuild
|
||||
'';
|
||||
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mv build $out
|
||||
mkdir -p "$out/bin"
|
||||
mv Nanosaur Data ReadMe.txt "$out/"
|
||||
makeWrapper $out/Nanosaur $out/bin/Nanosaur --chdir "$out"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -20,21 +20,12 @@ stdenv.mkDerivation rec {
|
||||
SDL2
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
cmake -S . -B build -DCMAKE_BUILD_TYPE=Release
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
cmake --build build
|
||||
runHook postBuild
|
||||
'';
|
||||
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mv build $out
|
||||
mkdir -p "$out/bin"
|
||||
mv Nanosaur2 Data ReadMe.txt "$out/"
|
||||
makeWrapper $out/Nanosaur2 $out/bin/Nanosaur2 --chdir "$out"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -12,22 +12,23 @@ stdenv.mkDerivation rec {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/OttoMatic
|
||||
mv Data $out/share/OttoMatic
|
||||
install -Dm755 {.,$out/bin}/OttoMatic
|
||||
wrapProgram $out/bin/OttoMatic --chdir "$out/share/OttoMatic"
|
||||
mkdir -p "$out/bin"
|
||||
mv OttoMatic Data ReadMe.txt "$out/"
|
||||
makeWrapper $out/OttoMatic $out/bin/OttoMatic --chdir "$out"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ pmiddend ];
|
||||
badPlatforms = [ platforms.aarch64 ];
|
||||
badPlatforms = platforms.aarch64;
|
||||
# never built on aarch64-linux since first introduction in nixpkgs
|
||||
broken = stdenv.isLinux && stdenv.isAarch64;
|
||||
};
|
||||
|
||||
@@ -1,28 +1,41 @@
|
||||
{ lib, rustPlatform, fetchFromGitHub, ncurses, openssl, pkg-config, stdenv, Security, fetchpatch }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, ncurses
|
||||
, openssl
|
||||
, pkg-config
|
||||
, Security
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wiki-tui";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Builditluc";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sqkVi8w4QoktC1ZLUPHzfMUxIzCadcIj3dEYigz854U=";
|
||||
hash = "sha256-WiyRBF3rWLpOZ8mxT89ImRL++Oq9+b88oSKjr4tzCGs=";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security;
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
ncurses
|
||||
openssl
|
||||
] ++ lib.optional stdenv.isDarwin [
|
||||
Security
|
||||
];
|
||||
|
||||
cargoSha256 = "sha256-xRj0bF5VymvFVB0tSBndWA+OHBIEY2/ovRIBdDoOHA4=";
|
||||
|
||||
# Tests fail with this error: `found argument --test-threads which was not expected`
|
||||
doCheck = false;
|
||||
cargoHash = "sha256-R9xxIDqkU7FeulpD7PUM6aHgA67PVgqxHKYtdrjdaUo=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple and easy to use Wikipedia Text User Interface";
|
||||
homepage = "https://github.com/builditluc/wiki-tui";
|
||||
changelog = "https://github.com/Builditluc/wiki-tui/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ lom builditluc ];
|
||||
};
|
||||
|
||||
@@ -41,10 +41,10 @@ lib.overrideDerivation (buildLinux (args // {
|
||||
'';
|
||||
|
||||
extraMeta = if (rpiVersion < 3) then {
|
||||
platforms = with lib.platforms; [ arm ];
|
||||
platforms = with lib.platforms; arm;
|
||||
hydraPlatforms = [];
|
||||
} else {
|
||||
platforms = with lib.platforms; [ arm aarch64 ];
|
||||
platforms = with lib.platforms; arm ++ aarch64;
|
||||
hydraPlatforms = [ "aarch64-linux" ];
|
||||
};
|
||||
} // (args.argsOverride or {}))) (oldAttrs: {
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
{ lib
|
||||
, fetchpatch
|
||||
, kernel
|
||||
, commitDate ? "2022-10-31"
|
||||
, currentCommit ? "77c27f28aa58e9d9037eb68c87d3283f68c371f7"
|
||||
, diffHash ? "sha256-TUpI9z0ac3rjn2oT5Z7oQXevDKbGwTVjyigS5/aGwgQ="
|
||||
, commitDate ? "2022-12-29"
|
||||
, currentCommit ? "8f064a4cb5c7cce289b83d7a459e6d8620188b37"
|
||||
, diffHash ? "sha256-RnlM7uOSWhFHG1aj5BOjrfRtoZfbx+tqQw1V49nW5vw="
|
||||
|
||||
, kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage
|
||||
, argsOverride ? {}
|
||||
, ...
|
||||
|
||||
@@ -24,6 +24,13 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-9lfHCcODlS7sZMjQhK0yQcCBEoGyZOChx/oM0CU37sY=";
|
||||
};
|
||||
|
||||
# Upstream build system have knob to enable and disable building of static
|
||||
# library, shared library is built unconditionally.
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isStatic ''
|
||||
sed -i 'lib/Module.mk' -e '/LIBTARGETS :=/,+1d; /-m 755/ d'
|
||||
substituteInPlace prog/sensors/Module.mk --replace 'lib/$(LIBSHBASENAME)' ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ bison flex which ];
|
||||
# bash is required for correctly replacing the shebangs in all tools for cross-compilation.
|
||||
buildInputs = [ bash perl ]
|
||||
@@ -39,6 +46,12 @@ stdenv.mkDerivation rec {
|
||||
"ETCDIR=${placeholder "out"}/etc"
|
||||
];
|
||||
|
||||
# Making regexp to patch-out installing of .so symlinks from Makefile is
|
||||
# complicated, it is easier to remove them post-install.
|
||||
postInstall = lib.optionalString stdenv.hostPlatform.isStatic ''
|
||||
rm $out/lib/*.so*
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://hwmon.wiki.kernel.org/lm_sensors";
|
||||
changelog = "https://raw.githubusercontent.com/lm-sensors/lm-sensors/V${dashedVersion}/CHANGES";
|
||||
|
||||
@@ -28,7 +28,7 @@ rollback=
|
||||
upgrade=
|
||||
upgrade_all=
|
||||
profile=/nix/var/nix/profiles/system
|
||||
buildHost=localhost
|
||||
buildHost=
|
||||
targetHost=
|
||||
remoteSudo=
|
||||
verboseScript=
|
||||
@@ -151,12 +151,6 @@ fi
|
||||
if [[ -z "$buildHost" && -n "$targetHost" ]]; then
|
||||
buildHost="$targetHost"
|
||||
fi
|
||||
if [ "$targetHost" = localhost ]; then
|
||||
targetHost=
|
||||
fi
|
||||
if [ "$buildHost" = localhost ]; then
|
||||
buildHost=
|
||||
fi
|
||||
|
||||
# log the given argument to stderr if verbose mode is on
|
||||
logVerbose() {
|
||||
|
||||
@@ -23,6 +23,9 @@ rustPlatform.buildRustPackage rec {
|
||||
Security
|
||||
];
|
||||
|
||||
# FIXME: checkPhase on darwin will leave some zombie spawn processes
|
||||
# see https://github.com/NixOS/nixpkgs/issues/205620
|
||||
doCheck = !stdenv.isDarwin;
|
||||
checkFlags = [
|
||||
# tests depend on network interface, may fail with virtual IPs.
|
||||
"--skip=validate_printed_urls"
|
||||
|
||||
@@ -7,18 +7,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mattermost";
|
||||
version = "7.5.1";
|
||||
version = "7.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattermost";
|
||||
repo = "mattermost-server";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-uaud5yCJTV3/+5eqHvIurxM1EPtetTWeFTjkPKYmFiA=";
|
||||
sha256 = "sha256-Jm7bu/RoFp7h38Ygis3U2E7Hbbj4zmRPc4PacxxASsw=";
|
||||
};
|
||||
|
||||
webapp = fetchurl {
|
||||
url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
|
||||
sha256 = "sha256-DdQjXo3n13qt62iFWhSWuTcEXJiHLGdkWn8ulqvzTI0=";
|
||||
sha256 = "sha256-Zvzme6Og/LLsT4XyFDAQscNgO+jCwwzDDytYOo4qM0U=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-qZQXNVbJZDddVE+xk6F8XJCEg5dhhuXz68wcn2Uvmxk=";
|
||||
@@ -29,6 +29,11 @@ buildGoModule rec {
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/mattermost/mattermost-server/v6/model.Version=${version}"
|
||||
"-X github.com/mattermost/mattermost-server/v6/model.BuildNumber=${version}-nixpkgs"
|
||||
"-X github.com/mattermost/mattermost-server/v6/model.BuildDate=1970-01-01"
|
||||
"-X github.com/mattermost/mattermost-server/v6/model.BuildHash=v${version}"
|
||||
"-X github.com/mattermost/mattermost-server/v6/model.BuildHashEnterprise=v${version}"
|
||||
"-X github.com/mattermost/mattermost-server/v6/model.BuildEnterpriseReady=false"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "metabase";
|
||||
version = "0.44.5";
|
||||
version = "0.45.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.metabase.com/v${version}/metabase.jar";
|
||||
hash = "sha256-YFFUPWFVHrHpY/QT0IlJv5PGtms6RuE5Wp17CQNG/Aw=";
|
||||
hash = "sha256-FfX/+SIJWnSSqTf0yH0xCDWbBdXbzVSoQESHCO5oQ4s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -2,6 +2,9 @@
|
||||
, fetchFromGitHub
|
||||
, python3Packages
|
||||
, prometheus-alertmanager
|
||||
, fetchpatch
|
||||
, runCommand
|
||||
, prometheus-xmpp-alerts
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
@@ -15,6 +18,16 @@ python3Packages.buildPythonApplication rec {
|
||||
sha256 = "sha256-PwShGS1rbfZCK5OS6Cnn+mduOpWAD4fC69mcGB5GB1c=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Required until https://github.com/jelmer/prometheus-xmpp-alerts/pull/33 is merged
|
||||
# and contained in a release
|
||||
(fetchpatch {
|
||||
name = "Fix-outdated-entrypoint-definiton.patch";
|
||||
url = "https://github.com/jelmer/prometheus-xmpp-alerts/commit/c41dd41dbd3c781b874bcf0708f6976e6252b621.patch";
|
||||
hash = "sha256-G7fRLSXbkI5EDgGf4n9xSVs54IPD0ev8rTEFffRvLY0=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "bs4" "beautifulsoup4"
|
||||
@@ -39,6 +52,14 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
pythonImportsCheck = [ "prometheus_xmpp" ];
|
||||
|
||||
passthru.tests = {
|
||||
binaryWorks = runCommand "${pname}-binary-test" {} ''
|
||||
# Running with --help to avoid it erroring due to a missing config file
|
||||
${prometheus-xmpp-alerts}/bin/prometheus-xmpp-alerts --help | tee $out
|
||||
grep "usage: prometheus-xmpp-alerts" $out
|
||||
'';
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "XMPP Web hook for Prometheus";
|
||||
homepage = "https://github.com/jelmer/prometheus-xmpp-alerts";
|
||||
|
||||
@@ -13,9 +13,9 @@ for example `breezedark` for the app with the url
|
||||
|
||||
To regenerate the nixpkgs nextcloudPackages set, run:
|
||||
|
||||
```
|
||||
```
|
||||
./generate.sh
|
||||
```
|
||||
```
|
||||
|
||||
After that you can commit and submit the changes.
|
||||
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "snappymail";
|
||||
version = "2.24.1";
|
||||
version = "2.24.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz";
|
||||
sha256 = "sha256-8gnTNSVi508EMkSbevmYBMpjqJJvtgkh6WjvcBhDXZE=";
|
||||
sha256 = "sha256-PE27kaxpyHJxqNYnxixCeHkoPPyJBpF2LtgACb97Ojg=";
|
||||
};
|
||||
|
||||
sourceRoot = "snappymail";
|
||||
|
||||
@@ -18,9 +18,9 @@ For available translations and language codes see [upstream translation reposito
|
||||
|
||||
To regenerate the nixpkgs wordpressPackages set, run:
|
||||
|
||||
```
|
||||
```
|
||||
./generate.sh
|
||||
```
|
||||
```
|
||||
|
||||
After that you can commit and submit the changes.
|
||||
|
||||
@@ -29,7 +29,7 @@ After that you can commit and submit the changes.
|
||||
The plugins will be available in the namespace `wordpressPackages.plugins`.
|
||||
Using it together with the Wordpress module could look like this:
|
||||
|
||||
```
|
||||
```
|
||||
services.wordpress = {
|
||||
sites."blog.${config.networking.domain}" = {
|
||||
plugins = with pkgs.wordpressPackages.plugins; [
|
||||
|
||||
@@ -3002,17 +3002,17 @@ self: with self; {
|
||||
}) {};
|
||||
|
||||
# THIS IS A GENERATED FILE. DO NOT EDIT!
|
||||
xhost = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXmu, xorgproto }: stdenv.mkDerivation {
|
||||
xhost = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXmu, xorgproto, gettext }: stdenv.mkDerivation {
|
||||
pname = "xhost";
|
||||
version = "1.0.8";
|
||||
version = "1.0.9";
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = "mirror://xorg/individual/app/xhost-1.0.8.tar.bz2";
|
||||
sha256 = "15n3mnd4i5kh4z32qv11580qjgvnng0wry2y753ljrqkkrbkrp52";
|
||||
url = "mirror://xorg/individual/app/xhost-1.0.9.tar.xz";
|
||||
sha256 = "0ib66h78ykc4zki4arh8hkcsgk1mk8yyy0ay5sdb2d908qqvb1pa";
|
||||
};
|
||||
hardeningDisable = [ "bindnow" "relro" ];
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [ pkg-config gettext ];
|
||||
buildInputs = [ libX11 libXau libXmu xorgproto ];
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
|
||||
let
|
||||
inherit (stdenv) isDarwin;
|
||||
inherit (lib) overrideDerivation;
|
||||
|
||||
malloc0ReturnsNullCrossFlag = lib.optional
|
||||
(stdenv.hostPlatform != stdenv.buildPlatform)
|
||||
@@ -761,7 +760,7 @@ self: super:
|
||||
];
|
||||
# XQuartz requires two compilations: the first to get X / XQuartz,
|
||||
# and the second to get Xvfb, Xnest, etc.
|
||||
darwinOtherX = overrideDerivation xorgserver (oldAttrs: {
|
||||
darwinOtherX = xorgserver.overrideAttrs (oldAttrs: {
|
||||
configureFlags = oldAttrs.configureFlags ++ [
|
||||
"--disable-xquartz"
|
||||
"--enable-xorg"
|
||||
|
||||
@@ -43,7 +43,7 @@ mirror://xorg/individual/app/xfs-1.2.0.tar.bz2
|
||||
mirror://xorg/individual/app/xfsinfo-1.0.6.tar.bz2
|
||||
mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2
|
||||
mirror://xorg/individual/app/xgc-1.0.5.tar.bz2
|
||||
mirror://xorg/individual/app/xhost-1.0.8.tar.bz2
|
||||
mirror://xorg/individual/app/xhost-1.0.9.tar.xz
|
||||
mirror://xorg/individual/app/xinit-1.4.1.tar.bz2
|
||||
mirror://xorg/individual/app/xinput-1.6.3.tar.bz2
|
||||
mirror://xorg/individual/app/xkbcomp-1.4.5.tar.bz2
|
||||
|
||||
@@ -11,8 +11,13 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1n5zs6xcnv4bv1hdaypmz7fv4j7dsr4a0ifah99iyj4p5j85i1bc";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Nix 2.4+ provides its own completion for the nix command, see https://github.com/hedning/nix-bash-completions/issues/20
|
||||
substituteInPlace _nix --replace 'nix nixos-option' 'nixos-option'
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
# To enable lazy loading via. bash-completion we need a symlink to the script
|
||||
# To enable lazy loading via bash-completion we need a symlink to the script
|
||||
# from every command name.
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
@@ -36,8 +41,8 @@ stdenv.mkDerivation rec {
|
||||
description = "Bash completions for Nix, NixOS, and NixOps";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ hedning ];
|
||||
# Set a lower priority such that the newly provided completion from Nix 2.4 are preferred.
|
||||
maintainers = with maintainers; [ hedning ncfavier ];
|
||||
# Set a lower priority such that Nix wins in case of conflicts.
|
||||
priority = 10;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -247,16 +247,16 @@ let
|
||||
isEnabled = lib.findFirst (x: x == reason) null showWarnings;
|
||||
in if isEnabled != null then builtins.trace msg true else true;
|
||||
|
||||
# Deep type-checking. Note that calling `type.check` is not enough: see `lib.mkOptionType`'s documentation.
|
||||
# We don't include this in lib for now because this function is flawed: it accepts things like `mkIf true 42`.
|
||||
typeCheck = type: value: let
|
||||
merged = lib.mergeDefinitions [ ] type [
|
||||
{ file = lib.unknownModule; inherit value; }
|
||||
];
|
||||
eval = builtins.tryEval (builtins.deepSeq merged.mergedValue null);
|
||||
in eval.success;
|
||||
|
||||
# A shallow type check. We are using NixOS'
|
||||
# option types here, which however have the major drawback
|
||||
# of not providing full type checking (part of the type check is
|
||||
# done by the module evaluation itself). Therefore, the checks
|
||||
# will not recurse into attributes.
|
||||
# We still provide the full type for documentation
|
||||
# purposes and in the hope that they will be used eventually.
|
||||
# See https://github.com/NixOS/nixpkgs/pull/191171 for an attempt
|
||||
# to fix this, or mkOptionType in lib/types.nix for more information.
|
||||
# TODO make this into a proper module and use the generic option documentation generation?
|
||||
metaTypes = with lib.types; rec {
|
||||
# These keys are documented
|
||||
description = str;
|
||||
@@ -266,9 +266,11 @@ let
|
||||
homepage = either (listOf str) str;
|
||||
downloadPage = str;
|
||||
changelog = either (listOf str) str;
|
||||
license = either (listOf lib.types.attrs) (either lib.types.attrs str);
|
||||
sourceProvenance = either (listOf lib.types.attrs) lib.types.attrs;
|
||||
maintainers = listOf (attrsOf str);
|
||||
license = let
|
||||
licenseType = either (attrsOf anything) str; # TODO disallow `str` licenses, use a module
|
||||
in either licenseType (listOf licenseType);
|
||||
sourceProvenance = either (listOf (attrsOf anything)) (attrsOf anything);
|
||||
maintainers = listOf (attrsOf anything); # TODO use the maintainer type from lib/tests/maintainer-module.nix
|
||||
priority = int;
|
||||
platforms = listOf str;
|
||||
hydraPlatforms = listOf str;
|
||||
@@ -310,16 +312,16 @@ let
|
||||
badPlatforms = platforms;
|
||||
};
|
||||
|
||||
# WARNING: this does not check inner values of the attribute, like list elements or nested attributes.
|
||||
# See metaTypes above and mkOptionType in lib/types.nix for more information
|
||||
checkMetaAttr = k: v:
|
||||
if metaTypes?${k} then
|
||||
if metaTypes.${k}.check v then
|
||||
if typeCheck metaTypes.${k} v then
|
||||
null
|
||||
else
|
||||
"key 'meta.${k}' has a value of invalid type ${builtins.typeOf v}; expected ${metaTypes.${k}.description}"
|
||||
"key 'meta.${k}' has invalid value; expected ${metaTypes.${k}.description}, got\n ${
|
||||
lib.generators.toPretty { indent = " "; } v
|
||||
}"
|
||||
else
|
||||
"key 'meta.${k}' is unrecognized; expected one of: \n\t [${lib.concatMapStringsSep ", " (x: "'${x}'") (lib.attrNames metaTypes)}]";
|
||||
"key 'meta.${k}' is unrecognized; expected one of: \n [${lib.concatMapStringsSep ", " (x: "'${x}'") (lib.attrNames metaTypes)}]";
|
||||
checkMeta = meta: if config.checkMeta then lib.remove null (lib.mapAttrsToList checkMetaAttr meta) else [];
|
||||
|
||||
checkOutputsToInstall = attrs: let
|
||||
@@ -333,25 +335,27 @@ let
|
||||
# Check if a derivation is valid, that is whether it passes checks for
|
||||
# e.g brokenness or license.
|
||||
#
|
||||
# Return { valid: Bool } and additionally
|
||||
# Return { valid: "yes", "warn" or "no" } and additionally
|
||||
# { reason: String; errormsg: String } if it is not valid, where
|
||||
# reason is one of "unfree", "blocklisted", "broken", "insecure", ...
|
||||
# !!! reason strings are hardcoded into OfBorg, make sure to keep them in sync
|
||||
# Along with a boolean flag for each reason
|
||||
checkValidity = attrs:
|
||||
{
|
||||
# Check meta attribute types first, to make sure it is always called even when there are other issues
|
||||
# Note that this is not a full type check and functions below still need to by careful about their inputs!
|
||||
let res = checkMeta (attrs.meta or {}); in if res != [] then
|
||||
{ valid = "no"; reason = "unknown-meta"; errormsg = "has an invalid meta attrset:${lib.concatMapStrings (x: "\n - " + x) res}\n";
|
||||
unfree = false; nonSource = false; broken = false; unsupported = false; insecure = false;
|
||||
}
|
||||
else {
|
||||
unfree = hasUnfreeLicense attrs;
|
||||
nonSource = hasNonSourceProvenance attrs;
|
||||
broken = isMarkedBroken attrs;
|
||||
unsupported = hasUnsupportedPlatform attrs;
|
||||
insecure = isMarkedInsecure attrs;
|
||||
}
|
||||
// (
|
||||
# Check meta attribute types first, to make sure it is always called even when there are other issues
|
||||
# Note that this is not a full type check and functions below still need to by careful about their inputs!
|
||||
let res = checkMeta (attrs.meta or {}); in if res != [] then
|
||||
{ valid = "no"; reason = "unknown-meta"; errormsg = "has an invalid meta attrset:${lib.concatMapStrings (x: "\n\t - " + x) res}"; }
|
||||
} // (
|
||||
# --- Put checks that cannot be ignored here ---
|
||||
else if checkOutputsToInstall attrs then
|
||||
if checkOutputsToInstall attrs then
|
||||
{ valid = "no"; reason = "broken-outputs"; errormsg = "has invalid meta.outputsToInstall"; }
|
||||
|
||||
# --- Put checks that can be ignored here ---
|
||||
|
||||
@@ -13,22 +13,25 @@
|
||||
, zstd
|
||||
, lz4
|
||||
, python3Packages
|
||||
, util-linux
|
||||
, udev
|
||||
, valgrind
|
||||
, nixosTests
|
||||
, makeWrapper
|
||||
, getopt
|
||||
, fuse3
|
||||
, fuseSupport ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "bcachefs-tools";
|
||||
version = "unstable-2022-09-28";
|
||||
version = "unstable-2022-12-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "koverstreet";
|
||||
repo = "bcachefs-tools";
|
||||
rev = "99caca2c70f312c4a2504a7e7a9c92a91426d885";
|
||||
sha256 = "sha256-9bFTBFkQq8SvhYa9K4+MH2zvKZviNaq0sFWoeGgch7g=";
|
||||
rev = "42cf74fd1d0ef58927967e6236988e86cfc0d086";
|
||||
sha256 = "sha256-N/1heStwmB7CzE/ddTud/ywnMdhq8ZkLju+x0UL0yjY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -39,7 +42,9 @@ stdenv.mkDerivation {
|
||||
"INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config docutils python3Packages.python ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config docutils python3Packages.python makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libuuid libscrypt libsodium keyutils liburcu zlib libaio
|
||||
@@ -54,6 +59,13 @@ stdenv.mkDerivation {
|
||||
rm tests/test_fuse.py
|
||||
'';
|
||||
|
||||
# this symlink is needed for mount -t bcachefs to work
|
||||
postFixup = ''
|
||||
ln -s $out/bin/mount.bcachefs.sh $out/bin/mount.bcachefs
|
||||
wrapProgram $out/bin/mount.bcachefs.sh \
|
||||
--prefix PATH : ${lib.makeBinPath [ getopt util-linux ]}
|
||||
'';
|
||||
|
||||
installFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
||||
passthru.tests = {
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "svg2pdf";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
# This cargo package is usually a library, hence it does not track a
|
||||
# Cargo.lock by default so we use fetchCrate
|
||||
src = fetchCrate {
|
||||
inherit version pname;
|
||||
sha256 = "2Aw8VYFVw0rKeaDUTsYTHcHBDP1jLm4tVGfi6+RNK9E=";
|
||||
sha256 = "sha256-0sjJIHD+x9P7FPLNwTXYcetbU4Ck5K4pFGF5cMI3+rk=";
|
||||
};
|
||||
cargoSha256 = "KADfBOnkY1T1xy4Oj7s85SXcDhjRhQQ2hWGWinMXux8=";
|
||||
cargoSha256 = "sha256-vjDV604HDwlaxwq5iQbGOKXmLTRgx1oZ824HXBSiouw=";
|
||||
buildFeatures = [ "cli" ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user