Merge 0bda27c93d into haskell-updates

This commit is contained in:
nixpkgs-ci[bot]
2025-01-17 00:17:46 +00:00
committed by GitHub
321 changed files with 4199 additions and 13099 deletions
+2 -2
View File
@@ -22,8 +22,8 @@ jobs:
- uses: actions/create-github-app-token@c1a285145b9d317df6ced56c09f525b5c2b6f755 # v1.11.1
id: app-token
with:
app-id: ${{ vars.BACKPORT_APP_ID }}
private-key: ${{ secrets.BACKPORT_PRIVATE_KEY }}
app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
+2 -3
View File
@@ -14,9 +14,7 @@ on:
- cron: '0 0 * * *'
workflow_dispatch:
permissions:
contents: write # for devmasx/merge-branch to merge branches
pull-requests: write # for peter-evans/create-or-update-comment to create or update comment
permissions: {}
jobs:
periodic-merge:
@@ -39,3 +37,4 @@ jobs:
with:
from: ${{ matrix.pairs.from }}
into: ${{ matrix.pairs.into }}
secrets: inherit
+2 -3
View File
@@ -14,9 +14,7 @@ on:
- cron: '0 */6 * * *'
workflow_dispatch:
permissions:
contents: write # for devmasx/merge-branch to merge branches
pull-requests: write # for peter-evans/create-or-update-comment to create or update comment
permissions: {}
jobs:
periodic-merge:
@@ -37,3 +35,4 @@ jobs:
with:
from: ${{ matrix.pairs.from }}
into: ${{ matrix.pairs.into }}
secrets: inherit
+10 -1
View File
@@ -17,6 +17,14 @@ jobs:
runs-on: ubuntu-24.04
name: ${{ inputs.from }} → ${{ inputs.into }}
steps:
# Use a GitHub App to create the PR so that CI gets triggered
# The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs
- uses: actions/create-github-app-token@c1a285145b9d317df6ced56c09f525b5c2b6f755 # v1.11.1
id: app-token
with:
app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Find merge base between two branches
@@ -38,7 +46,7 @@ jobs:
type: now
from_branch: ${{ steps.merge_base.outputs.merge_base || inputs.from }}
target_branch: ${{ inputs.into }}
github_token: ${{ secrets.GITHUB_TOKEN }}
github_token: ${{ steps.app-token.outputs.token }}
- name: Comment on failure
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
@@ -47,3 +55,4 @@ jobs:
issue-number: 105153
body: |
Periodic merge from `${{ inputs.from }}` into `${{ inputs.into }}` has [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}).
token: ${{ steps.app-token.outputs.token }}
+1 -1
View File
@@ -80,7 +80,7 @@ stdenv.mkDerivation {
}
```
Note: It is possible to have multiple, different instances of `darwinMinVerisonHook` in your inputs.
Note: It is possible to have multiple, different instances of `darwinMinVersionHook` in your inputs.
When that happens, the one with the highest version is always used.
#### Picking an SDK version {#sec-darwin-troubleshooting-picking-sdk-version}
+42
View File
@@ -2066,6 +2066,12 @@
githubId = 869771;
name = "Kirill Boltaev";
};
aspauldingcode = {
email = "aspauldingcode@gmail.com";
github = "aspauldingcode";
githubId = 10196826;
name = "Alex Spaulding";
};
asppsa = {
email = "asppsa@gmail.com";
github = "asppsa";
@@ -3364,6 +3370,12 @@
github = "brianmcgillion";
githubId = 1044263;
};
britter = {
name = "Benedikt Ritter";
email = "beneritter@gmail.com";
github = "britter";
githubId = 1327662;
};
brodes = {
email = "me@brod.es";
github = "brhoades";
@@ -4956,6 +4968,12 @@
name = "Dov Alperin";
keys = [ { fingerprint = "4EED 5096 B925 86FA 1101 6673 7F2C 07B9 1B52 BB61"; } ];
};
da-luce = {
email = "daltonluce42@gmail.com";
github = "da-luce";
githubId = 102048662;
name = "Dalton Luce";
};
damhiya = {
name = "SoonWon Moon";
email = "damhiya@gmail.com";
@@ -7422,6 +7440,12 @@
name = "Felix Albrigtsen";
matrix = "@felixalb:feal.no";
};
felixdorn = {
name = "Félix";
matrix = "@d:xfe.li";
github = "felixdorn";
githubId = 55788595;
};
felixscheinost = {
name = "Felix Scheinost";
email = "felix.scheinost@posteo.de";
@@ -17497,6 +17521,12 @@
githubId = 25278658;
name = "Patrick Widmer";
};
paukaifler = {
email = "pau@kaifler.me";
github = "PauKaifler";
githubId = 81905706;
name = "Pau Kaifler";
};
paulsmith = {
email = "paulsmith@pobox.com";
github = "paulsmith";
@@ -20876,6 +20906,12 @@
githubId = 16765155;
name = "Shardul Baral";
};
sharpchen = {
github = "sharpchen";
githubId = 77432836;
name = "sharpchen";
email = "rui.chen.sharp@gmail.com";
};
sharzy = {
email = "me@sharzy.in";
github = "SharzyL";
@@ -21288,6 +21324,12 @@
githubId = 49844593;
name = "skovati";
};
skowalak = {
github = "skowalak";
githubId = 26260032;
name = "Sebastian Kowalak";
matrix = "@scl:tchncs.de";
};
skyesoss = {
name = "Skye Soss";
matrix = "@skyesoss:matrix.org";
@@ -40,6 +40,8 @@
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
- [AmneziaVPN](https://amnezia.org/en), an open-source VPN client, with a key feature that enables you to deploy your own VPN server on your server. Available as [programs.amnezia-vpn](#opt-programs.amnezia-vpn.enable).
- [Bazecor](https://github.com/Dygmalab/Bazecor), the graphical configurator for Dygma Products.
- [Bonsai](https://git.sr.ht/~stacyharper/bonsai), a general-purpose event mapper/state machine primarily used to create complex key shortcuts, and as part of the [SXMO](https://sxmo.org/) desktop environment. Available as [services.bonsaid](#opt-services.bonsaid.enable).
@@ -185,6 +187,8 @@
- `linuxPackages.nvidiaPackages.dc_520` has been removed since it is marked broken and there are better newer alternatives.
- `pnpm` was updated to version 10. If your project is incompatible, you can install the previous version from the package attribute `pnpm_9`.
- `programs.less.lessopen` is now null by default. To restore the previous behaviour, set it to `''|${lib.getExe' pkgs.lesspipe "lesspipe.sh"} %s''`.
- `hardware.pulseaudio` has been renamed to `services.pulseaudio`. The deprecated option names will continue to work, but causes a warning.
+1 -1
View File
@@ -90,7 +90,7 @@ let
You have set specialArgs.pkgs, which means that options like nixpkgs.config
and nixpkgs.overlays will be ignored. If you wish to reuse an already created
pkgs, which you know is configured correctly for this NixOS configuration,
please import the `nixosModules.pkgsReadOnly` module from the nixpkgs flake or
please import the `nixosModules.readOnlyPkgs` module from the nixpkgs flake or
`(modulesPath + "/misc/nixpkgs/read-only.nix"), and set `{ nixpkgs.pkgs = <your pkgs>; }`.
This properly disables the ignored options to prevent future surprises.
''
+1
View File
@@ -148,6 +148,7 @@
./programs/_1password.nix
./programs/adb.nix
./programs/alvr.nix
./programs/amnezia-vpn.nix
./programs/appgate-sdp.nix
./programs/appimage.nix
./programs/arp-scan.nix
+27
View File
@@ -0,0 +1,27 @@
{
config,
lib,
pkgs,
...
}:
let
cfg = config.programs.amnezia-vpn;
in
{
options.programs.amnezia-vpn = {
enable = lib.mkEnableOption "The AmneziaVPN client";
};
config = lib.mkIf cfg.enable {
environment.systemPackages = [ pkgs.amnezia-vpn ];
services.dbus.packages = [ pkgs.amnezia-vpn ];
services.resolved.enable = true;
systemd = {
packages = [ pkgs.amnezia-vpn ];
services."AmneziaVPN".wantedBy = [ "multi-user.target" ];
};
};
meta.maintainers = with lib.maintainers; [ sund3RRR ];
}
+4 -1
View File
@@ -1219,7 +1219,10 @@ in
be changed using {option}`security.pam.u2f.authFile` option.
File format is:
`username:first_keyHandle,first_public_key: second_keyHandle,second_public_key`
```
<username1>:<KeyHandle1>,<UserKey1>,<CoseType1>,<Options1>:<KeyHandle2>,<UserKey2>,<CoseType2>,<Options2>:...
<username2>:<KeyHandle1>,<UserKey1>,<CoseType1>,<Options1>:<KeyHandle2>,<UserKey2>,<CoseType2>,<Options2>:...
```
This file can be generated using {command}`pamu2fcfg` command.
More information can be found [here](https://developers.yubico.com/pam-u2f/).
@@ -317,11 +317,11 @@ in {
};
unit_system = mkOption {
type = types.nullOr (types.enum [ "metric" "imperial" ]);
type = types.nullOr (types.enum [ "metric" "us_customary" ]);
default = null;
example = "metric";
description = ''
The unit system to use. This also sets temperature_unit, Celsius for Metric and Fahrenheit for Imperial.
The unit system to use. This also sets temperature_unit, Celsius for Metric and Fahrenheit for US Customary.
'';
};
@@ -2,6 +2,7 @@
config,
lib,
pkgs,
utils,
...
}:
@@ -20,6 +21,10 @@ let
toString
;
inherit (utils)
escapeSystemdExecArgs
;
in
{
@@ -29,7 +34,7 @@ in
servers = mkOption {
default = { };
description = ''
Attribute set of faster-whisper instances to spawn.
Attribute set of wyoming-faster-whisper instances to spawn.
'';
type = types.attrsOf (
types.submodule (
@@ -43,9 +48,33 @@ in
default = "tiny-int8";
example = "Systran/faster-distil-whisper-small.en";
description = ''
Name of the voice model to use.
Name of the voice model to use. Can also be a HuggingFace model ID or a path to
a custom model directory.
Check the [2.0.0 release notes](https://github.com/rhasspy/wyoming-faster-whisper/releases/tag/v2.0.0) for possible values.
Compressed models (`int8`) are slightly less accurate, but smaller and faster.
Available models:
- `tiny-int8` (compressed)
- `tiny`
- `tiny.en` (English only)
- `base-int8` (compressed)
- `base`
- `base.en` (English only)
- `small-int8` (compressed)
- `distil-small.en` (distilled, English only)
- `small`
- `small.en` (English only)
- `medium-int8` (compressed)
- `distil-medium.en` (distilled, English only)
- `medium`
- `medium.en` (English only)
- `large`
- `large-v1`
- `distil-large-v2` (distilled, English only)
- `large-v2`
- `distil-large-v3` (distilled, English only)
- `large-v3`
- `turbo` (faster than large-v3)
'';
};
@@ -171,6 +200,7 @@ in
"uz"
"vi"
"yi"
"yue"
"yo"
"zh"
];
@@ -180,12 +210,26 @@ in
'';
};
initialPrompt = mkOption {
type = nullOr str;
default = null;
example = ''
The following conversation takes place in the universe of Wizard of Oz. Key terms include 'Yellow Brick Road' (the path to follow), 'Emerald City' (the ultimate goal), and 'Ruby Slippers' (the magical tools to succeed). Keep these in mind as they guide the journey.
'';
description = ''
Optional text to provide as a prompt for the first window. This can be used to provide, or
"prompt-engineer" a context for transcription, e.g. custom vocabularies or proper nouns
to make it more likely to predict those word correctly.
'';
};
beamSize = mkOption {
type = ints.unsigned;
default = 1;
default = 0;
example = 5;
description = ''
The number of beams to use in beam search.
Use `0` to automatically select a value based on the CPU.
'';
apply = toString;
};
@@ -233,18 +277,35 @@ in
serviceConfig = {
DynamicUser = true;
User = "wyoming-faster-whisper";
StateDirectory = "wyoming/faster-whisper";
StateDirectory = [
"wyoming/faster-whisper"
"wyoming/faster-whisper/models"
];
# https://github.com/home-assistant/addons/blob/master/whisper/rootfs/etc/s6-overlay/s6-rc.d/whisper/run
ExecStart = ''
${cfg.package}/bin/wyoming-faster-whisper \
--data-dir $STATE_DIRECTORY \
--download-dir $STATE_DIRECTORY \
--uri ${options.uri} \
--device ${options.device} \
--model ${options.model} \
--language ${options.language} \
--beam-size ${options.beamSize} ${options.extraArgs}
'';
ExecStart = escapeSystemdExecArgs (
[
(lib.getExe cfg.package)
"--data-dir"
"/var/lib/wyoming/faster-whisper"
"--download-dir"
"/var/lib/wyoming/faster-whisper/models"
"--uri"
options.uri
"--device"
options.device
"--model"
options.model
"--language"
options.language
"--beam-size"
options.beamSize
]
++ lib.optionals (options.initialPrompt != null) [
"--initial-prompt"
options.initialPrompt
]
++ options.extraArgs
);
CapabilityBoundingSet = "";
DeviceAllow =
if
@@ -2,6 +2,7 @@
config,
lib,
pkgs,
utils,
...
}:
@@ -9,14 +10,11 @@ let
cfg = config.services.wyoming.openwakeword;
inherit (lib)
concatStringsSep
concatMapStringsSep
escapeShellArgs
concatMap
mkOption
mkEnableOption
mkIf
mkPackageOption
mkRemovedOptionModule
types
;
@@ -24,20 +22,12 @@ let
toString
;
inherit (utils)
escapeSystemdExecArgs
;
in
{
imports = [
(mkRemovedOptionModule [
"services"
"wyoming"
"openwakeword"
"models"
] "Configuring models has been removed, they are now dynamically discovered and loaded at runtime")
];
meta.buildDocsInSandbox = false;
options.services.wyoming.openwakeword = with types; {
enable = mkEnableOption "Wyoming openWakeWord server";
@@ -79,10 +69,10 @@ in
};
threshold = mkOption {
type = float;
type = numbers.between 0.0 1.0;
default = 0.5;
description = ''
Activation threshold (0-1), where higher means fewer activations.
Activation threshold (0.0-1.0), where higher means fewer activations.
See trigger level for the relationship between activations and
wake word detections.
@@ -91,7 +81,7 @@ in
};
triggerLevel = mkOption {
type = int;
type = ints.unsigned;
default = 1;
description = ''
Number of activations before a detection is registered.
@@ -107,7 +97,6 @@ in
description = ''
Extra arguments to pass to the server commandline.
'';
apply = escapeShellArgs;
};
};
@@ -127,15 +116,34 @@ in
DynamicUser = true;
User = "wyoming-openwakeword";
# https://github.com/home-assistant/addons/blob/master/openwakeword/rootfs/etc/s6-overlay/s6-rc.d/openwakeword/run
ExecStart = concatStringsSep " " [
"${cfg.package}/bin/wyoming-openwakeword"
"--uri ${cfg.uri}"
(concatMapStringsSep " " (model: "--preload-model ${model}") cfg.preloadModels)
(concatMapStringsSep " " (dir: "--custom-model-dir ${toString dir}") cfg.customModelsDirectories)
"--threshold ${cfg.threshold}"
"--trigger-level ${cfg.triggerLevel}"
"${cfg.extraArgs}"
];
ExecStart = escapeSystemdExecArgs (
[
(lib.getExe cfg.package)
"--uri"
cfg.uri
"--threshold"
cfg.threshold
"--trigger-level"
cfg.triggerLevel
]
++ concatMap (
model:
[
"--preload-model"
model
]
cfg.preloadModels
)
++ concatMap (
dir:
[
"--custom-model-dir"
(toString dir)
]
cfg.customModelsDirectories
)
++ cfg.extraArgs
);
CapabilityBoundingSet = "";
DeviceAllow = "";
DevicePolicy = "closed";
@@ -2,6 +2,7 @@
config,
lib,
pkgs,
utils,
...
}:
@@ -9,7 +10,6 @@ let
cfg = config.services.wyoming.piper;
inherit (lib)
escapeShellArgs
mkOption
mkEnableOption
mkPackageOption
@@ -20,18 +20,19 @@ let
toString
;
inherit (utils)
escapeSystemdExecArgs
;
in
{
meta.buildDocsInSandbox = false;
options.services.wyoming.piper = with types; {
package = mkPackageOption pkgs "wyoming-piper" { };
servers = mkOption {
default = { };
description = ''
Attribute set of piper instances to spawn.
Attribute set of wyoming-piper instances to spawn.
'';
type = types.attrsOf (
types.submodule (
@@ -69,7 +70,7 @@ in
};
noiseScale = mkOption {
type = float;
type = numbers.between 0.0 1.0;
default = 0.667;
description = ''
Generator noise value.
@@ -78,7 +79,7 @@ in
};
noiseWidth = mkOption {
type = float;
type = numbers.between 0.0 1.0;
default = 0.333;
description = ''
Phoneme width noise value.
@@ -87,7 +88,7 @@ in
};
lengthScale = mkOption {
type = float;
type = numbers.between 0.0 1.0;
default = 1.0;
description = ''
Phoneme length value.
@@ -101,7 +102,6 @@ in
description = ''
Extra arguments to pass to the server commandline.
'';
apply = escapeShellArgs;
};
};
}
@@ -136,20 +136,35 @@ in
serviceConfig = {
DynamicUser = true;
User = "wyoming-piper";
StateDirectory = "wyoming/piper";
StateDirectory = [
"wyoming/piper"
"wyoming/piper/models"
];
# https://github.com/home-assistant/addons/blob/master/piper/rootfs/etc/s6-overlay/s6-rc.d/piper/run
ExecStart = ''
${cfg.package}/bin/wyoming-piper \
--data-dir $STATE_DIRECTORY \
--download-dir $STATE_DIRECTORY \
--uri ${options.uri} \
--piper ${options.piper}/bin/piper \
--voice ${options.voice} \
--speaker ${options.speaker} \
--length-scale ${options.lengthScale} \
--noise-scale ${options.noiseScale} \
--noise-w ${options.noiseWidth} ${options.extraArgs}
'';
ExecStart = escapeSystemdExecArgs (
[
(lib.getExe cfg.package)
"--data-dir"
"/var/lib/wyoming/piper"
"--download-dir"
"/var/lib/wyoming/piper/models"
"--uri"
options.uri
"--piper"
(lib.getExe options.piper)
"--voice"
options.voice
"--speaker"
options.speaker
"--length-scale"
options.lengthScale
"--noise-scale"
options.noiseScale
"--noise-w"
options.noiseWidth
]
++ options.extraArgs
);
CapabilityBoundingSet = "";
DeviceAllow = "";
DevicePolicy = "closed";
+4 -1
View File
@@ -183,7 +183,10 @@ in {
chmod -R u+rwX,g+rwX,o-rwx "${dataDir}"
# check whether user setup has already been done
if test -f "${dataDir}/config/config.ini.php"; then
if test -f "${dataDir}/config/config.ini.php" &&
# since matomo-5.2.0, the config.ini.php is already created at first
# installer page access https://github.com/matomo-org/matomo/issues/22932
grep -q -F "[database]" "${dataDir}/config/config.ini.php"; then
# then execute possibly pending database upgrade
matomo-console core:update --yes
fi
+3 -1
View File
@@ -26,6 +26,8 @@ in
options.services.trilium-server = with lib; {
enable = mkEnableOption "trilium-server";
package = mkPackageOption pkgs "trilium-server" {};
dataDir = mkOption {
type = types.str;
default = "/var/lib/trilium";
@@ -117,7 +119,7 @@ in
wantedBy = [ "multi-user.target" ];
environment.TRILIUM_DATA_DIR = cfg.dataDir;
serviceConfig = {
ExecStart = "${pkgs.trilium-server}/bin/trilium-server";
ExecStart = lib.getExe cfg.package;
User = "trilium";
Group = "trilium";
PrivateTmp = "true";
@@ -322,7 +322,7 @@ in
description = "Create Volatile Files and Directories in the Real Root";
after = [ "initrd-fs.target" ];
before = [
"initrd-nixos-activation.service"
"initrd.target"
"shutdown.target" "initrd-switch-root.target"
];
conflicts = [ "shutdown.target" "initrd-switch-root.target" ];
+14
View File
@@ -37,11 +37,25 @@ let
machine.wait_for_unit("phpfpm-matomo.service")
machine.wait_for_unit("nginx.service")
with subtest("matomo.js reachable via HTTP"):
machine.succeed("curl -sSfk http://machine/matomo.js")
with subtest("js/piwik.js reachable via HTTP"):
machine.succeed("curl -sSfk http://machine/js/piwik.js")
with subtest("matomo.php (API) reachable via HTTP"):
machine.succeed("curl -sSfk http://machine/matomo.php")
# without the grep the command does not produce valid utf-8 for some reason
with subtest("welcome screen loads"):
machine.succeed(
"curl -sSfL http://localhost/ | grep '<title>Matomo[^<]*Installation'"
)
with subtest("killing the phpfpm process should trigger an automatic restart"):
machine.succeed("systemctl kill -s KILL phpfpm-matomo")
machine.sleep(1)
machine.wait_for_unit("phpfpm-matomo.service")
'';
};
in
+18 -3
View File
@@ -2,7 +2,7 @@ let
cert =
pkgs:
pkgs.runCommand "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } ''
openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=example.com/CN=muc.example.com' -days 36500
openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=example.com/CN=muc.example.com/CN=matrix.example.com' -days 36500
mkdir -p $out
cp key.pem cert.pem $out
'';
@@ -20,12 +20,12 @@ import ../make-test-python.nix (
{
security.pki.certificateFiles = [ "${cert pkgs}/cert.pem" ];
networking.extraHosts = ''
${nodes.server.config.networking.primaryIPAddress} example.com
${nodes.server.networking.primaryIPAddress} example.com
'';
environment.systemPackages = [
(pkgs.callPackage ./xmpp-sendmessage.nix {
connectTo = nodes.server.config.networking.primaryIPAddress;
connectTo = nodes.server.networking.primaryIPAddress;
})
];
};
@@ -35,6 +35,7 @@ import ../make-test-python.nix (
security.pki.certificateFiles = [ "${cert pkgs}/cert.pem" ];
networking.extraHosts = ''
${config.networking.primaryIPAddress} example.com
${config.networking.primaryIPAddress} matrix.example.com
'';
services.ejabberd = {
@@ -65,6 +66,12 @@ import ../make-test-python.nix (
port: 5269
ip: "::"
module: ejabberd_s2s_in
-
port: 8448
module: ejabberd_http
tls: true
request_handlers:
"/_matrix": mod_matrix_gw
-
port: 5347
ip: "127.0.0.1"
@@ -275,9 +282,15 @@ import ../make-test-python.nix (
plugins:
- "pep"
mod_push: {}
mod_matrix_gw:
key_name: key1
key: MATRIX_SECRET
'';
};
systemd.services.ejabberd.serviceConfig.EnvironmentFile = pkgs.writeText "ejabberd.env" ''
EJABBERD_MACRO_MATRIX_SECRET=SU4mu/j8b8A1i1EdyxIcKlFlrp+eSRBIlZwGyHP7Mfo=
'';
networking.firewall.enable = false;
};
};
@@ -291,6 +304,8 @@ import ../make-test-python.nix (
assert "status: started" in server.succeed(ejabberd_prefix + "status")
server.succeed("curl https://matrix.example.com:8448/_matrix/key/v2/server")
server.succeed(
ejabberd_prefix + "register azurediamond example.com hunter2",
ejabberd_prefix + "register cthon98 example.com nothunter2",
+4 -2
View File
@@ -13,6 +13,7 @@
libmicrohttpd,
gnutls,
libtasn1,
libxml2,
p11-kit,
vim,
which,
@@ -24,13 +25,13 @@ with lib.strings;
let
version = "2.74.6";
version = "2.77.3";
src = fetchFromGitHub {
owner = "grame-cncm";
repo = "faust";
rev = version;
hash = "sha256-0r7DjTrsNKZ5ZmWoA+Y9OXyJFUiUFZiPQb1skXXWYTw=";
hash = "sha256-C2EOd85idiSKKnWYcfoUFMuCQHB36d3CkrYVNNYmotw=";
fetchSubmodules = true;
};
@@ -73,6 +74,7 @@ let
libtasn1
p11-kit
ncurses_static
libxml2
];
passthru = { inherit wrap wrapWithBuildEnv faust2ApplBase; };
@@ -40,13 +40,13 @@ let
in
stdenv.mkDerivation rec {
pname = "strawberry";
version = "1.2.3";
version = "1.2.4";
src = fetchFromGitHub {
owner = "jonaski";
repo = pname;
rev = version;
hash = "sha256-90gnPw21oBHrRslJmB2hUId0WI7Gf+I4bvdS+dvAHdI=";
hash = "sha256-acTFJS8E0hQNbiiOi8DfPyTiUcKjXwg5trk3Q2mYYmQ=";
};
# the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead
@@ -11713,12 +11713,12 @@ final: prev:
snacks-nvim = buildVimPlugin {
pname = "snacks.nvim";
version = "2025-01-06";
version = "2025-01-15";
src = fetchFromGitHub {
owner = "folke";
repo = "snacks.nvim";
rev = "14e89401da348f5d14509fca164fb7bcec83e597";
sha256 = "0z66fiy6mscwrwczgwngnhfcgi6mlr5kmv9k21nfwskrgmp8c71v";
rev = "e5dd9281ee9402858fb7b7f1ac74ddcef40ebacc";
sha256 = "147rbp4z58bvm6s2lk1yzis7rjrrppwgchxpiyf9klj2gh08mzwp";
};
meta.homepage = "https://github.com/folke/snacks.nvim/";
};
@@ -13315,6 +13315,18 @@ final: prev:
meta.homepage = "https://github.com/leafgarland/typescript-vim/";
};
nvzone-typr = buildVimPlugin {
pname = "typr";
version = "2025-01-15";
src = fetchFromGitHub {
owner = "nvzone";
repo = "typr";
rev = "a60c7f237be94d4b39228a3bd2ced80fe9fe2781";
sha256 = "0hbd85s2d28832qqy0lnm7f2iqa5n5s16h7n10hsm9iawi0z2ll9";
};
meta.homepage = "https://github.com/nvzone/typr/";
};
typst-conceal-vim = buildVimPlugin {
pname = "typst-conceal.vim";
version = "2023-10-13";
@@ -2853,6 +2853,8 @@ in
"snacks.win"
"snacks.words"
"snacks.zen"
"snacks.picker.config.highlights"
"snacks.picker.actions"
# Optional trouble integration
"trouble.sources.profiler"
];
@@ -3301,6 +3303,10 @@ in
];
};
nvzone-typr = super.nvzone-typr.overrideAttrs {
dependencies = [ self.nvzone-volt ];
};
unicode-vim =
let
unicode-data = fetchurl {
@@ -840,6 +840,7 @@ https://github.com/neovim/nvimdev.nvim/,,
https://github.com/zbirenbaum/nvterm/,HEAD,
https://github.com/nvzone/menu/,HEAD,nvzone-menu
https://github.com/nvzone/minty/,HEAD,nvzone-minty
https://github.com/nvzone/typr/,HEAD,nvzone-typr
https://github.com/nvzone/volt/,HEAD,nvzone-volt
https://github.com/epwalsh/obsidian.nvim/,HEAD,
https://github.com/nvimdev/oceanic-material/,,
+3
View File
@@ -109,6 +109,9 @@ python3.pkgs.buildPythonApplication {
# copy the patched `/run_electrum` over `/electrum/electrum`
# so the aiorpcx compatibility patch is used
cp run_electrum electrum_ltc/electrum-ltc
# refresh stale generated code, per electrum_ltc/paymentrequest.py line 40
protoc --proto_path=electrum_ltc/ --python_out=electrum_ltc/ electrum_ltc/paymentrequest.proto
'';
preBuild =
@@ -458,32 +458,6 @@ let
# flag (declare_args) so we simply hardcode it to false.
./patches/widevine-disable-auto-download-allow-bundle.patch
]
++ lib.optionals (versionRange "127" "128") [
# Fix missing chrome/browser/ui/webui_name_variants.h dependency
# and ninja 1.12 compat in M127.
# https://issues.chromium.org/issues/345645751
# https://issues.chromium.org/issues/40253918
# https://chromium-review.googlesource.com/c/chromium/src/+/5641516
(githubPatch {
commit = "2c101186b60ed50f2ba4feaa2e963bd841bcca47";
hash = "sha256-luu3ggo6XoeeECld1cKZ6Eh8x/qQYmmKI/ThEhuutuY=";
})
# https://chromium-review.googlesource.com/c/chromium/src/+/5644627
(githubPatch {
commit = "f2b43c18b8ecfc3ddc49c42c062d796c8b563984";
hash = "sha256-uxXxSsiS8R0827Oi3xsG2gtT0X+jJXziwZ1y8+7K+Qg=";
})
# https://chromium-review.googlesource.com/c/chromium/src/+/5646245
(githubPatch {
commit = "4ca70656fde83d2db6ed5a8ac9ec9e7443846924";
hash = "sha256-iQuRRZjDDtJfr+B7MV+TvUDDX3bvpCnv8OpSLJ1WqCE=";
})
# https://chromium-review.googlesource.com/c/chromium/src/+/5647662
(githubPatch {
commit = "50d63ffee3f7f1b1b9303363742ad8ebbfec31fa";
hash = "sha256-H+dv+lgXSdry3NkygpbCdTAWWdTVdKdVD3Aa62w091E=";
})
]
++ [
# Required to fix the build with a more recent wayland-protocols version
# (we currently package 1.26 in Nixpkgs while Chromium bundles 1.21):
@@ -646,7 +620,7 @@ let
+ ''
# Link to our own Node.js and Java (required during the build):
mkdir -p third_party/node/linux/node-linux-x64/bin
ln -s${lib.optionalString (chromiumVersionAtLeast "127") "f"} "${pkgsBuildHost.nodejs}/bin/node" third_party/node/linux/node-linux-x64/bin/node
ln -sf "${pkgsBuildHost.nodejs}/bin/node" third_party/node/linux/node-linux-x64/bin/node
ln -s "${pkgsBuildHost.jdk17_headless}/bin/java" third_party/jdk/current/bin/
# Allow building against system libraries in official builds
@@ -751,8 +725,6 @@ let
use_system_libffi = true;
# Use nixpkgs Rust compiler instead of the one shipped by Chromium.
rust_sysroot_absolute = "${buildPackages.rustc}";
}
// lib.optionalAttrs (chromiumVersionAtLeast "127") {
rust_bindgen_root = "${buildPackages.rust-bindgen}";
}
// {
@@ -85,8 +85,7 @@ let
url = "https://gn.googlesource.com/gn";
inherit (upstream-info.deps.gn) rev hash;
};
}
// lib.optionalAttrs (chromiumVersionAtLeast "127") {
# Relax hardening as otherwise gn unstable 2024-06-06 and later fail with:
# cc1plus: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security]
hardeningDisable = [ "format" ];
@@ -1,26 +1,26 @@
{
"chromium": {
"version": "131.0.6778.264",
"version": "132.0.6834.83",
"chromedriver": {
"hash_darwin": "sha256-ibvVBD3q+ed1VffgSEZie7VAmSdBT3CJ9bNnjyYzWis=",
"hash_darwin_aarch64": "sha256-Eup+/qrFxMAU9AoYfd5BYTKM+J7CWE7GLGETiYdYorU="
"hash_darwin": "sha256-gLpWPzuJXnYatvRFDdssgB7rMSUCFv2GIPaV+YRNiZ0=",
"hash_darwin_aarch64": "sha256-8uhDySh2cWogVFX6LzCRTTHTUHTk+vxdbVxyOIHHLxA="
},
"deps": {
"depot_tools": {
"rev": "20b9bdcace7ed561d6a75728c85373503473cb6b",
"hash": "sha256-vlBENaVTtbwDJtSswuszcUlx+icZYJeP6ew6MO1cAv0="
"rev": "41d43a2a2290450aeab946883542f8049b155c87",
"hash": "sha256-m/6b4VZZTUQOeED1mYvZOQCx8Re+Zd4O8SKDMjJ9Djo="
},
"gn": {
"rev": "95b0f8fe31a992a33c040bbe3867901335c12762",
"hash": "sha256-a8yCdBsl0nBMPS+pCLwrkAvQNP/THx/z/GySyOgx4Jk="
"rev": "feafd1012a32c05ec6095f69ddc3850afb621f3a",
"hash": "sha256-zZoD5Bx7wIEP2KJkHef6wHrxU3px+8Vseq29QcK32bg="
},
"npmHash": "sha256-b1l8SwjAfoColoa3zhTMPEF/rRuxzT3ATHE77rWU5EA="
"npmHash": "sha256-H1/h3x+Cgp1x94Ze3UPPHxRVpylZDvpMXMOuS+jk2dw="
},
"DEPS": {
"src": {
"url": "https://chromium.googlesource.com/chromium/src.git",
"rev": "2d05e31515360f4da764174f7c448b33e36da871",
"hash": "sha256-aAb+lMefY4+zADsVeyLIhNI4AQfGmzu+7Y8o3t2csmU=",
"rev": "03d59cf5ecf1d8444838ff9a1e96231304d4ff9c",
"hash": "sha256-2FuT20iW8Mp4AehdEFT5Ua3La5z8bmT1FdLaUZRL0CE=",
"recompress": true
},
"src/third_party/clang-format/script": {
@@ -30,18 +30,23 @@
},
"src/third_party/libc++/src": {
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git",
"rev": "6a68fd412b9aecd515a20a7cf84d11b598bfaf96",
"hash": "sha256-7skqaen0XqbRvAGXQ0/3kea3vRInktdP3DOBeIBiGlQ="
"rev": "8e31ad42561900383e10dbefc1d3e8f38cedfbe9",
"hash": "sha256-kmhTlz/qjvN0Qlra7Wz05O6X058hPPn0nVvAxFXQDC4="
},
"src/third_party/libc++abi/src": {
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git",
"rev": "9a1d90c3b412d5ebeb97a6e33d98e1d0dd923221",
"hash": "sha256-zPm+Rif9fITazDvvm6SvLq8gwcPzPbuaXlRbyYqv7JA="
"rev": "cec7f478354a8c8599f264ed8bb6043b5468f72d",
"hash": "sha256-CwiK9Td8aRS08RywItHKFvibzDAUYYd0YNRKxYPLTD8="
},
"src/third_party/libunwind/src": {
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git",
"rev": "efc3baa2d1ece3630fcfa72bef93ed831bcaec4c",
"hash": "sha256-0OBelaxkKdajYXrGgz08nyPZhxqpsnFXiF3m8DGQkDo="
"rev": "5b01ea4a6f3b666b7d190e7cb7c31db2ed4d94ce",
"hash": "sha256-uA+t5Ecc/iK3mllHR8AMVGRfU/7z1G3yrw0TamPQiOY="
},
"src/third_party/llvm-libc/src": {
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git",
"rev": "ca74a72e2b32ad804522bbef04dfe32560a10206",
"hash": "sha256-av9JdqLOQbezgRS4P8QXmvfB5l47v04WRagNJJgT5u4="
},
"src/chrome/test/data/perf/canvas_bench": {
"url": "https://chromium.googlesource.com/chromium/canvas_bench.git",
@@ -60,8 +65,8 @@
},
"src/docs/website": {
"url": "https://chromium.googlesource.com/website.git",
"rev": "4811f9e01c4cfcbf9c6957015063eaaa0d92be91",
"hash": "sha256-98wwIeMTF2Wg2sJ07U1OUV83wR9nJOjGubp7Vnk3kj8="
"rev": "be9c3dfd3781964fc0bab0d6c91d9ad117b71b02",
"hash": "sha256-CqveHvjPEcRWnzi8w13xr2OainrmABNO8uj0GzKmQqo="
},
"src/media/cdm/api": {
"url": "https://chromium.googlesource.com/chromium/cdm.git",
@@ -70,13 +75,13 @@
},
"src/net/third_party/quiche/src": {
"url": "https://quiche.googlesource.com/quiche.git",
"rev": "e0175250977c2b2b95087afc0857883538a1386c",
"hash": "sha256-1O+hnZF73AY44jcmajJlpaQY5PV4+x0hYwqf1TtMahY="
"rev": "9616efc903b7469161996006c8cf963238e26503",
"hash": "sha256-Z2uFWfZDYcY0m4R6mFMZJLnnVHu3/hQOAkCPQ5049SQ="
},
"src/testing/libfuzzer/fuzzers/wasm_corpus": {
"url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git",
"rev": "f650ff816f2ef227f61ea2e9f222aa69708ab367",
"hash": "sha256-qWsGQNUptbz0jYvUuxP7woNf5QQrfn9k3uvr82Yk0QM="
"rev": "1df5e50a45db9518a56ebb42cb020a94a090258b",
"hash": "sha256-gItDOfNqm1tHlmelz3l2GGdiKi9adu1EpPP6U7+8EQY="
},
"src/third_party/accessibility_test_framework/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/Accessibility-Test-Framework-for-Android.git",
@@ -85,8 +90,8 @@
},
"src/third_party/angle": {
"url": "https://chromium.googlesource.com/angle/angle.git",
"rev": "ac6cda4cbd716102ded6a965f79573b41581898d",
"hash": "sha256-7Zfc262U42G6BUlxnLp6sQ78VlWBt0pTzkYwXY0rqaE="
"rev": "ce13a00a2b049a1ef5e0e70a3d333ce70838ef7b",
"hash": "sha256-fMIHpa2QFsQQ19LGyhvV3Ihh6Ls8wwwhqTtpLoTEaf4="
},
"src/third_party/angle/third_party/glmark2/src": {
"url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -100,8 +105,8 @@
},
"src/third_party/angle/third_party/VK-GL-CTS/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS",
"rev": "179dd9f858f0f5b0e52b61aefc621dc82e2ad34a",
"hash": "sha256-B7X9PTlMQdolsvEfuCNaKnRFcvsPNZtn5FOcJBY6sCA="
"rev": "f674555ab03e6355e0981a647c115097e9fe5324",
"hash": "sha256-2ZhG4cJf85zO7x+SGG6RD2qgOxZVosxAIbuZt9GYUKs="
},
"src/third_party/anonymous_tokens/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git",
@@ -115,13 +120,13 @@
},
"src/third_party/dav1d/libdav1d": {
"url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git",
"rev": "389450f61ea0b2057fc9ea393d3065859c4ba7f2",
"hash": "sha256-FK3tOLq5NcKQuStY5o8Lv2CXpjYHJm7n+NnyLFMOCxo="
"rev": "93f12c117a4e1c0cc2b129dcc52e84dbd9b84200",
"hash": "sha256-Q2CaWvDqOmfaPG6a+SUHG5rFHalPEf4Oq/ytT3xuSOk="
},
"src/third_party/dawn": {
"url": "https://dawn.googlesource.com/dawn.git",
"rev": "740d2502dbbd719a76c5a8d3fb4dac1b5363f42e",
"hash": "sha256-R41YVv4uWCU6SsACXPRppeCDguTs+/NVJckvMGGTgJE="
"rev": "73dbf565079c89a531e6e01c4e8fc048a8a9660b",
"hash": "sha256-6P3Mw60+xZVsFbrhG6UkTlz8xvvEOptV3Ar1sos0CsU="
},
"src/third_party/dawn/third_party/glfw": {
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -130,8 +135,8 @@
},
"src/third_party/dawn/third_party/dxc": {
"url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler",
"rev": "080aeb7199e66e4b0a2b6383fd26a9f8d2cccbf5",
"hash": "sha256-YHEBGqfftgK68wWAWVTxtbl1GECBT1qTNe7irYkM/8k="
"rev": "ac36a797d3470e8ee906b98457a59270d01db30d",
"hash": "sha256-rhUNPA5b0H3PBsOpXbAeRLpS0tNQkiHbjRBWmJycSAY="
},
"src/third_party/dawn/third_party/dxheaders": {
"url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers",
@@ -155,38 +160,38 @@
},
"src/third_party/dawn/third_party/webgpu-cts": {
"url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts",
"rev": "815ff2bb4038144dea89c33021bc4429f22a130f",
"hash": "sha256-28uZotrv+/MBBo+pcBWY3Csqrdv5Y4DxGbGEwK9Cwdw="
"rev": "8690defa74b6975c10e85c113f121d4b2a3f2564",
"hash": "sha256-ArbHGjkHd1sko7gDPFksYz7XHKNge+e6tVy6oKPuqzg="
},
"src/third_party/highway/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/highway.git",
"rev": "8295336dd70f1201d42c22ab5b0861de38cf8fbf",
"hash": "sha256-PXsXIqWB4NNiFhanRjMIFSWYuW/IRuQo8mMPUBEentY="
"rev": "00fe003dac355b979f36157f9407c7c46448958e",
"hash": "sha256-IS7m1wBwpPBUNhx2GttY1fzvmLIeAp3o2gXfrFpRdvY="
},
"src/third_party/google_benchmark/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git",
"rev": "344117638c8ff7e239044fd0fa7085839fc03021",
"hash": "sha256-gztnxui9Fe/FTieMjdvfJjWHjkImtlsHn6fM1FruyME="
"rev": "761305ec3b33abf30e08d50eb829e19a802581cc",
"hash": "sha256-cH8s1gP6kCcojAAfTt5iQCVqiAaSooNk4BdaILujM3w="
},
"src/third_party/boringssl/src": {
"url": "https://boringssl.googlesource.com/boringssl.git",
"rev": "cd95210465496ac2337b313cf49f607762abe286",
"hash": "sha256-172yvjgbFWQyd0PBRl74PJzpY/mDGC85D7PdeogNodU="
"rev": "571c76e919c0c48219ced35bef83e1fc83b00eed",
"hash": "sha256-ib9wbV6S64OFc4zx0wQsQ84+5RxbETK0PS9Wm1BFQ1U="
},
"src/third_party/breakpad/breakpad": {
"url": "https://chromium.googlesource.com/breakpad/breakpad.git",
"rev": "6b0c5b7ee1988a14a4af94564e8ae8bba8a94374",
"hash": "sha256-kTkwRfaqw5ZCHEvu2YPZ+1vCfekHkY5pY3m9snDN64g="
"rev": "47f7823bdf4b1f39e462b2a497a674860e922e38",
"hash": "sha256-cFXUi2oO/614jF0GV7oW0ss62dXWFHDNWNT8rWHAiQc="
},
"src/third_party/cast_core/public/src": {
"url": "https://chromium.googlesource.com/cast_core/public",
"rev": "71f51fd6fa45fac73848f65421081edd723297cd",
"hash": "sha256-AalRQhJmornCqmvE2+36J/3LubaA0jr6P1PXy32lX4I="
"rev": "fbc5e98031e1271a0a566fcd4d9092b2d3275d05",
"hash": "sha256-o5/Lbhh6HHSWCVCEyDwDCgs+PLm67si981w0HuIWY7c="
},
"src/third_party/catapult": {
"url": "https://chromium.googlesource.com/catapult.git",
"rev": "44791916611acec1cd74c492c7453e46d9b0dbd2",
"hash": "sha256-SkF+RIIlU8Vl3AmN6kARkLuVz/X5vygNOtGN2K3Sr+M="
"rev": "b91cf840ac3255ef03b23cc93621369627422a1a",
"hash": "sha256-65cZPyqZUdSnYPJYUMYeJgx3mUC6L/qb9P2bDqd2Zkk="
},
"src/third_party/ced/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git",
@@ -195,8 +200,8 @@
},
"src/third_party/chromium-variations": {
"url": "https://chromium.googlesource.com/chromium-variations.git",
"rev": "7d681838b57a25ca6659b9cc0111f879147c416b",
"hash": "sha256-zio8SqKEqOYYjVWZnzfrPqngqym2lZu9M/hgSi3ey0Q="
"rev": "c170abb48f7715c237f4c06eaed0fe6f8a4c6f8d",
"hash": "sha256-mg5mu2jcy0xyNJ650ywWUMC94keRsqhZQuPZclHmyLI="
},
"src/third_party/cld_3/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git",
@@ -215,8 +220,8 @@
},
"src/third_party/cpuinfo/src": {
"url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git",
"rev": "1e83a2fdd3102f65c6f1fb602c1b320486218a99",
"hash": "sha256-28cFACca+NYE8oKlP5aWXNCLeEjhWqJ6gRnFI+VxDvg="
"rev": "8df44962d437a0477f07ba6b8843d0b6a48646a4",
"hash": "sha256-FlvmSjY8kt5XHymDLaZdPuZ4k5xcagJk8w/U6adTkWI="
},
"src/third_party/crc32c/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git",
@@ -225,23 +230,23 @@
},
"src/third_party/cros_system_api": {
"url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git",
"rev": "b08c5ad457bddea2664ba20fb25beb3d1799fed2",
"hash": "sha256-cwpcY8YTXk+VVIFphO5ihc5rvbG3ZY9iHeK81P5DHBs="
"rev": "554629b9242e6ae832ef14e3384654426f7fcc06",
"hash": "sha256-fvGypRhgl2uX9YE2cwjL7d3pYBa3Imd5p0RLhMYRgrc="
},
"src/third_party/crossbench": {
"url": "https://chromium.googlesource.com/crossbench.git",
"rev": "b4d7ae714c548c3e139b95a85582dc15ece1d2f7",
"hash": "sha256-1RDDbvce5WR32if3cFYxiU9HS04x3BYIgOFJPMVJSBo="
"rev": "ae6f165652e0ea983d73f5d04b7470d08c869e4f",
"hash": "sha256-/K6eM9s+fd2wjCrK0g0CgFNy0zxEN9SxTvmE50hMtXw="
},
"src/third_party/depot_tools": {
"url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git",
"rev": "20b9bdcace7ed561d6a75728c85373503473cb6b",
"hash": "sha256-vlBENaVTtbwDJtSswuszcUlx+icZYJeP6ew6MO1cAv0="
"rev": "41d43a2a2290450aeab946883542f8049b155c87",
"hash": "sha256-m/6b4VZZTUQOeED1mYvZOQCx8Re+Zd4O8SKDMjJ9Djo="
},
"src/third_party/devtools-frontend/src": {
"url": "https://chromium.googlesource.com/devtools/devtools-frontend",
"rev": "5284f1c63b2b08c47b8915ce713a1aace991dfe9",
"hash": "sha256-1Nh9SVIAde4jxgwFucbtZpl6rMyPM4Plfi+dhwP0wI8="
"rev": "f2f3682c9db8ca427f8c64f0402cc2c5152c6c24",
"hash": "sha256-mBWZdbgZfO01Pt2lZSHX/d5r+8A/+qCZA8MRtZdeTrs="
},
"src/third_party/dom_distiller_js/dist": {
"url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -250,8 +255,8 @@
},
"src/third_party/eigen3/src": {
"url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git",
"rev": "7eea0a9213e801ad9479a6499fd0330ec1db8693",
"hash": "sha256-JkOjOnLrDOcYHi3hptT1BDRvsKpTtOsBHT8YLb1hlJM="
"rev": "b396a6fbb2e173f52edb3360485dedf3389ef830",
"hash": "sha256-UroGjERR5TW9KbyLwR/NBpytXrW1tHfu6ZvQPngROq4="
},
"src/third_party/farmhash/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git",
@@ -265,8 +270,8 @@
},
"src/third_party/ffmpeg": {
"url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git",
"rev": "686d6944501a6ee9c849581e3fe343273d4af3f6",
"hash": "sha256-j5mpWn4j+U4rRlXbq8okUUXrRKycZkiV+UntiS90ChM="
"rev": "591ae4b02eaff9a03e2ec863da895128b0b49910",
"hash": "sha256-wwHxNuZe2hBmGBpVg/iQJBoL350jfPYPTPqDn3RiqZE="
},
"src/third_party/flac": {
"url": "https://chromium.googlesource.com/chromium/deps/flac.git",
@@ -300,8 +305,8 @@
},
"src/third_party/freetype/src": {
"url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git",
"rev": "f02bffad0fd57f3acfa835c3f2899c5b71ff8be0",
"hash": "sha256-Lc2hbmZnnXQa0vzlJCizNBQ5WCOI5sJglTTe5gWVYUA="
"rev": "0ae7e607370cc66218ccfacf5de4db8a35424c2f",
"hash": "sha256-+nbRZi3vAMTURhhFVUu5+59fVIv0GH3YZog2JavyVLY="
},
"src/third_party/freetype-testing/src": {
"url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git",
@@ -350,8 +355,8 @@
},
"src/third_party/googletest/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/googletest.git",
"rev": "62df7bdbc10887e094661e07ec2595b7920376fd",
"hash": "sha256-Iv/7r79cKC1pFkxPPHK/IHv/HFx18XZ4YVr+C2CX8+M="
"rev": "d144031940543e15423a25ae5a8a74141044862f",
"hash": "sha256-n7tiIFAj8AiSCa9Tw+1j+ro9cSt5vagZpkbBBUUtYQY="
},
"src/third_party/hunspell_dictionaries": {
"url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git",
@@ -375,8 +380,8 @@
},
"src/third_party/libFuzzer/src": {
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git",
"rev": "487e79376394754705984c5de7c4ce7f82f2bd7c",
"hash": "sha256-xQXfRIcQmAVP0k2mT7Blv1wBxL6wDaWTbIPGcTiMZRo="
"rev": "a7128317fe7935a43d6c9f39df54f21113951941",
"hash": "sha256-jPS+Xi/ia0sMspxSGN38zasmVS/HslxH/qOFsV9TguE="
},
"src/third_party/fuzztest/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git",
@@ -395,28 +400,23 @@
},
"src/third_party/libaom/source/libaom": {
"url": "https://aomedia.googlesource.com/aom.git",
"rev": "840f8797871cc587f7113ea9d2483a1156d57c0e",
"hash": "sha256-2XHqNAmv2L3TEFXu4Q6rnASLmuE93QplSVKNqyhlKUk="
"rev": "be60f06ab420d6a65c477213f04c8b0f2e12ba2e",
"hash": "sha256-9VhEVOG9cReDOGoX+x5G/jJ8Y5RDoQIiLMoZtt5c9pI="
},
"src/third_party/libavif/src": {
"url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git",
"rev": "2c36aed375fff68611641b57d919b191f33431d5",
"hash": "sha256-fApdfzEtQnmio6BVzkcr/VkwojrNs+cx/+Am80H9dXw="
"rev": "1cdeff7ecf456492c47cf48fc0cef6591cdc95da",
"hash": "sha256-lUuVyh2srhWMNUp4lEivyDic3MSZf5s63iAb84We80M="
},
"src/third_party/crabbyavif/src": {
"url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
"rev": "ffad64ff4e349f926ad5ffcc882e205a94156d77",
"hash": "sha256-M2ExAgLm/NZ2soQEv3Ap/qx/B3+nd3NdDqYOL0E/pc8="
},
"src/third_party/libavifinfo/src": {
"url": "https://aomedia.googlesource.com/libavifinfo.git",
"rev": "8d8b58a3f517ef8d1794baa28ca6ae7d19f65514",
"hash": "sha256-61OPjdMCIbHvWncmBzNw6sqlHcuc1kyqm9k1j4UTcZ0="
"rev": "c3548280e0a516ed7cad7ff1591b5807cef64aa4",
"hash": "sha256-hO5epHYNYI6pGwVSUv1Hp3qb7qOv8uOs4u+IdhDxd8Q="
},
"src/third_party/nearby/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git",
"rev": "1b382075dd1bd545655af7ebef949b3090061b74",
"hash": "sha256-kpyJiFXtk8eK8EkgzUbG0GS+znEeqzlB62qy9tPpEC8="
"rev": "8e87a6e51c93e7836ecdbcc0a520c7992f3ece13",
"hash": "sha256-DO3FW5Q233ctFKk4K5F8oZec9kfrVl6uxAwMn0niKz4="
},
"src/third_party/beto-core/src": {
"url": "https://beto-core.googlesource.com/beto-core.git",
@@ -440,8 +440,8 @@
},
"src/third_party/cros-components/src": {
"url": "https://chromium.googlesource.com/external/google3/cros_components.git",
"rev": "902e8ca804ae6c05f505e510c16647c32ce4d1cb",
"hash": "sha256-j2m9zVajkAdPF1ehLX0Gxp4LyMunhFDDCzrCm2WzArc="
"rev": "9129cf4b2a5ca775c280243257a0b4856a93c7fb",
"hash": "sha256-owXaTIj0pbhUeJkirxaRoCmgIN9DwNzY3h771kaN+Fc="
},
"src/third_party/libdrm/src": {
"url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git",
@@ -490,8 +490,8 @@
},
"src/third_party/libvpx/source/libvpx": {
"url": "https://chromium.googlesource.com/webm/libvpx.git",
"rev": "906334ac1de2b0afa666472dce5545b82c1251fb",
"hash": "sha256-7GInV/uHuK6bUa1dSBuxJn6adyjfoOqSqfmfTvQbAoc="
"rev": "727319a77ffe68e9aacb08e09ae7151b3a8f70a3",
"hash": "sha256-QGm37X4uid8zv+vRu0pVTvoQd2WcKztrj3tJkDjx82o="
},
"src/third_party/libwebm/source": {
"url": "https://chromium.googlesource.com/webm/libwebm.git",
@@ -505,8 +505,8 @@
},
"src/third_party/libyuv": {
"url": "https://chromium.googlesource.com/libyuv/libyuv.git",
"rev": "a8e59d207483f75b87dd5fc670e937672cdf5776",
"hash": "sha256-gTNmhYuYmt/JmWSAVbcE4PqG3kW/JaL7XEWXbiNVfMM="
"rev": "6ac7c8f25170c85265fca69fd1fe5d31baf3344f",
"hash": "sha256-vPVq7RzqO7gBUgYuNX0Fwxqok9jtXXJZgbhVFchG5Ws="
},
"src/third_party/lss": {
"url": "https://chromium.googlesource.com/linux-syscall-support.git",
@@ -540,8 +540,8 @@
},
"src/third_party/openscreen/src": {
"url": "https://chromium.googlesource.com/openscreen",
"rev": "4f27c4f1698522dfcea36dca948a13e2eaf4c26c",
"hash": "sha256-dosSqpFlvli60ZJ0vexVZOK/FmzOYq5BDrZKZW0lMfc="
"rev": "cb6fd42532fc3a831d6863d5006217e32a67c417",
"hash": "sha256-IlGxfw6Mhc7FYvhU2+Ngt9qflqr4JMC2OcplvksGI+U="
},
"src/third_party/openscreen/src/buildtools": {
"url": "https://chromium.googlesource.com/chromium/src/buildtools",
@@ -555,13 +555,13 @@
},
"src/third_party/pdfium": {
"url": "https://pdfium.googlesource.com/pdfium.git",
"rev": "7a8409531fbb58d7d15ae331e645977b113d7ced",
"hash": "sha256-KlqgaOxKJQHHjU1g1VCcJEBhv809DdEUedrxdk8N99I="
"rev": "84a8011ec69d0e2de271c05be7d62979608040d9",
"hash": "sha256-d8qJECIdq01ct+sS7cHVKFulYJarwahKCEcVf762JNI="
},
"src/third_party/perfetto": {
"url": "https://android.googlesource.com/platform/external/perfetto.git",
"rev": "24764a1d9c2fce1e9816ffae691f00353ade330d",
"hash": "sha256-FAaxTuIYExmL3PSWwcvLpnPD4qsGDGr4/CIyi0NSrnI="
"rev": "ea011a2c2d3aecdc4f1674887e107a56d2905edd",
"hash": "sha256-3vervpsq/QLMrR7RcJMwwh+CdFvSEj8yAzj6s9d1XMo="
},
"src/third_party/protobuf-javascript/src": {
"url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript",
@@ -580,8 +580,8 @@
},
"src/third_party/quic_trace/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git",
"rev": "caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc",
"hash": "sha256-Nf9ZDLcE1JunhbpEMHhrY2ROnbgrvVZoRkPwWq1DU0g="
"rev": "413da873d93a03d3662f24b881ea459a79f9c589",
"hash": "sha256-N1uFoNd3mz/LH1z06581Ds7BUyc67SNXUPzqomYREr8="
},
"src/third_party/pywebsocket3/src": {
"url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git",
@@ -600,8 +600,8 @@
},
"src/third_party/skia": {
"url": "https://skia.googlesource.com/skia.git",
"rev": "f14f6b1ab7cf544c0190074488d17821281cfa4d",
"hash": "sha256-0p57otDuIShl6MngYs22XA1QYxptDVa3vCwJsH59H34="
"rev": "c17fe9bc158c29de3cdd655ac73d14f52c17810a",
"hash": "sha256-mRfkEm+NzEX0DkJejk1THx4G7v0sIFmRrAnt3Zl5uco="
},
"src/third_party/smhasher/src": {
"url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -620,8 +620,8 @@
},
"src/third_party/swiftshader": {
"url": "https://swiftshader.googlesource.com/SwiftShader.git",
"rev": "7a9a492a38b7c701f7c96a15a76046aed8f8c0c3",
"hash": "sha256-6uBO4jwPSqhT4j+KTE0Za7B4prrE2kstsHNtHwTJX+Q="
"rev": "d5c4284774115bb1e32c012a2be1b5fbeb1ab1f9",
"hash": "sha256-h2BHyaOM0oscfX5cu8s4N1yyOkg/yQbvwD1DxF+RAQc="
},
"src/third_party/text-fragments-polyfill/src": {
"url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git",
@@ -630,18 +630,18 @@
},
"src/third_party/tflite/src": {
"url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git",
"rev": "689e8a82f8070a372981b7476fb673e243330d71",
"hash": "sha256-tImVDNyS5hCN6A1ODeVuB7XLCNr3EdxN8x961nPCM9g="
"rev": "658227d3b535287dc6859788bde6076c4fe3fe7c",
"hash": "sha256-gOUt/NljRK5wMFwy2aLqZ5NHwk4y/GxbQ+AZ3MxM0M8="
},
"src/third_party/vulkan-deps": {
"url": "https://chromium.googlesource.com/vulkan-deps",
"rev": "73fd75175922012f21557239b7743a152ea7f1fd",
"hash": "sha256-D8UIXXQX6dTxbuqFgd6AbmErr1r9839yiN6MrJlsqPw="
"rev": "0b56dd5952b25fad65139b64096fcd187048ed38",
"hash": "sha256-LVWvbMLjkMyAUM+0UpQ4oRsfcRU5F/xY60wiwxth4Ko="
},
"src/third_party/glslang/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang",
"rev": "2acc4ea0028bc703be2d4e9bc8a4032d015d6516",
"hash": "sha256-mwcvSRycM8bq3dDWk4yfkL8Tg5bfEap6lrr1Oxemzy4="
"rev": "9c644fcb5b9a1a9c975c50a790fd14c5451292b0",
"hash": "sha256-twWSeJp9bNbLYFszCWv9BCztfbXUBKSWV55/U+hd2hw="
},
"src/third_party/spirv-cross/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross",
@@ -650,38 +650,38 @@
},
"src/third_party/spirv-headers/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers",
"rev": "50bc4debdc3eec5045edbeb8ce164090e29b91f3",
"hash": "sha256-Zv5QZ8MmP45MH5e6EBDNPmP0vcjjNXJHKva5MNh5ovA="
"rev": "996c728cf7dcfb29845cfa15222822318f047810",
"hash": "sha256-FrT/kVIMjcu2zv+7kDeNKM77NnOyMBb8pV0w8DBP42A="
},
"src/third_party/spirv-tools/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools",
"rev": "42b315c15b1ff941b46bb3949c105e5386be8717",
"hash": "sha256-xb0TlPyXP2wu7jMrWZu+z8WC5mk0CbYgvkZEt3r+mww="
"rev": "9117e042b93d4ff08d2406542708170f77aaa2a3",
"hash": "sha256-m/a1i26u8lzpKuQHyAy6ktWWjbLZEaio1awz8VovTGE="
},
"src/third_party/vulkan-headers/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers",
"rev": "14345dab231912ee9601136e96ca67a6e1f632e7",
"hash": "sha256-ny/UVx4r+Fj39ZEepaWqDPplAJcrBQEQlkqsSofwLJ0="
"rev": "cbcad3c0587dddc768d76641ea00f5c45ab5a278",
"hash": "sha256-exXzafLgrgxyRvaF+4pCF+OLtPT2gDmcvzazQ4EQ1eA="
},
"src/third_party/vulkan-loader/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader",
"rev": "bd1c8ea9c6ac51e4c3a6ddb9d602bb204678eb5f",
"hash": "sha256-Ze/DGiD8Zj3mY+5Pi+tf6xMrX2YBqfl4Nc37b/JgmnI="
"rev": "b0177a972b8d47e823a4500cf88df88a8c27add7",
"hash": "sha256-NDp2TLeMLAHb92R+PjaPDTx8ckIlpSsS3BNx3lerB68="
},
"src/third_party/vulkan-tools/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools",
"rev": "c9a5acda16dc2759457dc856b5d7df00ac5bf4a2",
"hash": "sha256-0JzqUW6XbhPbLGs/smuNG6zQoWP8iaAO5VglGSyN94g="
"rev": "15f2de809304aba619ee327f3273425418ca83de",
"hash": "sha256-PiWKL045DAOGm+Hl/UyO6vmD4fVfuf2fSvXK6gSYbwo="
},
"src/third_party/vulkan-utility-libraries/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries",
"rev": "8c907ea21fe0147f791d79051b18e21bc8c4ede0",
"hash": "sha256-2abhzNt/rKbAhGQZhUhQ2LoemtU1Yh1fx9rrijOtjy4="
"rev": "87ab6b39a97d084a2ef27db85e3cbaf5d2622a09",
"hash": "sha256-luDw6g/EMSK67Et2wNta74PHGQU6Y7IRpDlSpgDYV6Q="
},
"src/third_party/vulkan-validation-layers/src": {
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers",
"rev": "cbb4ab171fc7cd0b636a76ee542e238a8734f4be",
"hash": "sha256-nKpS0ddAsN2KhOg6J/SwB8ZlVXrJTVixD4DuUkyxb6c="
"rev": "bc2c38412f739c298d6f5c076c064e6b5696959f",
"hash": "sha256-WWV+P++0Czeqg5p2UTqIP81pY8oz7cS7E7Z/sc0km6g="
},
"src/third_party/vulkan_memory_allocator": {
"url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
@@ -720,13 +720,13 @@
},
"src/third_party/webgpu-cts/src": {
"url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git",
"rev": "ae8b3ca40fbeee0bc67ef41a6c5b6dd5af839344",
"hash": "sha256-7u5Ay43GtcVTt3Cwg/5OaYQdG6SXXYtUun7DVN+XChE="
"rev": "b9f32fd2943dd2b3d0033bf938c9d843f4b5c9a9",
"hash": "sha256-Dd5uWNtnBIc2jiMkh9KjI5O1tJtmMvdlMA2nf+VOkQQ="
},
"src/third_party/webrtc": {
"url": "https://webrtc.googlesource.com/src.git",
"rev": "79aff54b0fa9238ce3518dd9eaf9610cd6f22e82",
"hash": "sha256-xkMnUduSG88EWiwq6PITN0KgAKjFd4QOis3dgxedK30="
"rev": "afaf497805cbb502da89991c2dcd783201efdd08",
"hash": "sha256-S8kGTd3+lf5OTayCMOqqrjxH4tcbT0NLZBpKmTCysMs="
},
"src/third_party/wuffs/src": {
"url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@@ -745,8 +745,8 @@
},
"src/third_party/xnnpack/src": {
"url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git",
"rev": "3986629de01e518a3f2359bf5629ef2b7ef72330",
"hash": "sha256-x8GQUj75mQXswI3b29tS9u25Zx3peYqDM8v1/wkC9cs="
"rev": "d1d33679661a34f03a806af2b813f699db3004f9",
"hash": "sha256-aDPlmLxNY9M5+Qb8VtdfxphHXU/X6JwYhkUSXkLh/FE="
},
"src/tools/page_cycler/acid3": {
"url": "https://chromium.googlesource.com/chromium/deps/acid3.git",
@@ -755,13 +755,13 @@
},
"src/third_party/zstd/src": {
"url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git",
"rev": "20707e3718ee14250fb8a44b3bf023ea36bd88df",
"hash": "sha256-/IUfh0De9m7ACrisqKlpxZsb+asoAWGXCaK6L+s24Q8="
"rev": "7fb5347e88f10472226c9aa1962a148e55d8c480",
"hash": "sha256-4J/F2v2W3mMdhqQ4q35gYkGaqTKlcG6OxUt3vQ8pcLs="
},
"src/v8": {
"url": "https://chromium.googlesource.com/v8/v8.git",
"rev": "9c09e7876ff830e1f9a731aa930040d1028ff5a1",
"hash": "sha256-OKa0W4s3VfaQ/MBHkrkZ8/LeRGqjGh9hTaqet7S4o58="
"rev": "e51f1d7dbd113aa01ddfb30890c8a89b11fcd96c",
"hash": "sha256-KJirPTvmC6vRTvrl6Nl0SQSieX/OhgfIiTblMxgoAvU="
}
}
},
@@ -97,12 +97,12 @@ in
# a new NixOS release.
spark_3_5 = spark rec {
pname = "spark";
version = "3.5.1";
hash = "sha256-ez6Hm8Ss3nl4mxOHyh67ugYH81/thNRMCja6MQ+9Tpg=";
version = "3.5.4";
hash = "sha256-rSr7UH1dZIkUYW6ehc/dYxlmN9yVjEKwrwLMT+uMd/0=";
};
spark_3_4 = spark rec {
pname = "spark";
version = "3.4.3";
hash = "sha256-ifeytk08oaEyiEawwWbUWWuoynGTJNvnrkOW/CjeaSk=";
version = "3.4.4";
hash = "sha256-GItHmthLhG7y0XSF3QINCyE7wYFb0+lPZmYLUuMa4Ww=";
};
}
@@ -417,11 +417,11 @@
"vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw="
},
"equinix": {
"hash": "sha256-PiAJ5Rw9qOmxNIsgayNJAC3EATu24OsDvonuqegSS7U=",
"hash": "sha256-G1ZgklICoKoH339/ipKJXZD9ftM5fTy99kFh62FqfrI=",
"homepage": "https://registry.terraform.io/providers/equinix/equinix",
"owner": "equinix",
"repo": "terraform-provider-equinix",
"rev": "v3.1.0",
"rev": "v3.1.1",
"spdx": "MIT",
"vendorHash": "sha256-wcrrSdSfL/hqA2Z2h1lTTCWWERfIdmsbOLY2H4SdVv0="
},
@@ -705,13 +705,13 @@
"vendorHash": "sha256-rGujp6FsQnkznRfjrSSB+4lLC3wAv6yvL/jAoWOiST0="
},
"keycloak": {
"hash": "sha256-2Z7nQ5NKS18OtoXXLm/P1n64NAxLR8nfMGyS2y17lag=",
"homepage": "https://registry.terraform.io/providers/mrparkers/keycloak",
"owner": "mrparkers",
"hash": "sha256-hdTZ+UEpmv4T8Kxk8cf1QACUKyOoRbD1X3OxwhmrRiI=",
"homepage": "https://registry.terraform.io/providers/keycloak/keycloak",
"owner": "keycloak",
"repo": "terraform-provider-keycloak",
"rev": "v4.4.0",
"spdx": "MIT",
"vendorHash": "sha256-F78OR8EG0Vy3WVJWTOlAsIBazsSXGD6KeceYuGnBqjQ="
"rev": "v5.0.0",
"spdx": "Apache-2.0",
"vendorHash": "sha256-51sFU6P4Ynyu9NpQxlbSV7EoB/Lk1da4O0bOuoeMujI="
},
"kubectl": {
"hash": "sha256-UQ/xvhs7II+EGH5bKdrVC47hp5dhLqQZeqSBz06ho1s=",
@@ -1192,13 +1192,13 @@
"vendorHash": "sha256-c3R/7k7y7XS2Qli00nSj7gh/3Mj88PY4WybBTq/+pPs="
},
"spotinst": {
"hash": "sha256-odW3iNfCrl6VLWZGjwZoVfwWHJXCJXzfbjoh+QitbTo=",
"hash": "sha256-ovrWtOJe5AVF1oneb+9It4MMkT8uL3bBdiXJNjahYRY=",
"homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
"owner": "spotinst",
"repo": "terraform-provider-spotinst",
"rev": "v1.204.0",
"rev": "v1.207.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-m2WVp5FdEl1yyvdAqAe0tqbH7GC6M5WkxJxXevXxCL4="
"vendorHash": "sha256-mVZbO2AH+mQeOj3I1FH2poQnQNGJUzxQNGmIv8nOqNw="
},
"ssh": {
"hash": "sha256-1UN5QJyjCuxs2vQYlSuz2jsu/HgGTxOoWWRcv4qcwow=",
@@ -1237,11 +1237,11 @@
"vendorHash": "sha256-YdWs2orKhbwAZSQYC73t4e/vvVxk8LrBPG9ZC38VcZE="
},
"sysdig": {
"hash": "sha256-TvZ7x4dWOERkqTWtjmbILdcWy12kqsV+OzLJ4siQ7mA=",
"hash": "sha256-AedvLVOnAGQ33TJ2o5AI+LixvrLpK/C90vS8jsXadbk=",
"homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig",
"owner": "sysdiglabs",
"repo": "terraform-provider-sysdig",
"rev": "v1.42.0",
"rev": "v1.44.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-nfVS4EXpPoriXyPpBK8k5OU9MTWxxrvTIwsF2uyQE/0="
},
@@ -3,16 +3,16 @@
buildGoModule rec {
pname = "discordo";
version = "0-unstable-2024-12-22";
version = "0-unstable-2025-01-12";
src = fetchFromGitHub {
owner = "ayn2op";
repo = pname;
rev = "9f15a6342413f68531402b8aeb5ed272159fc370";
hash = "sha256-8VBw7DsX/xnNkfiIe8jiG2oXjIp1tNT6wy6eTDBZxUg=";
rev = "2f071695146188c65b51f7030a89addfa845469a";
hash = "sha256-k2wwFx0Wi60xpdiS7qGoHdS6TfXFlI6yDeXXfOp1ivc=";
};
vendorHash = "sha256-UTZIx4zXIMdQBQXfzk3+j43yx7vlitw4Mwmon8oYjd8=";
vendorHash = "sha256-FsZRh4k9ucmAruJa1MZ4kVVryrEuHy9StgXHvgBiWSg=";
env.CGO_ENABLED = 0;
@@ -1,36 +1,38 @@
{
lib,
stdenv,
fetchFromGitHub,
buildGo123Module,
cmake,
extra-cmake-modules,
fetchFromGitHub,
git,
go_1_23,
wrapQtAppsHook,
qtbase,
qtdeclarative,
qtsvg,
qtwayland,
kconfig,
kcoreaddons,
kdbusaddons,
kguiaddons,
ki18n,
kirigami,
kirigami-addons,
knotifications,
kwindowsystem,
lib,
nlohmann_json,
qqc2-desktop-style,
qtbase,
qtdeclarative,
qtsvg,
qtwayland,
stdenv,
wrapQtAppsHook,
}:
let
version = "0.18.2";
version = "0.19.0";
src = fetchFromGitHub {
owner = "f-koehler";
repo = "KTailctl";
rev = "v${version}";
hash = "sha256-nxYgpIUNgWhWnrd5rqSH2r1QKhWPJwxlIQl6F9PmjpU=";
hash = "sha256-tKdzTfqKCSRf/cPw3AcvpuZ3ETQYSKm98r5Py14aC9w=";
};
goDeps =
@@ -38,7 +40,7 @@ let
pname = "ktailctl-go-wrapper";
inherit src version;
modRoot = "src/wrapper";
vendorHash = "sha256-UjgHfR+MJ8ROqOPIM0ZkqgFGVEkw8gKYlVQ6oxoIcgE=";
vendorHash = "sha256-xe2LUdh/F3ATRi2+5UbfLGAMgDnYj/J1ZIaB1lMPIkk=";
}).goModules;
in
stdenv.mkDerivation {
@@ -68,19 +70,21 @@ stdenv.mkDerivation {
];
buildInputs = [
qtbase
qtdeclarative
qtsvg
qtwayland
kconfig
kcoreaddons
kdbusaddons
kguiaddons
ki18n
kirigami
kirigami-addons
knotifications
kwindowsystem
nlohmann_json
qqc2-desktop-style
qtbase
qtdeclarative
qtsvg
qtwayland
];
meta = with lib; {
@@ -58,7 +58,7 @@ assert withQt -> qt6 != null;
stdenv.mkDerivation rec {
pname = "wireshark-${if withQt then "qt" else "cli"}";
version = "4.4.2";
version = "4.4.3";
outputs = [
"out"
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
repo = "wireshark";
owner = "wireshark";
rev = "v${version}";
hash = "sha256-qeMaj8kRGG1NlDb5j4M/Za2M2Ohh2qhXbzBtQGjrCSo=";
hash = "sha256-QTDOwJXo9+A2J/uXdyTtK5D5DVYLUAaUKT8desQGvd4=";
};
patches = [
@@ -94,7 +94,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
mainProgram = "rsync";
maintainers = with lib.maintainers; [
ehmry
kampfschlaefer
ivan
];
@@ -8,13 +8,13 @@
let
pname = "mendeley";
version = "2.128.0";
version = "2.129.0";
executableName = "${pname}-reference-manager";
src = fetchurl {
url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage";
hash = "sha256-V0UF52EVvxqFtBWOshiLO923osiKd0KJPc4gDadkta0=";
hash = "sha256-lA3ald0pgNd6az7nP5MPMrs12EEvJaHpEypXFfCvKCQ=";
};
appimageContents = appimageTools.extractType2 {
@@ -231,17 +231,29 @@ self = stdenv.mkDerivation {
mainProgram = "coqide";
};
}; in
if coqAtLeast "8.17" then self.overrideAttrs(_: let
core-stdlib-package = if coqAtLeast "8.21" then "rocq-core" else "coq-stdlib"; in {
if coqAtLeast "8.21" then self.overrideAttrs(_: {
# coq-core is now a shim for rocq
buildPhase = ''
runHook preBuild
make dunestrap
dune build -p coq-core${lib.optionalString (coqAtLeast "8.21") ",rocq-runtime"},${core-stdlib-package},coqide-server${lib.optionalString buildIde ",coqide"} -j $NIX_BUILD_CORES
dune build -p rocq-runtime,rocq-core,coq-core,coqide-server${lib.optionalString buildIde ",rocqide"} -j $NIX_BUILD_CORES
runHook postBuild
'';
installPhase = ''
runHook preInstall
dune install --prefix $out coq-core ${lib.optionalString (coqAtLeast "8.21") "rocq-runtime"} ${core-stdlib-package} coqide-server${lib.optionalString buildIde " coqide"}
dune install --prefix $out rocq-runtime rocq-core coq-core coqide-server${lib.optionalString buildIde " rocqide"}
runHook postInstall
'';
}) else if coqAtLeast "8.17" then self.overrideAttrs(_: {
buildPhase = ''
runHook preBuild
make dunestrap
dune build -p coq-core,coq-stdlib,coqide-server${lib.optionalString buildIde ",coqide"} -j $NIX_BUILD_CORES
runHook postBuild
'';
installPhase = ''
runHook preInstall
dune install --prefix $out coq-core coq-stdlib coqide-server${lib.optionalString buildIde " coqide"}
runHook postInstall
'';
}) else self
@@ -294,9 +294,9 @@ rec {
};
docker_27 = callPackage dockerGen rec {
version = "27.4.1";
version = "27.5.0";
cliRev = "v${version}";
cliHash = "sha256-/lIp32ArtI8FGPepXnUqmkQ03YTC8SfK44+onAvHFnE=";
cliHash = "sha256-PbdT1CL8jSHHPV2iygTXNwoY0qcNF2XUDEAHHsM4fPM=";
mobyRev = "v${version}";
mobyHash = "sha256-OSkI8F8bUjsCUT/pRWWbfTq9Fno5z35hW9OnLXHrIiQ=";
runcRev = "v1.2.3";
@@ -5,7 +5,7 @@
, copyDesktopItems
, electron
, nodejs
, pnpm
, pnpm_9
, makeDesktopItem
, autoSignDarwinBinariesHook
, nix-update-script
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
sha256 = "sha256-07lf9jy22JUT+Vc5y9Tu1nkWaXU5RTdu3GibcvQsSs8=";
};
pnpmDeps = pnpm.fetchDeps {
pnpmDeps = pnpm_9.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-LPsNRd1c/cQeyBn3LZKnKeAsZ981sOkLYTnXIZL82LA=";
};
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
nativeBuildInputs = [
makeWrapper nodejs pnpm.configHook
makeWrapper nodejs pnpm_9.configHook
] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
copyDesktopItems
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+10 -6
View File
@@ -22,6 +22,7 @@
wayland,
xdg-utils,
nix-update-script,
}:
let
rpathLibs =
@@ -43,16 +44,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "alacritty";
version = "0.14.0";
version = "0.15.0";
src = fetchFromGitHub {
owner = "alacritty";
repo = pname;
repo = "alacritty";
tag = "v${version}";
hash = "sha256-ZhkuuxTx2y8vOfxfpDpJAyNyDdRWab0pqyDdbOCQ2XE=";
hash = "sha256-CAxf0ltvYXYTdjQmLQnRwRRJUBgABbHSB8DxfAbgBdo=";
};
cargoHash = "sha256-T+/G2z7H/egJ/IlP3KA31jydg1CmFdLW8bLYSf/yWck=";
cargoHash = "sha256-pVwPo9O3ortTtVzZn1p1grFGLBA2gVTOatdNFqNQ5zc=";
nativeBuildInputs = [
cmake
@@ -121,7 +122,10 @@ rustPlatform.buildRustPackage rec {
dontPatchELF = true;
passthru.tests.test = nixosTests.terminal-emulators.alacritty;
passthru = {
tests.test = nixosTests.terminal-emulators.alacritty;
updateScript = nix-update-script { };
};
meta = with lib; {
description = "Cross-platform, GPU-accelerated terminal emulator";
@@ -130,7 +134,7 @@ rustPlatform.buildRustPackage rec {
mainProgram = "alacritty";
maintainers = with maintainers; [
Br1ght0ne
mic92
rvdp
];
platforms = platforms.unix;
changelog = "https://github.com/alacritty/alacritty/blob/v${version}/CHANGELOG.md";
+157
View File
@@ -0,0 +1,157 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
pkg-config,
kdePackages,
qt6,
libsecret,
xdg-utils,
amneziawg-go,
openvpn,
shadowsocks-rust,
cloak-pt,
wireguard-tools,
procps,
iproute2,
sudo,
libssh,
zlib,
tun2socks,
xray,
}:
let
amnezia-tun2socks = tun2socks.overrideAttrs (
finalAttrs: prevAttrs: {
pname = "amnezia-tun2socks";
version = "2.5.4";
src = fetchFromGitHub {
owner = "amnezia-vpn";
repo = "amnezia-tun2socks";
tag = "v${finalAttrs.version}";
hash = "sha256-lHo7WtcqccBSHly6neuksh1gC7RCKxbFNX9KSKNNeK8=";
};
vendorHash = "sha256-VvOaTJ6dBFlbGZGxnHy2sCtds1tyhu6VsPewYpsDBiM=";
ldflags = [
"-w"
"-s"
"-X github.com/amnezia-vpn/amnezia-tun2socks/v2/internal/version.Version=v${finalAttrs.version}"
"-X github.com/amnezia-vpn/amnezia-tun2socks/v2/internal/version.GitCommit=v${finalAttrs.version}"
];
}
);
amnezia-xray = xray.overrideAttrs (
finalAttrs: prevAttrs: {
pname = "amnezia-xray";
version = "1.8.13";
src = fetchFromGitHub {
owner = "amnezia-vpn";
repo = "amnezia-xray-core";
tag = "v${finalAttrs.version}";
hash = "sha256-7XYdogoUEv3kTPTOQwRCohsPtfSDf+aRdI28IkTjvPk=";
};
vendorHash = "sha256-zArdGj5yeRxU0X4jNgT5YBI9SJUyrANDaqNPAPH3d5M=";
}
);
in
stdenv.mkDerivation (finalAttrs: {
pname = "amnezia-vpn";
version = "4.8.2.3";
src = fetchFromGitHub {
owner = "amnezia-vpn";
repo = "amnezia-client";
tag = finalAttrs.version;
hash = "sha256-bCWPyRW2xnnopcwfPHgQrdP85Ct0CDufJRQ1PvCAiDE=";
fetchSubmodules = true;
};
patches = [ ./router.patch ];
postPatch =
''
substituteInPlace client/platforms/linux/daemon/wireguardutilslinux.cpp \
--replace-fail 'm_tunnel.start(appPath.filePath("../../client/bin/wireguard-go"), wgArgs);' 'm_tunnel.start("${amneziawg-go}/bin/amneziawg-go", wgArgs);'
substituteInPlace client/utilities.cpp \
--replace-fail 'return Utils::executable("../../client/bin/openvpn", true);' 'return Utils::executable("${openvpn}/bin/openvpn", false);' \
--replace-fail 'return Utils::executable("../../client/bin/tun2socks", true);' 'return Utils::executable("${amnezia-tun2socks}/bin/amnezia-tun2socks", false);' \
--replace-fail 'return Utils::usrExecutable("wg-quick");' 'return Utils::executable("${wireguard-tools}/bin/wg-quick", false);' \
--replace-fail 'QProcess::execute(QString("pkill %1").arg(name));' 'return QProcess::execute(QString("pkill -f %1").arg(name)) == 0;'
substituteInPlace client/protocols/xrayprotocol.cpp \
--replace-fail 'return Utils::executable(QString("xray"), true);' 'return Utils::executable(QString("${amnezia-xray}/bin/xray"), false);'
substituteInPlace client/protocols/openvpnovercloakprotocol.cpp \
--replace-fail 'return Utils::executable(QString("/ck-client"), true);' 'return Utils::executable(QString("${cloak-pt}/bin/ck-client"), false);'
substituteInPlace client/protocols/shadowsocksvpnprotocol.cpp \
--replace-fail 'return Utils::executable(QString("/ss-local"), true);' 'return Utils::executable(QString("${shadowsocks-rust}/bin/sslocal"), false);'
substituteInPlace client/configurators/openvpn_configurator.cpp \
--replace-fail ".arg(qApp->applicationDirPath());" ".arg(\"$out/local/bin\");"
substituteInPlace client/ui/qautostart.cpp \
--replace-fail "/usr/share/pixmaps/AmneziaVPN.png" "$out/share/pixmaps/AmneziaVPN.png"
substituteInPlace deploy/installer/config/AmneziaVPN.desktop.in \
--replace-fail "#!/usr/bin/env xdg-open" "#!${xdg-utils}/bin/xdg-open" \
--replace-fail "/usr/share/pixmaps/AmneziaVPN.png" "$out/share/pixmaps/AmneziaVPN.png"
substituteInPlace deploy/data/linux/AmneziaVPN.service \
--replace-fail "ExecStart=/opt/AmneziaVPN/service/AmneziaVPN-service.sh" "ExecStart=$out/bin/AmneziaVPN-service" \
--replace-fail "Environment=LD_LIBRARY_PATH=/opt/AmneziaVPN/client/lib" ""
''
+ (lib.optionalString (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) ''
substituteInPlace client/cmake/3rdparty.cmake \
--replace-fail 'set(LIBSSH_LIB_PATH "''${LIBSSH_ROOT_DIR}/linux/x86_64/libssh.a")' 'set(LIBSSH_LIB_PATH "${libssh}/lib/libssh.so")' \
--replace-fail 'set(ZLIB_LIB_PATH "''${LIBSSH_ROOT_DIR}/linux/x86_64/libz.a")' 'set(ZLIB_LIB_PATH "${zlib}/lib/libz.so")' \
--replace-fail 'set(OPENSSL_LIB_SSL_PATH "''${OPENSSL_ROOT_DIR}/linux/x86_64/libssl.a")' 'set(OPENSSL_LIB_SSL_PATH "''${OPENSSL_ROOT_DIR}/linux/arm64/libssl.a")' \
--replace-fail 'set(OPENSSL_LIB_CRYPTO_PATH "''${OPENSSL_ROOT_DIR}/linux/x86_64/libcrypto.a")' 'set(OPENSSL_LIB_CRYPTO_PATH "''${OPENSSL_ROOT_DIR}/linux/arm64/libcrypto.a")'
'');
strictDeps = true;
nativeBuildInputs = [
cmake
pkg-config
qt6.wrapQtAppsHook
];
buildInputs = [
libsecret
qt6.qtbase
qt6.qttools
kdePackages.qtremoteobjects
kdePackages.qtsvg
kdePackages.qt5compat
];
qtWrapperArgs = [
''--prefix PATH : ${
lib.makeBinPath [
procps
iproute2
sudo
]
}''
];
postInstall = ''
mkdir -p $out/bin $out/local/bin $out/share/applications $out/share/pixmaps $out/lib/systemd/system
cp client/AmneziaVPN service/server/AmneziaVPN-service $out/bin/
cp ../deploy/data/linux/client/bin/update-resolv-conf.sh $out/local/bin/
cp ../AppDir/AmneziaVPN.desktop $out/share/applications/
cp ../deploy/data/linux/AmneziaVPN.png $out/share/pixmaps/
cp ../deploy/data/linux/AmneziaVPN.service $out/lib/systemd/system/
'';
meta = with lib; {
description = "Amnezia VPN Client";
downloadPage = "https://amnezia.org/en/downloads";
homepage = "https://amnezia.org/en";
license = licenses.gpl3;
mainProgram = "AmneziaVPN";
maintainers = with maintainers; [ sund3RRR ];
platforms = platforms.unix;
};
})
+54
View File
@@ -0,0 +1,54 @@
--- a/service/server/router_linux.cpp 2025-01-01 11:36:27.615658613 +0300
+++ b/service/server/router_linux.cpp 2025-01-01 18:07:57.300178080 +0300
@@ -19,9 +19,27 @@
#include <stdio.h>
#include <unistd.h>
#include <QFileInfo>
+#include <QStringList>
+#include <QString>
#include <core/networkUtilities.h>
+bool isServiceActive(const QString &serviceName) {
+ QProcess process;
+ process.start("systemctl", { "list-units", "--type=service", "--state=running", "--no-legend" });
+ process.waitForFinished();
+
+ QString output = process.readAllStandardOutput();
+ QStringList services = output.split('\n', Qt::SkipEmptyParts);
+
+ for (const QString &service : services) {
+ if (service.contains(serviceName)) {
+ return true;
+ }
+ }
+ return false;
+}
+
RouterLinux &RouterLinux::Instance()
{
static RouterLinux s;
@@ -158,15 +176,14 @@
p.setProcessChannelMode(QProcess::MergedChannels);
//check what the dns manager use
- if (QFileInfo::exists("/usr/bin/nscd")
- || QFileInfo::exists("/usr/sbin/nscd")
- || QFileInfo::exists("/usr/lib/systemd/system/nscd.service"))
- {
- p.start("systemctl restart nscd");
- }
- else
- {
- p.start("systemctl restart systemd-resolved");
+ if (isServiceActive("nscd.service")) {
+ qDebug() << "Restarting nscd.service";
+ p.start("systemctl", { "restart", "nscd" });
+ } else if (isServiceActive("systemd-resolved.service")) {
+ qDebug() << "Restarting systemd-resolved.service";
+ p.start("systemctl", { "restart", "systemd-resolved" });
+ } else {
+ qDebug() << "No suitable DNS manager found.";
}
p.waitForFinished();
+3 -3
View File
@@ -2,7 +2,7 @@
buildGoModule,
lib,
fetchFromGitHub,
pnpm,
pnpm_9,
nodejs,
fetchpatch,
stdenv,
@@ -25,14 +25,14 @@ buildGoModule rec {
sourceRoot = "${src.name}/ui";
pnpmDeps = pnpm.fetchDeps {
pnpmDeps = pnpm_9.fetchDeps {
inherit src version pname;
sourceRoot = "${src.name}/ui";
hash = "sha256-/se6IWeHdazqS7PzOpgtT4IxCJ1WptqBzZ/BdmGb4BA=";
};
nativeBuildInputs = [
pnpm.configHook
pnpm_9.configHook
nodejs
];
+2 -2
View File
@@ -9,14 +9,14 @@
stdenv.mkDerivation rec {
pname = "apktool";
version = "2.10.0";
version = "2.11.0";
src = fetchurl {
urls = [
"https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar"
"https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar"
];
hash = "sha256-wDUKu6tTFCSN/i7gyQfe9O3RT2+u8fXTctPUq9KPBDE=";
hash = "sha256-j9wXxv4ubYDXG4cY6ypdA3nxzHE5rnd/akmc45eyb1Q=";
};
dontUnpack = true;
+2 -2
View File
@@ -6,11 +6,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "arkenfox-userjs";
version = "128.0";
version = "133.0";
src = fetchurl {
url = "https://raw.githubusercontent.com/arkenfox/user.js/${finalAttrs.version}/user.js";
hash = "sha256-CJk9sni0+cYC9rBHSL2mDQRtpsQJobQ1u3tq991Oi1c=";
hash = "sha256-rPcH24YqEBOzoPB9yxMlke/3tqpi9L7GVMsZ3MUP8WY=";
};
dontUnpack = true;
+46
View File
@@ -0,0 +1,46 @@
{
lib,
fetchFromGitHub,
gitUpdater,
rustPlatform,
versionCheckHook,
}:
rustPlatform.buildRustPackage rec {
pname = "arp-scan-rs";
version = "0.14.0";
src = fetchFromGitHub {
owner = "kongbytes";
repo = "arp-scan-rs";
tag = "v${version}";
hash = "sha256-CLxeT2olrxRCJ12IZ1PvLW7ZuX0HPsoNuFyxmGBhB8w=";
};
cargoHash = "sha256-+Ph5k3qaK4USggTnZqyOdH6oKv5Xr2/NeQ9C0Q6g5sQ=";
nativeInstallCheckInputs = [ versionCheckHook ];
preCheck = ''
# Test fails
substituteInPlace src/network.rs \
--replace-fail 'Some("one.one.one.one".to_string())' 'None'
'';
versionCheckProgram = [ "${placeholder "out"}/bin/arp-scan" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru.updateScript = gitUpdater { };
meta = {
description = "ARP scan tool for fast local network scans";
homepage = "https://github.com/kongbytes/arp-scan-rs";
changelog = "https://github.com/kongbytes/arp-scan-rs/releases/tag/v${version}";
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ fab ];
mainProgram = "arp-scan";
};
}
@@ -2,7 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
pnpm,
pnpm_9,
nodejs_22,
}:
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-NBLUeg1WqxTXtu8eg1fihQSfm8koYAEWhfXAj/fIdC8=";
};
pnpmDeps = pnpm.fetchDeps {
pnpmDeps = pnpm_9.fetchDeps {
inherit (finalAttrs)
pname
version
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
nodejs_22
pnpm.configHook
pnpm_9.configHook
];
buildInputs = [ nodejs_22 ];
+56
View File
@@ -0,0 +1,56 @@
{
stdenv,
lib,
fetchurl,
fetchFromGitHub,
xxd,
meson,
ninja,
ncurses,
argtable,
versionCheckHook,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "astroterm";
version = "1.0.4";
src = fetchFromGitHub {
owner = "da-luce";
repo = "astroterm";
tag = "v${finalAttrs.version}";
hash = "sha256-CYKW/RAQ3a5238cojbpGfTenMQApfaZOHnQMrZ6LWzA=";
};
bsc5File = fetchurl {
url = "https://web.archive.org/web/20231007085824/http://tdc-www.harvard.edu/catalogs/BSC5";
hash = "sha256-5HHQLq9O7LYcEvh5octkMrqde2ipqMVlSh60KgyMw0A=";
};
nativeBuildInputs = [
meson
ninja
xxd
versionCheckHook
];
buildInputs = [
argtable
ncurses
];
postPatch = ''
mkdir -p data
ln -s ${finalAttrs.bsc5File} data/bsc5
'';
doCheck = true;
meta = {
description = "Celestial viewer for the terminal, written in C";
homepage = "https://github.com/da-luce/astroterm/";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.da-luce ];
mainProgram = "astroterm";
platforms = lib.platforms.unix;
};
})
@@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "automatic-timezoned";
version = "2.0.44";
version = "2.0.45";
src = fetchFromGitHub {
owner = "maxbrunet";
repo = pname;
rev = "v${version}";
sha256 = "sha256-+DLuvB6jOgZwZVjztsTpZ5z8tQDlpWDQvtM6yW1y/O0=";
sha256 = "sha256-8fgOhmjFXC0nMs7oTfJWbn1DOmOU9RtTgR+xmV/nZ9g=";
};
cargoHash = "sha256-73aBnRdcxdcYBuk8oe8AvAQ1T9GELniHqBMsuF3PJog=";
cargoHash = "sha256-4WytstmBjd0FCSxY4omrZZhcSq1xSPQKFz7S4jZukVA=";
meta = with lib; {
description = "Automatically update system timezone based on location";
+2 -2
View File
@@ -7,7 +7,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "autosuspend";
version = "7.0.3";
version = "7.1.0";
pyproject = true;
disabled = python3.pythonOlder "3.10";
@@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "languitar";
repo = pname;
tag = "v${version}";
hash = "sha256-ePQiP7NeRBPVHkd8rvbxno/NBX95e9d97F8TIazCUH4=";
hash = "sha256-Sug42L4D9lgtc7AWIOcgC+e9WCHfmqB4O1Gez/sR6jE=";
};
build-system = with python3.pkgs; [
@@ -105,6 +105,9 @@ stdenv.mkDerivation (finalAttrs: {
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
# Starts & talks to D-Bus, breaks under parallelism
enableParallelChecking = false;
passthru = {
ayatana-indicators = {
ayatana-indicator-sound = [
+8 -5
View File
@@ -1,20 +1,23 @@
{
fetchFromGitHub,
buildGo122Module,
buildGoModule,
lib,
versionCheckHook,
}:
buildGo122Module rec {
buildGoModule rec {
pname = "baidupcs-go";
version = "3.9.5-unstable-2024-06-23";
version = "3.9.7";
src = fetchFromGitHub {
owner = "qjfoidnh";
repo = "BaiduPCS-Go";
rev = "5612fc337b9556ed330274987a2f876961639cff";
hash = "sha256-4mCJ5gVHjjvR6HNo47NTJvQEu7cdZZMfO8qQA7Kqzqo=";
rev = "v${version}";
hash = "sha256-C88q2tNNuX+tIvYKHbRE76xfPe81UHqfezyRXzrxzlc=";
};
vendorHash = "sha256-msTlXtidxLTe3xjxTOWCqx/epFT0XPdwGPantDJUGpc=";
doCheck = false;
ldflags = [
-1394
View File
File diff suppressed because it is too large Load Diff
+70 -12
View File
@@ -1,11 +1,39 @@
{
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
fontconfig,
bzip2,
cabextract,
dmg2img,
dtc,
dumpifs,
enableUnfree ? false,
fetchFromGitHub,
fontconfig,
gnutar,
jefferson,
lib,
lzfse,
lzo,
lzop,
lz4,
openssl_3,
pkg-config,
python3,
rustPlatform,
sasquatch,
sleuthkit,
srec2bin,
stdenv,
ubi_reader,
ucl,
uefi-firmware-parser,
unrar,
unyaffs,
unzip,
versionCheckHook,
vmlinux-to-elf,
xz,
zlib,
zstd,
_7zz,
}:
rustPlatform.buildRustPackage rec {
@@ -15,20 +43,44 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "ReFirmLabs";
repo = "binwalk";
rev = "refs/tags/v${version}";
tag = "v${version}";
hash = "sha256-em+jOnhCZH5EEJrhXTHmxiwpMcBr5oNU1+5IJ1H/oco=";
};
cargoLock = {
lockFile = ./Cargo.lock;
};
cargoHash = "sha256-7+2TdlfCHJHXn0+q74JhmY3/lC0WfCG2FFmQFQNf4k8=";
nativeBuildInputs = [ pkg-config ];
# https://github.com/ReFirmLabs/binwalk/commits/master/dependencies
buildInputs = [
fontconfig
bzip2
];
cabextract
dmg2img
dtc
dumpifs
fontconfig
gnutar
jefferson
lzfse
lzo
lzop
lz4
openssl_3
python3.pkgs.python-lzo
sasquatch
sleuthkit
srec2bin
ubi_reader
ucl
uefi-firmware-parser
unyaffs
unzip
vmlinux-to-elf
xz
zlib
zstd
_7zz
] ++ lib.optionals enableUnfree [ unrar ];
# skip broken tests
checkFlags =
@@ -53,14 +105,20 @@ rustPlatform.buildRustPackage rec {
"--skip=extractors::common::Chroot::make_executable"
];
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
versionCheckProgramArg = "-V";
meta = {
description = "Firmware Analysis Tool";
homepage = "https://github.com/ReFirmLabs/binwalk";
changelog = "https://github.com/ReFirmLabs/binwalk/releases/tag/${src.rev}";
changelog = "https://github.com/ReFirmLabs/binwalk/releases/tag/v${version}";
license = lib.licenses.mit;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [
koral
felbinger
];
mainProgram = "binwalk";
};
}
+2 -2
View File
@@ -6,10 +6,10 @@
}:
let
pname = "bitcomet";
version = "2.12.0";
version = "2.12.1";
src = fetchurl {
url = "https://download.bitcomet.com/linux/x86_64/BitComet-${version}-x86_64.AppImage";
hash = "sha256-TbEdormqEZJymOQF8ftpZ6JBU1AeCdkQ/FAzRYrgaJ4=";
hash = "sha256-iaUPf9gSTd2m641Ja9/5v4wkO3H4+R08YXohLCeFuTQ=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };
in
+2 -2
View File
@@ -20,13 +20,13 @@ let
in
stdenv.mkDerivation rec {
pname = "blis";
version = "1.0";
version = "1.1";
src = fetchFromGitHub {
owner = "flame";
repo = "blis";
rev = version;
sha256 = "sha256-lAo6C34QQvXr3LmcsnTp4+Imi/lKxzcWu3EJkVgLvDI=";
sha256 = "sha256-joOTyHT87PelKNhL9+1lLqMz22WsENa+Rom41grBb0Y=";
};
inherit blas64;
+14 -15
View File
@@ -4,24 +4,28 @@
fetchFromGitHub,
flutter324,
mpv,
pkg-config,
makeDesktopItem,
wrapGAppsHook3,
copyDesktopItems,
}:
flutter324.buildFlutterApplication rec {
pname = "bloomeetunes";
version = "2.10.9";
version = "2.10.13";
src = fetchFromGitHub {
owner = "HemantKArya";
repo = "BloomeeTunes";
rev = "v${version}+152";
hash = "sha256-Yv0aSq2eBcHKpy4PPjAhx194UW8Gm0UJlE+F+onZYFM=";
tag = "v${version}+157";
hash = "sha256-cLhcuk4rLHFg3al+MkZnOWMG8n6r61idBSmDyP6ez+g=";
};
pubspecLock = lib.importJSON ./pubspec.lock.json;
nativeBuildInputs = [
autoPatchelfHook
copyDesktopItems
];
desktopItems = [
(makeDesktopItem {
name = "bloomeetunes";
@@ -32,25 +36,20 @@ flutter324.buildFlutterApplication rec {
})
];
nativeBuildInputs = [
pkg-config
autoPatchelfHook
wrapGAppsHook3
copyDesktopItems
];
postInstall = ''
install -Dm644 ./assets/icons/bloomee_new_logo_c.png $out/share/pixmaps/bloomeetunes.png
install -Dm644 assets/icons/bloomee_new_logo_c.png $out/share/pixmaps/bloomeetunes.png
'';
extraWrapProgramArgs = ''
--prefix LD_LIBRARY_PATH : "$out/app/bloomeetunes/lib:${
--prefix LD_LIBRARY_PATH : $out/app/bloomeetunes/lib:${
lib.makeLibraryPath [
mpv
]
}"
}
'';
passthru.updateScript = ./update.sh;
meta = {
description = "Cross-platform music app designed to bring you ad-free tunes from various sources";
homepage = "https://github.com/HemantKArya/BloomeeTunes";
+40 -20
View File
@@ -54,31 +54,31 @@
"dependency": "direct main",
"description": {
"name": "audio_service",
"sha256": "9dd5ba7e77567b290c35908b1950d61485b4dfdd3a0ac398e98cfeec04651b75",
"sha256": "f6c8191bef6b843da34675dd0731ad11d06094c36b691ffcf3148a4feb2e585f",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.18.15"
"version": "0.18.16"
},
"audio_service_mpris": {
"dependency": "direct main",
"description": {
"name": "audio_service_mpris",
"sha256": "b16db3584a4b2464c0bfd575c1a21765723d257931222f8adfcb0511f940d352",
"sha256": "fdab1ae1f659c6db36d5cc396e46e4ee9663caefa6153f8453fcd01d57567c08",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.1.5"
"version": "0.2.0"
},
"audio_service_platform_interface": {
"dependency": "transitive",
"description": {
"name": "audio_service_platform_interface",
"sha256": "8431a455dac9916cc9ee6f7da5620a666436345c906ad2ebb7fa41d18b3c1bf4",
"sha256": "6283782851f6c8b501b60904a32fc7199dc631172da0629d7301e66f672ab777",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.1.1"
"version": "0.1.3"
},
"audio_service_web": {
"dependency": "transitive",
@@ -94,11 +94,11 @@
"dependency": "direct main",
"description": {
"name": "audio_session",
"sha256": "343e83bc7809fbda2591a49e525d6b63213ade10c76f15813be9aed6657b3261",
"sha256": "b2a26ba8b7efa1790d6460e82971fde3e398cfbe2295df9dea22f3499d2c12a7",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.1.21"
"version": "0.1.23"
},
"audio_video_progress_bar": {
"dependency": "direct main",
@@ -464,11 +464,11 @@
"dependency": "direct main",
"description": {
"name": "equatable",
"sha256": "c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2",
"sha256": "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.5"
"version": "2.0.7"
},
"extended_image": {
"dependency": "direct main",
@@ -882,21 +882,21 @@
"dependency": "direct main",
"description": {
"name": "just_audio",
"sha256": "d8e8aaf417d33e345299c17f6457f72bd4ba0c549dc34607abb5183a354edc4d",
"sha256": "1a1eb86e7d81e69a1d36943f2b3efd62dece3dad2cafd9ec2e62e6db7c04d9b7",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.9.40"
"version": "0.9.43"
},
"just_audio_media_kit": {
"dependency": "direct main",
"description": {
"name": "just_audio_media_kit",
"sha256": "7f57d317fafa04cb3e70b924e8f632ffb7eca7a97a369e1e44738ed89fbd5da1",
"sha256": "9f3517213dfc7bbaf6980656feb66c35600f114c7efc0b5b3f4476cd5c18b45e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.5"
"version": "2.0.6"
},
"just_audio_platform_interface": {
"dependency": "transitive",
@@ -922,11 +922,11 @@
"dependency": "direct main",
"description": {
"name": "just_audio_windows",
"sha256": "48ab2dec79cf6097550602fe07b1a644f341450e138dc8fdc23e42ce0ed2d928",
"sha256": "b1ba5305d841c0e3883644e20fc11aaa23f28cfdd43ec20236d1e119a402ef29",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.2.1"
"version": "0.2.2"
},
"leak_tracker": {
"dependency": "transitive",
@@ -968,6 +968,16 @@
"source": "hosted",
"version": "2.1.1"
},
"lists": {
"dependency": "transitive",
"description": {
"name": "lists",
"sha256": "4ca5c19ae4350de036a7e996cdd1ee39c93ac0a2b840f4915459b7d0a7d4ab27",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.0.1"
},
"logging": {
"dependency": "direct main",
"description": {
@@ -1012,11 +1022,11 @@
"dependency": "transitive",
"description": {
"name": "media_kit",
"sha256": "3289062540e3b8b9746e5c50d95bd78a9289826b7227e253dff806d002b9e67a",
"sha256": "1f1deee148533d75129a6f38251ff8388e33ee05fc2d20a6a80e57d6051b7b62",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.10+1"
"version": "1.1.11"
},
"media_kit_libs_linux": {
"dependency": "direct main",
@@ -1644,6 +1654,16 @@
"source": "hosted",
"version": "1.3.2"
},
"unicode": {
"dependency": "transitive",
"description": {
"name": "unicode",
"sha256": "0f69e46593d65245774d4f17125c6084d2c20b4e473a983f6e21b7d7762218f1",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.3.1"
},
"universal_platform": {
"dependency": "transitive",
"description": {
@@ -1898,11 +1918,11 @@
"dependency": "direct main",
"description": {
"name": "youtube_explode_dart",
"sha256": "28dca07fefb4b6518beab95f0c1ef81031f921ed0fe87ebcd9c51378546edfee",
"sha256": "51ca5b2c03bf56060143d4f87df90ec3227592d7ae8a8003532533ae019d4291",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.2.3"
"version": "2.3.6"
}
},
"sdks": {
+24
View File
@@ -0,0 +1,24 @@
#!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq yq nix bash coreutils common-updater-scripts
set -eou pipefail
ROOT="$(dirname "$(readlink -f "$0")")"
latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/HemantKArya/BloomeeTunes/releases/latest | jq --raw-output .tag_name)
latestVersion=$(echo "$latestTag" | sed 's/^v//' | grep -o '^[^+]*')
RunNumber=$(echo "$latestTag" | grep -o '[^+]*$')
currentVersion=$(nix-instantiate --eval -E "with import ./. {}; bloomeetunes.version or (lib.getVersion bloomeetunes)" | tr -d '"')
if [[ "$currentVersion" == "$latestVersion" ]]; then
echo "package is up-to-date: $currentVersion"
exit 0
fi
sed -i "s/\(tag = \"v\${version}+\)[0-9]\+/\1${RunNumber}/" "$ROOT/package.nix"
hash=$(nix hash convert --hash-algo sha256 --to sri $(nix-prefetch-url --unpack "https://github.com/HemantKArya/BloomeeTunes/archive/refs/tags/${latestTag}.tar.gz"))
update-source-version bloomeetunes $latestVersion $hash
curl https://raw.githubusercontent.com/HemantKArya/BloomeeTunes/${latestTag}/pubspec.lock | yq . >$ROOT/pubspec.lock.json
+4 -4
View File
@@ -11,7 +11,7 @@
stdenv.mkDerivation rec {
pname = "bloop";
version = "2.0.6";
version = "2.0.7";
platform =
if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then
@@ -42,11 +42,11 @@ stdenv.mkDerivation rec {
url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}";
sha256 =
if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then
"sha256-9AhQpaahhUvWVZBx2O6KsCON60EXC1bJlMxxgJj9oMA="
"sha256-ztQEzW8bGhTURPpZmYcax8Ms2HJ78XkgEfdFBUQ6rLQ="
else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then
"sha256-qu8Q7GqEkWCRHyslTCRPe5EdBH7GTXyonaXnJ6DYSlw="
"sha256-t/+TnMSkJCLYM0nqJVBzdpARqPHB3ojRQZ8iPp0EPlM="
else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then
"sha256-j4lM32BLF6aPH/7Y7H18HHmvprjKUqdmbqvdWXpD9uE="
"sha256-qnyZxE/Bt+tXz08N60BQaLn7zzGE5eV/5mJ/BHHE8nU="
else
throw "unsupported platform";
};
+17 -7
View File
@@ -35,13 +35,23 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-QWSlMDqfcccPSMA/9gvjQjG1aNk6mtXnmSjTTmqg6oo=";
};
patches = [
(fetchpatch {
name = "musl.patch";
url = "https://git.kernel.org/pub/scm/bluetooth/bluez.git/patch/?id=9d69dba21f1e46b34cdd8ae27fec11d0803907ee";
hash = "sha256-yMXPRPK8aT+luVoXNxx9zIa4c6E0BKYKS55DCfr8EQ0=";
})
];
patches =
[
(fetchpatch {
name = "musl.patch";
url = "https://git.kernel.org/pub/scm/bluetooth/bluez.git/patch/?id=9d69dba21f1e46b34cdd8ae27fec11d0803907ee";
hash = "sha256-yMXPRPK8aT+luVoXNxx9zIa4c6E0BKYKS55DCfr8EQ0=";
})
]
++ lib.optional (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_64)
# Disable one failing test with musl libc, also seen by alpine
# https://github.com/bluez/bluez/issues/726
(
fetchurl {
url = "https://git.alpinelinux.org/aports/plain/main/bluez/disable_aics_unit_testcases.patch?id=8e96f7faf01a45f0ad8449c1cd825db63a8dfd48";
hash = "sha256-1PJkipqBO3qxxOqRFQKfpWlne1kzTCgtnTFYI1cFQt4=";
}
);
buildInputs = [
alsa-lib
+2 -2
View File
@@ -8,11 +8,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "bundletool";
version = "1.17.2";
version = "1.18.0";
src = fetchurl {
url = "https://github.com/google/bundletool/releases/download/${finalAttrs.version}/bundletool-all-${finalAttrs.version}.jar";
sha256 = "sha256-LUrZCPrqZAR8HMnLdH5qpmfGqxkuCWB70WtnJGqM1q4=";
sha256 = "sha256-eDQ3ZNLnnI9VcQN4sEmB/LHkba6/w7XcV3d4CC5qmP0=";
};
dontUnpack = true;
+3 -3
View File
@@ -13,17 +13,17 @@
rustPlatform.buildRustPackage rec {
pname = "tauri";
version = "2.2.1";
version = "2.2.2";
src = fetchFromGitHub {
owner = "tauri-apps";
repo = "tauri";
tag = "tauri-v${version}";
hash = "sha256-v9o+oqs6OZWhHv+PExo9juzTt7W80YOTkynzwvxpHGM=";
hash = "sha256-agmY/39tkz71kCSksIyrbxDrvnOJpBSYCdygjd4rOBY=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-SmM3G0WpNcb+B5uo+2Nczg/Htx5eY5JnxF0Tkwz8k0M=";
cargoHash = "sha256-i4ACVFWVEs866kJHNE49fnFj87GZbJIg5p1J3eVLRwE=";
nativeBuildInputs = [ pkg-config ];
+3
View File
@@ -39,6 +39,9 @@ stdenv.mkDerivation (finalAttrs: {
autoconf
'';
# provide correct pcre2-config for cross
env.PCRE_CONFIG = lib.getExe' (lib.getDev pcre2) "pcre2-config";
meta = with lib; {
mainProgram = "ccze";
description = "Fast, modular log colorizer";
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "cirrus-cli";
version = "0.133.2";
version = "0.134.0";
src = fetchFromGitHub {
owner = "cirruslabs";
repo = "cirrus-cli";
rev = "v${version}";
hash = "sha256-TPrniVxGRgbbe9g+WUD3kvfT65t2Bop9G7ruiitZju8=";
hash = "sha256-f7EMIz2MR5LgW2chIkOyUx2BuC/EBJVR8AOl+ufHwu0=";
};
vendorHash = "sha256-+OMhaAGA+pmiDUyXDo9UfQ0SFEAN9zuNZjnLkgr7a+0=";
vendorHash = "sha256-FMUBwrY5PJLsd507340PC+f0f9PzPblFYpnNi6hiNeM=";
ldflags = [
"-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}"
+3 -3
View File
@@ -2,7 +2,7 @@
version,
src,
pname,
pnpm,
pnpm_9,
nodejs,
stdenv,
meta,
@@ -11,14 +11,14 @@
stdenv.mkDerivation {
inherit version src meta;
pname = "${pname}-webui";
pnpmDeps = pnpm.fetchDeps {
pnpmDeps = pnpm_9.fetchDeps {
inherit pname version src;
hash = npm-hash;
};
nativeBuildInputs = [
nodejs
pnpm.configHook
pnpm_9.configHook
];
postPatch = ''
+28 -8
View File
@@ -1,7 +1,9 @@
{
lib,
stdenvNoCC,
appimageTools,
fetchurl,
makeWrapper,
}:
let
pname = "clickup";
@@ -13,24 +15,42 @@ let
hash = "sha256-jAOYDX9j+ZTqWsSg0rEckKZnErgsIV6+CtUv3M3wNqM=";
};
appimage = appimageTools.wrapType2 {
inherit pname version src;
extraPkgs = pkgs: [ pkgs.xorg.libxkbfile ];
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };
in
appimageTools.wrapType2 {
inherit pname version src;
stdenvNoCC.mkDerivation {
inherit pname version;
extraPkgs = pkgs: [ pkgs.xorg.libxkbfile ];
src = appimage;
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
runHook preInstall
mkdir -p $out/
cp -r bin $out/bin
mkdir -p $out/share/${pname}
cp -r ${appimageContents}/locales $out/share/${pname}
cp -r ${appimageContents}/resources $out/share/${pname}
cp -r --no-preserve=mode ${appimageContents}/usr/share/icons $out/share/
find $out/share/icons -name desktop.png -execdir mv {} clickup.png \;
extraInstallCommands = ''
install -m 444 -D ${appimageContents}/desktop.desktop $out/share/applications/clickup.desktop
substituteInPlace $out/share/applications/clickup.desktop \
--replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=clickup' \
--replace-fail 'Icon=desktop' 'Icon=clickup'
for size in 16 32 64 128 256 512 1024; do
install -Dm444 ${appimageContents}/usr/share/icons/hicolor/''${size}x''${size}/apps/desktop.png \
-t $out/share/icons/hicolor/''${size}x''${size}/apps/clickup.png
done
wrapProgram $out/bin/${pname} \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}} --no-update"
runHook postInstall
'';
meta = {
@@ -7,16 +7,16 @@
}:
buildGoModule rec {
pname = "cloudflare-dynamic-dns";
version = "4.3.13";
version = "4.3.14";
src = fetchFromGitHub {
owner = "zebradil";
repo = "cloudflare-dynamic-dns";
tag = version;
hash = "sha256-MeVLDgr332B9KWvahlhRz7Yf3R/j2KwR9ROhU3eQnwA=";
hash = "sha256-inxDeATTu2nbKUQ1hUMuVE4Pnn9nY74HnjMg56n5tCg=";
};
vendorHash = "sha256-FzEPvLI6tvyQ/nMgCBXPc1RR8YwDU1cC5f/LSZfF3Bc=";
vendorHash = "sha256-i/hPoBurDv/ya7JCnpmx3NHVcNzakdM65DDueBr5Hh4=";
subPackages = ".";
+3 -3
View File
@@ -12,17 +12,17 @@
rustPlatform.buildRustPackage rec {
pname = "cosmic-bg";
version = "1.0.0-alpha.2";
version = "1.0.0-alpha.5.1";
src = fetchFromGitHub {
owner = "pop-os";
repo = pname;
rev = "epoch-${version}";
hash = "sha256-lAFAZBo5FnXgJV3MrZhaYmBxqtH1E7+Huj53ho/hPik=";
hash = "sha256-bmcMZIURozlptsR4si62NTmexqaCX1Yj5bYj49GDehQ=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-up3yNsKxTC9YrRuTPsGlCHTp9S/woDXPc5HcYcEY9Xc=";
cargoHash = "sha256-GLXooTjcGq4MsBNnlpHBBUJGNs5UjKMQJGJuj9UO2wk=";
postPatch = ''
substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"
+3 -3
View File
@@ -9,13 +9,13 @@
}:
stdenvNoCC.mkDerivation {
pname = "cosmic-icons";
version = "1.0.0-alpha.3";
version = "1.0.0-alpha.5.1";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-icons";
rev = "epoch-1.0.0-alpha.3";
hash = "sha256-7gWCRBiE+XJX1JSjopyPN4bIIgZih6ZKGVSA7wBq3i0=";
rev = "epoch-1.0.0-alpha.5.1";
hash = "sha256-j5H2+BOWxq2jShN15QCvj9rY6OK+vlUbyR9R07Ka2rA=";
};
nativeBuildInputs = [ just ];
+3 -3
View File
@@ -15,17 +15,17 @@
rustPlatform.buildRustPackage rec {
pname = "cosmic-launcher";
version = "1.0.0-alpha.4";
version = "1.0.0-alpha.5.1";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-launcher";
rev = "epoch-${version}";
hash = "sha256-rx2FrRSiW5UQLEUtNbQ5JEoTR9djQEtY3eOxR2IqkU4=";
hash = "sha256-0htDjdS8431orzNnetK0ubNvjO/5748YYqeESJKTUUs=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-gvrqomChaMv3u1pVUoGUkXw66Gr2wjkxNQIbrcbJrdY=";
cargoHash = "sha256-WW1o9MFxNd41ODS5p4piLQtpy277E5a/oN2yYdJc8y4=";
nativeBuildInputs = [
just
@@ -16,17 +16,17 @@
rustPlatform.buildRustPackage rec {
pname = "cosmic-notifications";
version = "1.0.0-alpha.2";
version = "1.0.0-alpha.5.1";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-notifications";
rev = "epoch-${version}";
hash = "sha256-tCizZePze94tbJbR91N9rfUhrLFTAMW2oL9ByKOeDAU=";
hash = "sha256-xUyBXHhpYgwr3A34oLF5l1xB8f++wtx0mTr2p8WX89o=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-36M7hDt8kd2Q94AR3IJhC2lKDLW2wRWWeqh3rEaRPTo=";
cargoHash = "sha256-froRGGsK5qoia5wHtxLhljKueMCYafhika9Drsp906E=";
postPatch = ''
substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"
+3 -3
View File
@@ -10,17 +10,17 @@
rustPlatform.buildRustPackage rec {
pname = "cosmic-randr";
version = "1.0.0-alpha.3";
version = "1.0.0-alpha.5.1";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-randr";
rev = "epoch-${version}";
hash = "sha256-xakK4APhlNKuWbCMP6nJXLyOaQ0hFCvzOht3P8CkV/0=";
hash = "sha256-mPi6TVUWKlHqLzGL84vSBZYuCjdThVVYc7hv9vq7zho=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-S5zvh/pJA3JMwQ3K5RPPHuHKLQA9g1Ae7NLWgy9b5FA=";
cargoHash = "sha256-3I4ZyZvV9ELBNCvYVYBUHbh9bGw7B/RrwUlam5fdLxU=";
nativeBuildInputs = [
just
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "cosmic-screenshot";
version = "1.0.0-alpha.2";
version = "1.0.0-alpha.5.1";
src = fetchFromGitHub {
owner = "pop-os";
repo = pname;
rev = "epoch-${version}";
hash = "sha256-+yHpRbK+AWnpcGrC5U0wKbt0u8tm3CFGjKTCDQpb3G0=";
hash = "sha256-/sGYF+XWmPraNGlBVUcN/nokDB9JwWViEAL9gVH3ZaI=";
};
cargoHash = "sha256-fzIVyxzNknEjGJoR9sgXkY+gyuTC0T4Sy513X8umbWA=";
cargoHash = "sha256-E03MeHSEjVAlKiqW7UQh0cZ5UHKfMtXVwUynpUHexbs=";
nativeBuildInputs = [
just
@@ -10,17 +10,17 @@
rustPlatform.buildRustPackage rec {
pname = "cosmic-settings-daemon";
version = "1.0.0-alpha.4";
version = "1.0.0-alpha.5.1";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-settings-daemon";
rev = "epoch-${version}";
hash = "sha256-wwrbZJ/FA6qjeo9M/gIlzVyygiLT3R5OTLhTwr/QSSw=";
hash = "sha256-MlBnwbszwJCa/FQNihSKsy7Bllw807C8qQL9ziYS3fE=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-zAVBkH6ADs8uXqHD1gHQJl1e5l+g6NdnhEJa5fSvHDE=";
cargoHash = "sha256-ianyD+ws/t2Qg+UG3eGE1WP2dHS2iWdCTolk/ZH/Ddg=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [
+18 -10
View File
@@ -5,30 +5,38 @@
}:
python3Packages.buildPythonApplication rec {
pname = "cruft";
version = "2.15.0";
version = "2.16.0";
pyproject = true;
src = fetchFromGitHub {
owner = "cruft";
repo = "cruft";
rev = version;
hash = "sha256-qIVyNMoI3LsoOV/6XPa60Y1vTRvkezesF7wF9WVSLGk=";
tag = version;
hash = "sha256-hUucSfgDBlT5jVk/oF8JjbcYhjHgkprfGRwsSNfgjfg=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail 'version = "0.0.0"' 'version = "${version}"'
'';
build-system = with python3Packages; [
poetry-core
hatchling
];
nativeCheckInputs = with python3Packages; [
pytest7CheckHook
];
dependencies = with python3Packages; [
click
cookiecutter
gitpython
typer
];
dependencies =
with python3Packages;
[
click
cookiecutter
gitpython
typer
]
++ lib.optional (pythonOlder "3.11") python3Packages.toml;
pythonImportsCheck = "cruft";
+3 -3
View File
@@ -1,5 +1,5 @@
{
pnpm,
pnpm_9,
nodejs,
stdenv,
clang,
@@ -22,14 +22,14 @@ let
web = stdenv.mkDerivation {
inherit pname version src;
pnpmDeps = pnpm.fetchDeps {
pnpmDeps = pnpm_9.fetchDeps {
inherit pname version src;
hash = "sha256-vqkiZzd5WOeJem0zUyMsJd6/aHHAjlsIQMkNf+SUvHY=";
};
nativeBuildInputs = [
nodejs
pnpm.configHook
pnpm_9.configHook
];
buildPhase = ''
+2 -2
View File
@@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "delly";
version = "1.3.2";
version = "1.3.3";
src = fetchFromGitHub {
owner = "dellytools";
repo = "delly";
rev = "v${finalAttrs.version}";
hash = "sha256-nMMEQwsaRidv5MMbGF2s1wuRQX2COvWsJA67N8HiCZA=";
hash = "sha256-e1dGiJeOLMFJ9oO7iMvKZHpg4XtrLJBpy8lECx5/iDE=";
};
postPatch = lib.optionalString stdenv.cc.isClang ''
+2 -2
View File
@@ -25,14 +25,14 @@ let
in
buildPythonApplication rec {
pname = "devede";
version = "4.17.0";
version = "4.19.0";
namePrefix = "";
src = fetchFromGitLab {
owner = "rastersoft";
repo = "devedeng";
rev = version;
hash = "sha256-CdntdD5DRA/eXTBRBRszkbYFeFxj+0odb8XHkAFdobU=";
hash = "sha256-hjt2bXQov4lC6O4VY/eu/PZ2taSKng9gRhFDFhQR9SY=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "dumbpipe";
version = "0.22.0";
version = "0.23.0";
src = fetchFromGitHub {
owner = "n0-computer";
repo = pname;
rev = "v${version}";
hash = "sha256-NNSR8qAikwXC0bJ4jGQQ2gZZmgPin5M6xAaY2YhuBvw=";
hash = "sha256-ZIPvdlE/oBmtdTpWm5GU53wGGYWCc74a9w5Kqpi8tBg=";
};
cargoHash = "sha256-yAz/VjdS4FeKKM9vjOPcASGByNQp2StvrFHwJnk2YUg=";
cargoHash = "sha256-pyVmBGqdWrZ+4Ycg0Cf6sMC6mzPA6/pHMn49/OPYZ/Y=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
with darwin.apple_sdk.frameworks;
+3 -3
View File
@@ -6,16 +6,16 @@
buildNpmPackage rec {
pname = "eask-cli";
version = "0.10.2";
version = "0.10.3";
src = fetchFromGitHub {
owner = "emacs-eask";
repo = "cli";
rev = version;
hash = "sha256-G6bJoNKEz0Lpp3vfJJ86r942dWdMhQLJn10YXjUKJtI=";
hash = "sha256-PDWPamX3Jp28VLvyx5ZXtQ8sNTlYcwP3TlVPOgwnek8=";
};
npmDepsHash = "sha256-xZBnjhLHceLvYD9uPz5G9EupBBUAkBghxo5au0GxdWg=";
npmDepsHash = "sha256-1VWTL4BzvSHmVIyteHkjVqLPtbrhD2MMg/I+4mnPBIw=";
dontBuild = true;
+9
View File
@@ -19,6 +19,7 @@
gawk,
fetchFromGitHub,
fetchgit,
fetchpatch2,
beamPackages,
nixosTests,
withMysql ? false,
@@ -172,6 +173,14 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-9TyIgsinUpUbirwqg61EYnPB/OyE5vhl3MBMRihqAtE=";
};
patches = [
# Fix json_encode_with_kv_list used in mod_matrix_gw
(fetchpatch2 {
url = "https://github.com/processone/ejabberd/commit/056635119c8b9f169f1c59cccbf81faab88a6712.patch?full_index=1";
hash = "sha256-53NMT/SwPtaeo8zaJ1JHW6HUZrxkITi731UOdsFAlJ4=";
})
];
passthru.tests = {
inherit (nixosTests) ejabberd;
};
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "extism-cli";
version = "1.6.1";
version = "1.6.2";
src = fetchFromGitHub {
owner = "extism";
repo = "cli";
tag = "v${version}";
hash = "sha256-txwpFc1FQlZLAxbpO92Ei7z3vhXBrpdIJHAqnrKp9Bg=";
hash = "sha256-VxQ8qj/prGecssbggSKhj0vkZ75/GD73u/g21hUVkSs=";
};
vendorHash = "sha256-51/fzq2j55GHmEx2twb0DSi0AmBS4DbViZzo1c5Xn1M=";
+3 -3
View File
@@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec {
pname = "eza";
version = "0.20.16";
version = "0.20.17";
src = fetchFromGitHub {
owner = "eza-community";
repo = "eza";
rev = "v${version}";
hash = "sha256-0Fh12LuCPTK9vVmrR0pV0z8rs0XMJN9hJg026bSR6Z8=";
hash = "sha256-X3/qW8BFa6Muk4XzTO6z6SDP07NHh7MOkngHNgw/sUA=";
};
cargoHash = "sha256-dEXY33dv700M066LB46/wFeaB9wZvpPuq1M4XjneLks=";
cargoHash = "sha256-q48LhGwi6WnzV2JLYhwbr7GtHNH6kMglntZK+sFf5zo=";
nativeBuildInputs = [
cmake
+32 -26
View File
@@ -2,59 +2,65 @@
lib,
stdenv,
fetchFromGitHub,
makeRustPlatform,
rustc,
cargo,
llvmPackages,
cmake,
gcc,
# gcc compile error at deps: aws-lc-sys, function 'memcpy' inlined from 'OPENSSL_memcpy'
# error: '__builtin_memcpy' specified bound exceeds maximum object size
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91397
useRustPlatform ? makeRustPlatform {
inherit rustc cargo;
inherit (llvmPackages) stdenv;
},
rust-bindgen,
rustPlatform,
}:
useRustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage rec {
pname = "firecracker";
version = "1.9.1";
version = "1.10.1";
src = fetchFromGitHub {
owner = "firecracker-microvm";
repo = "firecracker";
rev = "v${version}";
hash = "sha256-NgT06Xfb6j+d5EcqFjQeaiY08uJJjmrddzdwSoqpKbQ=";
hash = "sha256-kLQPAHbj8Q425Z5zdwofyHz+sd3bf7zGmcMjKn9yTKc=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"micro_http-0.1.0" = "sha256-bso39jUUyhlNutUxHw8uHtKWQIHmoikfQ5O3RIePboo=";
};
};
useFetchCargoVendor = true;
cargoHash = "sha256-TnEPNTeeX1KP+9HLD/oGF0sZGcXDHpc1Q1wCWw3L6mU=";
# For aws-lc-sys@0.22.0: use external bindgen.
AWS_LC_SYS_EXTERNAL_BINDGEN = "true";
# For aws-lc-sys@0.22.0: fix gcc error:
# In function 'memcpy',
# inlined from 'OPENSSL_memcpy' at aws-lc/crypto/asn1/../internal.h
# inlined from 'aws_lc_0_22_0_i2c_ASN1_BIT_STRING' at aws-lc/crypto/asn1/a_bitstr.c
# glibc/.../string_fortified.h: error: '__builtin_memcpy' specified bound exceeds maximum object size [-Werror=stringop-overflow=]
postPatch = ''
substituteInPlace $cargoDepsCopy/aws-lc-sys-*/aws-lc/crypto/asn1/a_bitstr.c \
--replace-warn '(len > INT_MAX - 1)' '(len < 0 || len > INT_MAX - 1)'
'';
nativeBuildInputs = [
cmake
gcc
useRustPlatform.bindgenHook
rust-bindgen # for aws-lc-sys@0.22.0
rustPlatform.bindgenHook
];
cargoBuildFlags = [ "--workspace" ];
cargoTestFlags = [ "--package" "firecracker" "--package" "jailer" ];
checkFlags = [
# requires /sys/devices/virtual/dmi
# basic tests to skip in sandbox
"--skip=fingerprint::dump::tests::test_read_valid_sysfs_file"
# requires /dev/kvm
"--skip=template::dump::tests::test_dump"
"--skip=tests::test_filter_apply"
"--skip=tests::test_fingerprint_dump_command"
"--skip=tests::test_template_dump_command"
"--skip=tests::test_template_verify_command"
"--skip=utils::tests::test_build_microvm"
# requires seccomp == 0
"--skip=tests::test_filter_apply"
# more tests to skip in sandbox
"--skip=env::tests::test_copy_cache_info"
"--skip=env::tests::test_dup2"
"--skip=env::tests::test_mknod_and_own_dev"
"--skip=env::tests::test_setup_jailed_folder"
"--skip=env::tests::test_userfaultfd_dev"
"--skip=resource_limits::tests::test_set_resource_limits"
];
installPhase = ''
+3 -3
View File
@@ -2,7 +2,7 @@
, buildNpmPackage
, fetchFromGitHub
, nixosTests
, pnpm
, pnpm_9
, nix-update-script
}:
@@ -17,9 +17,9 @@ buildNpmPackage rec {
hash = "sha256-lm+vPo7V99OSUAVEvdiTNMlD/+iHGPIyPLc1WzO1aTU=";
};
npmConfigHook = pnpm.configHook;
npmConfigHook = pnpm_9.configHook;
npmDeps = pnpmDeps;
pnpmDeps = pnpm.fetchDeps {
pnpmDeps = pnpm_9.fetchDeps {
inherit pname version src;
hash = "sha256-NuU9O3bEboxmuEuk1WSUeZRNgVK5cwFiUAN3+7vACGw=";
};
+3 -3
View File
@@ -6,7 +6,7 @@
makeDesktopItem,
makeWrapper,
nodejs,
pnpm,
pnpm_9,
stdenv,
}:
stdenv.mkDerivation rec {
@@ -23,12 +23,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
nodejs
pnpm.configHook
pnpm_9.configHook
makeWrapper
imagemagick
];
pnpmDeps = pnpm.fetchDeps {
pnpmDeps = pnpm_9.fetchDeps {
inherit pname version src;
hash = "sha256-FzMjN0rIjYxexf6tix4qi3mnuPkadjKihhN0Pj5y2nU=";
};
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "frei";
version = "0.1.0";
version = "0.1.1";
src = fetchFromGitHub {
owner = "alexcoder04";
repo = "frei";
rev = "v${version}";
sha256 = "sha256-9CV6B7fRHXl73uI2JRv3RiaFczLHHBOd7/8UoCAwK6w=";
sha256 = "sha256-289idsn/PhLK2FOUTQj6eS4O73LgX5v5qn3ZRvn/XRo=";
};
vendorHash = null;
vendorHash = "sha256-N5k/2wB46oRfM4ShjVQ23tAgCMmyBaGfIslUqYUJYrc=";
meta = with lib; {
description = "Modern replacement for free";
+3 -3
View File
@@ -5,7 +5,7 @@
makeWrapper,
gdal,
geos,
pnpm,
pnpm_9,
nodejs,
postgresql,
postgresqlTestHook,
@@ -42,7 +42,7 @@ python.pkgs.buildPythonApplication rec {
nativeBuildInputs = [
makeWrapper
nodejs
pnpm.configHook
pnpm_9.configHook
];
dependencies = with python.pkgs; [
@@ -99,7 +99,7 @@ python.pkgs.buildPythonApplication rec {
websockets
];
pnpmDeps = pnpm.fetchDeps {
pnpmDeps = pnpm_9.fetchDeps {
inherit pname version src;
hash = "sha256-DMoaXNm5S64XBERHFnFM6IKBkzXRGDEYWSTruccK9Hc=";
};
+2 -2
View File
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "geonkick";
version = "3.5.0";
version = "3.5.1";
src = fetchFromGitLab {
owner = "Geonkick-Synthesizer";
repo = pname;
rev = "v${version}";
hash = "sha256-bqdqAr4NX5WZ6zp0Kq7GFHiy/JkBvDvzuZz7jxtru0Q=";
hash = "sha256-4nJ4yn64C44ExduPX2Iypf9Rw9MlAXFkmX5KZxySPSs=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -2,7 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
pnpm,
pnpm_9,
nodejs,
electron,
makeDesktopItem,
@@ -25,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
nodejs
pnpm.configHook
pnpm_9.configHook
copyDesktopItems
imagemagick
makeWrapper
];
pnpmDeps = pnpm.fetchDeps {
pnpmDeps = pnpm_9.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-I78AvOBdDd59eVJJ51xxNwVvMnNvLdJJpFEtE/I1H8U=";
};
+2 -2
View File
@@ -10,13 +10,13 @@
buildGoModule rec {
pname = "gitleaks";
version = "8.23.0";
version = "8.23.1";
src = fetchFromGitHub {
owner = "zricethezav";
repo = "gitleaks";
tag = "v${version}";
hash = "sha256-+9aZXjinvDYbPw+yjkQ/BH3LB0xbY1eual/zKoWMlJc=";
hash = "sha256-gz/2DwkvSY6vOKW1ttJcLjjtii0jWIdQC1/xzU5vCRA=";
};
vendorHash = "sha256-hq3v//fhCUOvKPBZ/+YrLIc4nDLxR9Yc+MeIXY7TArA=";
@@ -34,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
gettext
glib # glib-compile-resources
itstool
pkg-config
libxml2
@@ -32,7 +32,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-online-accounts";
version = "3.52.2";
version = "3.52.3.1";
outputs =
[
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz";
hash = "sha256-+0E/SN7vu5/DACqRV53ulHzu7UH0nC9RMXr3SJtnb2c=";
hash = "sha256-Se1yfW/ElHSZb6ft8JGbIeT8hW6jfm4w8XtQsQOvlwE=";
};
mesonFlags = [
@@ -2,6 +2,7 @@
stdenv,
lib,
substituteAll,
buildPackages,
fetchurl,
meson,
ninja,
@@ -59,12 +60,18 @@ stdenv.mkDerivation (finalAttrs: {
})
];
depsBuildBuild = [
buildPackages.stdenv.cc
pkg-config
];
nativeBuildInputs = [
meson
ninja
pkg-config
perl
gettext
glib
libxml2
libxslt
docbook_xsl
@@ -14,13 +14,13 @@ in
buildGoModule rec {
pname = "go-containerregistry";
version = "0.20.2";
version = "0.20.3";
src = fetchFromGitHub {
owner = "google";
repo = pname;
rev = "v${version}";
sha256 = "sha256-5f5zheFPSKmpUaVmcAfeZgFSDu3rvdtQh8mau9jdqz4=";
sha256 = "sha256-HiksVzVuY4uub7Lwfyh3GN8wpH2MgIjKSO4mQJZeNvs=";
};
vendorHash = null;
+2 -2
View File
@@ -2,7 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
pnpm,
pnpm_9,
nodejs_22,
nix-update-script,
electron,
@@ -14,7 +14,7 @@
}:
let
pnpm' = pnpm.override { nodejs = nodejs_22; };
pnpm' = pnpm_9.override { nodejs = nodejs_22; };
in
stdenv.mkDerivation (finalAttrs: {
pname = "goofcord";
@@ -6,20 +6,21 @@
installShellFiles,
iputils,
versionCheckHook,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
pname = "gping";
version = "1.18.0";
version = "1.19.0";
src = fetchFromGitHub {
owner = "orf";
repo = "gping";
rev = "gping-v${version}";
hash = "sha256-JZMgbCwEGfngCQVmuZX1tu3he/f/TBLitcP/Ea3S6yI=";
tag = "gping-v${version}";
hash = "sha256-RTjYgsi3PmmPufdTcxZr+Laipa32Kkq1M1eHSAJVWZQ=";
};
cargoHash = "sha256-I9rcC2sotrdHMCCiDgfycKRnJxZLuA5OLZPZC0zFiLc=";
cargoHash = "sha256-c1GCF7Nztv7EpnPGPMRKdAQmeauy6OfI97e0nZWXe7E=";
nativeBuildInputs = [ installShellFiles ];
@@ -29,18 +30,27 @@ rustPlatform.buildRustPackage rec {
installManPage gping.1
'';
# Requires internet access
checkFlags = [
"--skip=test::tests::test_integration_any"
"--skip=test::tests::test_integration_ip6"
"--skip=test::tests::test_integration_ipv4"
];
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = [ "--version" ];
meta = with lib; {
passthru.updateScript = nix-update-script { };
meta = {
description = "Ping, but with a graph";
homepage = "https://github.com/orf/gping";
changelog = "https://github.com/orf/gping/releases/tag/gping-v${version}";
license = licenses.mit;
maintainers = with maintainers; [ cafkafk ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ cafkafk ];
mainProgram = "gping";
};
}
+47
View File
@@ -0,0 +1,47 @@
{
lib,
fetchFromGitHub,
buildGoModule,
versionCheckHook,
}:
let
version = "0.17.63";
in
buildGoModule {
pname = "gqlgen";
inherit version;
src = fetchFromGitHub {
owner = "99designs";
repo = "gqlgen";
tag = "v${version}";
hash = "sha256-J9+pleHdbQMHP/Aq9Pl6ise6PDvRqxQ72Iq7SNxgMws=";
};
vendorHash = "sha256-hPUWYOfCx+kW2dJsjkCE/7bwofnGdQbDTvfZ877/pCk=";
subPackages = [ "." ];
env.CGO_ENABLED = 0;
checkFlags = [
"-skip=^TestGenerate$" # skip tests that want to run `go mod tidy`
];
nativeInstallCheckInputs = [
versionCheckHook
];
doInstallCheck = true;
versionCheckProgramArg = "version";
meta = {
homepage = "https://github.com/99designs/gqlgen";
changelog = "https://github.com/99designs/gqlgen/releases/tag/v${version}";
description = "go generate based graphql server library";
license = lib.licenses.mit;
mainProgram = "gqlgen";
maintainers = with lib.maintainers; [ skowalak ];
};
}
+3 -3
View File
@@ -1,7 +1,7 @@
{
stdenv,
nodejs,
pnpm,
pnpm_9,
fetchFromGitHub,
buildGoModule,
lib,
@@ -30,10 +30,10 @@ let
nativeBuildInputs = [
nodejs
pnpm.configHook
pnpm_9.configHook
];
pnpmDeps = pnpm.fetchDeps {
pnpmDeps = pnpm_9.fetchDeps {
inherit (finalAttrs) pname version src;
sourceRoot = "${finalAttrs.src.name}/frontend";
hash = "sha256-mG8b16PP876EyaX3Sc4WM41Yc/oDGZDiilZPaxPvvuQ=";

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