mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-13 21:50:33 +03:00
Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
GitHub
commit
c25ea8ef9b
35 changed files with 828 additions and 759 deletions
|
|
@ -11,7 +11,7 @@ fi
|
|||
# Make sure we are inside the nixpkgs repo, even when called from outside
|
||||
cd "$(dirname "${BASH_SOURCE[0]}")"
|
||||
|
||||
PICKABLE_BRANCHES="master release-??.?? staging-??.?? haskell-updates python-updates"
|
||||
PICKABLE_BRANCHES="master staging release-??.?? staging-??.?? haskell-updates python-updates staging-next staging-next-??.??"
|
||||
problem=0
|
||||
|
||||
# Not everyone calls their remote "origin"
|
||||
|
|
|
|||
|
|
@ -4,7 +4,9 @@ The best way to keep your NixOS installation up to date is to use one of
|
|||
the NixOS *channels*. A channel is a Nix mechanism for distributing Nix
|
||||
expressions and associated binaries. The NixOS channels are updated
|
||||
automatically from NixOS's Git repository after certain tests have
|
||||
passed and all packages have been built. These channels are:
|
||||
passed and a selection of packages has been built successfully
|
||||
(see `nixos/release-combined.nix` and `nixos/release-small.nix`).
|
||||
These channels are:
|
||||
|
||||
- *Stable channels*, such as [`nixos-25.05`](https://channels.nixos.org/nixos-25.05).
|
||||
These only get conservative bug fixes and package upgrades. For
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ let
|
|||
"zstd" = "zstd --no-progress --threads=$NIX_BUILD_CORES -${toString compression.level}";
|
||||
"xz" = "xz --keep --verbose --threads=$NIX_BUILD_CORES -${toString compression.level}";
|
||||
"zstd-seekable" =
|
||||
"zeekstd --quiet --max-frame-size 2M --compression-level ${toString compression.level}";
|
||||
"zeekstd --no-progress --frame-size 2M --compression-level ${toString compression.level}";
|
||||
}
|
||||
."${compression.algorithm}";
|
||||
in
|
||||
|
|
|
|||
|
|
@ -124,7 +124,7 @@ in
|
|||
};
|
||||
|
||||
"${cfg.dataDir}/.config/oxidized/config" = {
|
||||
L = {
|
||||
"L+" = {
|
||||
argument = "${cfg.configFile}";
|
||||
user = cfg.user;
|
||||
group = cfg.group;
|
||||
|
|
@ -134,7 +134,7 @@ in
|
|||
}
|
||||
// lib.optionalAttrs (cfg.routerDB != null) {
|
||||
"${cfg.dataDir}/.config/oxidized/router.db" = {
|
||||
L = {
|
||||
"L+" = {
|
||||
argument = "${cfg.routerDB}";
|
||||
user = cfg.user;
|
||||
group = cfg.group;
|
||||
|
|
|
|||
|
|
@ -392,7 +392,7 @@ mountFS() {
|
|||
# Filter out x- options, which busybox doesn't do yet.
|
||||
local optionsFiltered="$(IFS=,; for i in $options; do if [ "${i:0:2}" != "x-" ]; then echo -n $i,; fi; done)"
|
||||
# Prefix (lower|upper|work)dir with /mnt-root (overlayfs)
|
||||
local optionsPrefixed="$( echo "$optionsFiltered" | sed -E 's#\<(lowerdir|upperdir|workdir)=#\1=/mnt-root#g' )"
|
||||
local optionsPrefixed="$( echo "${optionsFiltered%,}" | sed -E 's#\<(lowerdir|upperdir|workdir)=#\1=/mnt-root#g' )"
|
||||
|
||||
echo "$device /mnt-root$mountPoint $fsType $optionsPrefixed" >> /etc/fstab
|
||||
|
||||
|
|
@ -423,8 +423,16 @@ mountFS() {
|
|||
|
||||
# For bind mounts, busybox has a tendency to ignore options, which can be a
|
||||
# security issue (e.g. "nosuid"). Remounting the partition seems to fix the
|
||||
# issue.
|
||||
mount "/mnt-root$mountPoint" -o "remount,$optionsPrefixed"
|
||||
# issue. This should only be done for bind and rbind mountpoints because other
|
||||
# filesystems may have limitations or may not support remount.
|
||||
local IFS=,
|
||||
for opt in $options; do
|
||||
if [[ "$opt" = bind || "$opt" = rbind ]]; then
|
||||
mount "/mnt-root$mountPoint" -o "remount,$optionsPrefixed"
|
||||
break
|
||||
fi
|
||||
done
|
||||
unset IFS
|
||||
|
||||
[ "$mountPoint" == "/" ] &&
|
||||
[ -f "/mnt-root/etc/NIXOS_LUSTRATE" ] &&
|
||||
|
|
|
|||
|
|
@ -10,9 +10,17 @@ in
|
|||
k900
|
||||
];
|
||||
|
||||
node.pkgsReadOnly = false;
|
||||
|
||||
nodes.machine =
|
||||
{ pkgs, ... }:
|
||||
{ ... }:
|
||||
{
|
||||
nixpkgs.config.allowUnfreePredicate =
|
||||
pkg:
|
||||
builtins.elem (lib.getName pkg) [
|
||||
"n8n"
|
||||
];
|
||||
|
||||
services.n8n = {
|
||||
enable = true;
|
||||
webhookUrl = webhookUrl;
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -231,15 +231,26 @@
|
|||
};
|
||||
c = buildGrammar {
|
||||
language = "c";
|
||||
version = "0.0.0+rev=2a265d6";
|
||||
version = "0.0.0+rev=0910937";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-c";
|
||||
rev = "2a265d69a4caf57108a73ad2ed1e6922dd2f998c";
|
||||
hash = "sha256-6sebiNg9P/B/5HrbGO7bl3GHVMfVUepetJuszEeTh+8=";
|
||||
rev = "091093731389448e10822dd140621cfec1ff96b2";
|
||||
hash = "sha256-VKbmi5UjwkK1sME11x97lAvLvliDK4Wc/1V0hkQZDS0=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-c";
|
||||
};
|
||||
c3 = buildGrammar {
|
||||
language = "c3";
|
||||
version = "0.0.0+rev=dce56cc";
|
||||
src = fetchFromGitHub {
|
||||
owner = "c3lang";
|
||||
repo = "tree-sitter-c3";
|
||||
rev = "dce56ccc5d2731ac14a0f6bb3fd1666d994b2a25";
|
||||
hash = "sha256-EWM787+zcaEULu2fnt/fmATSmBhVU/zp9vxI4xdcXEI=";
|
||||
};
|
||||
meta.homepage = "https://github.com/c3lang/tree-sitter-c3";
|
||||
};
|
||||
c_sharp = buildGrammar {
|
||||
language = "c_sharp";
|
||||
version = "0.0.0+rev=b5eb574";
|
||||
|
|
@ -319,12 +330,12 @@
|
|||
};
|
||||
cmake = buildGrammar {
|
||||
language = "cmake";
|
||||
version = "0.0.0+rev=c2fdefa";
|
||||
version = "0.0.0+rev=cf97996";
|
||||
src = fetchFromGitHub {
|
||||
owner = "uyha";
|
||||
repo = "tree-sitter-cmake";
|
||||
rev = "c2fdefaf7ae3b7c5cf11705fe63c516b1c490590";
|
||||
hash = "sha256-053MSoEeeSPOVKWR96tZnZjXbR+597ZoqE8ai9CEWKc=";
|
||||
rev = "cf9799600b2ba5e6620fdabddec3b2db8306bc46";
|
||||
hash = "sha256-OxViW7H5fNc5BP072ob7GGgx1EYc6TiQEut0wHGrE1c=";
|
||||
};
|
||||
meta.homepage = "https://github.com/uyha/tree-sitter-cmake";
|
||||
};
|
||||
|
|
@ -474,12 +485,12 @@
|
|||
};
|
||||
desktop = buildGrammar {
|
||||
language = "desktop";
|
||||
version = "0.0.0+rev=6d66eea";
|
||||
version = "0.0.0+rev=afec309";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ValdezFOmar";
|
||||
repo = "tree-sitter-desktop";
|
||||
rev = "6d66eea37afa1d6bc1e25ef457113743df42416d";
|
||||
hash = "sha256-vaWcgt4bwO1PCG0BJrp6oSY6DEWfMiuWtOPUwKvzmPg=";
|
||||
rev = "afec3093f6102b83a72aece728c53d17d3fcb2d4";
|
||||
hash = "sha256-71ovOHHxER2R8d8Vkgk+PlOO9GbtlRJApcet0FSfJKg=";
|
||||
};
|
||||
meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-desktop";
|
||||
};
|
||||
|
|
@ -573,12 +584,12 @@
|
|||
};
|
||||
dtd = buildGrammar {
|
||||
language = "dtd";
|
||||
version = "0.0.0+rev=0d9a809";
|
||||
version = "0.0.0+rev=291b020";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter-grammars";
|
||||
repo = "tree-sitter-xml";
|
||||
rev = "0d9a8099c963ed53e183425c1b47fa2622c8eaf7";
|
||||
hash = "sha256-0kqCDLCxsvrqu5pKrDZDJt9lSlxU6fzM/CxrWb/oodw=";
|
||||
rev = "291b02018c525abe70fec41559cfe8f2f1cc84b2";
|
||||
hash = "sha256-UxFI86fbhuij+QTex4l139PPMMgAha7rZcBlHSRPJYI=";
|
||||
};
|
||||
location = "dtd";
|
||||
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml";
|
||||
|
|
@ -608,12 +619,12 @@
|
|||
};
|
||||
editorconfig = buildGrammar {
|
||||
language = "editorconfig";
|
||||
version = "0.0.0+rev=3f2b371";
|
||||
version = "0.0.0+rev=65de8da";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ValdezFOmar";
|
||||
repo = "tree-sitter-editorconfig";
|
||||
rev = "3f2b371537355f6e53cc3af37f79ba450efb5132";
|
||||
hash = "sha256-z5pTG7EbmEZV+5RtXI8jGxxb0ifb67EJXquWQ0IA1a8=";
|
||||
rev = "65de8da4ff21a8be40adb5dadcd7a0f39d2f0747";
|
||||
hash = "sha256-nxDl0/2zsTL7ae1L+NvMn2QoaaJa0YTk7BP8bHnkAUA=";
|
||||
};
|
||||
meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-editorconfig";
|
||||
};
|
||||
|
|
@ -884,12 +895,12 @@
|
|||
};
|
||||
gdscript = buildGrammar {
|
||||
language = "gdscript";
|
||||
version = "0.0.0+rev=48b4933";
|
||||
version = "0.0.0+rev=e964ce9";
|
||||
src = fetchFromGitHub {
|
||||
owner = "PrestonKnopp";
|
||||
repo = "tree-sitter-gdscript";
|
||||
rev = "48b49330888a4669b48619b211cc8da573827725";
|
||||
hash = "sha256-mGmrCK3nGSzi/66mOxvpRyTA9b74aTMSoIISqzj+l90=";
|
||||
rev = "e964ce912b5b835f1caedb600df9d5be77e803a8";
|
||||
hash = "sha256-nLe5AY3my4fjez6EFRL8l3JFJWJWoq3jWUn0Apq/Lac=";
|
||||
};
|
||||
meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-gdscript";
|
||||
};
|
||||
|
|
@ -1424,12 +1435,12 @@
|
|||
};
|
||||
janet_simple = buildGrammar {
|
||||
language = "janet_simple";
|
||||
version = "0.0.0+rev=b08b402";
|
||||
version = "0.0.0+rev=7e28cbf";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sogaiu";
|
||||
repo = "tree-sitter-janet-simple";
|
||||
rev = "b08b402207fba0037d5152ce7c521351147f4388";
|
||||
hash = "sha256-9mNMur8oPdCCh5/gn5GLR9HFVM/phOOX2+b5EpI4Ey8=";
|
||||
rev = "7e28cbf1ca061887ea43591a2898001f4245fddf";
|
||||
hash = "sha256-qWsUPZfQkuEUiuCSsqs92MIMEvdD+q2bwKir3oE5thc=";
|
||||
};
|
||||
meta.homepage = "https://github.com/sogaiu/tree-sitter-janet-simple";
|
||||
};
|
||||
|
|
@ -1558,12 +1569,12 @@
|
|||
};
|
||||
julia = buildGrammar {
|
||||
language = "julia";
|
||||
version = "0.0.0+rev=12a3aed";
|
||||
version = "0.0.0+rev=18b739c";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-julia";
|
||||
rev = "12a3aede757bc7fbdfb1909507c7a6fddd31df37";
|
||||
hash = "sha256-527US8LI8ZItb/O0em47+v4HnYnhJd48KBAWpasD62E=";
|
||||
rev = "18b739c1563c83fc816170a4241adfa4b69e5c47";
|
||||
hash = "sha256-DLzbu/r+CNQinHDoy4IihHHbr/j+WDMfimn03gWNO5s=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia";
|
||||
};
|
||||
|
|
@ -1702,12 +1713,12 @@
|
|||
};
|
||||
liquid = buildGrammar {
|
||||
language = "liquid";
|
||||
version = "0.0.0+rev=d269f4d";
|
||||
version = "0.0.0+rev=d6ebde3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hankthetank27";
|
||||
repo = "tree-sitter-liquid";
|
||||
rev = "d269f4d52cd08f6cbc6636ee23cc30a9f6c32e42";
|
||||
hash = "sha256-vOQirMsR+UqUyC7yJfuFynXEorkkUYjAB4C08Wf+zE4=";
|
||||
rev = "d6ebde3974742cd1b61b55d1d94aab1dacb41056";
|
||||
hash = "sha256-rcRbo6iyO2uC2OS0dR20xJlDlBdCoyIUc9nEv0KPWxI=";
|
||||
};
|
||||
meta.homepage = "https://github.com/hankthetank27/tree-sitter-liquid";
|
||||
};
|
||||
|
|
@ -1869,12 +1880,12 @@
|
|||
};
|
||||
mlir = buildGrammar {
|
||||
language = "mlir";
|
||||
version = "0.0.0+rev=3b2ae4c";
|
||||
version = "0.0.0+rev=4d2396f";
|
||||
src = fetchFromGitHub {
|
||||
owner = "artagnon";
|
||||
repo = "tree-sitter-mlir";
|
||||
rev = "3b2ae4ce9a8abca997ed3b34625d462248d1bbac";
|
||||
hash = "sha256-js25s2JqvhQgbHzFJquBYv1+WRDgUCNby/PMn5CzwBA=";
|
||||
rev = "4d2396f21722d0c8d2ea285f380b21f1a71668b3";
|
||||
hash = "sha256-zYT9C6NXJqlOiv2JZLTfu4Vv4tmwA1SaKWKRFobrJKc=";
|
||||
};
|
||||
generate = true;
|
||||
meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
|
||||
|
|
@ -2093,12 +2104,12 @@
|
|||
};
|
||||
perl = buildGrammar {
|
||||
language = "perl";
|
||||
version = "0.0.0+rev=ecd90bd";
|
||||
version = "0.0.0+rev=a2d8e5a";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter-perl";
|
||||
repo = "tree-sitter-perl";
|
||||
rev = "ecd90bd8b381bcc7219fed4fe351903630e761c6";
|
||||
hash = "sha256-iIa0FJ4kCgfOM/jKwSpaGyOlNwUtczhqoO5gKW7PAHI=";
|
||||
rev = "a2d8e5a32a63019d25bb7452455f4d646d11cce5";
|
||||
hash = "sha256-4it9/LCX36i0XYikYrL8OTwUlfUiJMTV58sYyJ78HQg=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl";
|
||||
};
|
||||
|
|
@ -3006,12 +3017,12 @@
|
|||
};
|
||||
tcl = buildGrammar {
|
||||
language = "tcl";
|
||||
version = "0.0.0+rev=f15e711";
|
||||
version = "0.0.0+rev=8f11ac7";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter-grammars";
|
||||
repo = "tree-sitter-tcl";
|
||||
rev = "f15e711167661d1ba541d4f62b9dbfc4ce61ec56";
|
||||
hash = "sha256-173xUAc2/LMDQSTEM3l3R4UuF/R5fdUyhEpXv6Eh02s=";
|
||||
rev = "8f11ac7206a54ed11210491cee1e0657e2962c47";
|
||||
hash = "sha256-JrGSHGolf7OhInxotXslw1QXxJscl+bXCxZPYJeBfTY=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-tcl";
|
||||
};
|
||||
|
|
@ -3029,12 +3040,12 @@
|
|||
};
|
||||
templ = buildGrammar {
|
||||
language = "templ";
|
||||
version = "0.0.0+rev=54367ac";
|
||||
version = "0.0.0+rev=5504cc9";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vrischmann";
|
||||
repo = "tree-sitter-templ";
|
||||
rev = "54367acb2b250879f39f2afee123c917ed0798e0";
|
||||
hash = "sha256-LJ1Hu64pDv0gwovp2yrINM+G4aHNUF0Gc1K7QXEwXpo=";
|
||||
rev = "5504cc96fbf5c9a029add2dfcb6e585e8fdaad75";
|
||||
hash = "sha256-bbwRwk8FHmtL4VcGIWm9w5ApPfYN0EAHHkcjt7wF1OY=";
|
||||
};
|
||||
meta.homepage = "https://github.com/vrischmann/tree-sitter-templ";
|
||||
};
|
||||
|
|
@ -3096,12 +3107,12 @@
|
|||
};
|
||||
tlaplus = buildGrammar {
|
||||
language = "tlaplus";
|
||||
version = "0.0.0+rev=4ba91b0";
|
||||
version = "0.0.0+rev=2d83194";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tlaplus-community";
|
||||
repo = "tree-sitter-tlaplus";
|
||||
rev = "4ba91b07b97741a67f61221d0d50e6d962e4987e";
|
||||
hash = "sha256-Oc+VYBLP1XcfMTWmcYyJRXzq1Ty838TnF2fPGIsjtOE=";
|
||||
rev = "2d831940c782850f64dabf5b7b17e9e51f7f0ebb";
|
||||
hash = "sha256-AW22SNBF6Y2jD6ROwE3vANWGX08HqR0XjVkthAL+QJs=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus";
|
||||
};
|
||||
|
|
@ -3287,12 +3298,12 @@
|
|||
};
|
||||
v = buildGrammar {
|
||||
language = "v";
|
||||
version = "0.0.0+rev=59a8889";
|
||||
version = "0.0.0+rev=0f963ca";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vlang";
|
||||
repo = "v-analyzer";
|
||||
rev = "59a8889d84a293d7c0366d14c8dbb0eec24fe889";
|
||||
hash = "sha256-I6+4CRwLNFwozNRNE5+cbrOX8hBroCh90H2V7qo2gIo=";
|
||||
rev = "0f963ca4c0cc888252f5a31f37c974d5e2527d06";
|
||||
hash = "sha256-kDPxBgmde4ChaH+45yly2kkqW7G3w68JZMWOZKYwBas=";
|
||||
};
|
||||
location = "tree_sitter_v";
|
||||
meta.homepage = "https://github.com/vlang/v-analyzer";
|
||||
|
|
@ -3332,12 +3343,12 @@
|
|||
};
|
||||
vhdl = buildGrammar {
|
||||
language = "vhdl";
|
||||
version = "0.0.0+rev=35ed277";
|
||||
version = "0.0.0+rev=ec2cb14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jpt13653903";
|
||||
repo = "tree-sitter-vhdl";
|
||||
rev = "35ed277d3e98836796bc764010dc3fb800d14ee4";
|
||||
hash = "sha256-BuPqRNzsPKaUwXNp10KoZwnW5+/rFQ/11TcY0DpNUuk=";
|
||||
rev = "ec2cb14f68053cf49d1d18cd5742af8e81771ebb";
|
||||
hash = "sha256-UbrTs3r+0gSHePTRiHyxZe55t9EIkaK2Auwojq6Dd+A=";
|
||||
};
|
||||
meta.homepage = "https://github.com/jpt13653903/tree-sitter-vhdl";
|
||||
};
|
||||
|
|
@ -3453,35 +3464,35 @@
|
|||
};
|
||||
xml = buildGrammar {
|
||||
language = "xml";
|
||||
version = "0.0.0+rev=0d9a809";
|
||||
version = "0.0.0+rev=291b020";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter-grammars";
|
||||
repo = "tree-sitter-xml";
|
||||
rev = "0d9a8099c963ed53e183425c1b47fa2622c8eaf7";
|
||||
hash = "sha256-0kqCDLCxsvrqu5pKrDZDJt9lSlxU6fzM/CxrWb/oodw=";
|
||||
rev = "291b02018c525abe70fec41559cfe8f2f1cc84b2";
|
||||
hash = "sha256-UxFI86fbhuij+QTex4l139PPMMgAha7rZcBlHSRPJYI=";
|
||||
};
|
||||
location = "xml";
|
||||
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml";
|
||||
};
|
||||
xresources = buildGrammar {
|
||||
language = "xresources";
|
||||
version = "0.0.0+rev=d0f9dc7";
|
||||
version = "0.0.0+rev=dcbce0c";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ValdezFOmar";
|
||||
repo = "tree-sitter-xresources";
|
||||
rev = "d0f9dc7cec4dc15fc6f9d556bb4e9dd5050328a6";
|
||||
hash = "sha256-3TBpNdIsmOutazBlMKAsQaq7RPu4vUeZMFuZ2/2HDKo=";
|
||||
rev = "dcbce0c5dde0fca01dd83a8f497ebe4d053eab1d";
|
||||
hash = "sha256-JgPQxB0nT+4YvwKfAHgUC+Eo664l93ITuWLG7IWUZnU=";
|
||||
};
|
||||
meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-xresources";
|
||||
};
|
||||
yaml = buildGrammar {
|
||||
language = "yaml";
|
||||
version = "0.0.0+rev=1805917";
|
||||
version = "0.0.0+rev=08c5caa";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter-grammars";
|
||||
repo = "tree-sitter-yaml";
|
||||
rev = "1805917414a9a8ba2473717fd69447277a175fae";
|
||||
hash = "sha256-lcdlvzDhl0mDCe4olMoEynxFFLfn3w4p24C1k/7DItA=";
|
||||
rev = "08c5caaeb34e5ccd614706d3b5359a78f1c9e275";
|
||||
hash = "sha256-mQvo90Z4xCXwMDKnCGScw9dKtplEtJuRa1QDjhM4wR4=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-yaml";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -625,6 +625,7 @@ in
|
|||
"codecompanion.providers.actions.mini_pick"
|
||||
"codecompanion.providers.actions.snacks"
|
||||
"codecompanion.providers.actions.telescope"
|
||||
"codecompanion.providers.actions.fzf_lua"
|
||||
"codecompanion.providers.diff.mini_diff"
|
||||
# Requires setup call
|
||||
"codecompanion.actions.static"
|
||||
|
|
@ -1904,6 +1905,7 @@ in
|
|||
# Optional image providers
|
||||
"load_image_nvim"
|
||||
"load_wezterm_nvim"
|
||||
"load_snacks_nvim"
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -402,8 +402,8 @@ https://github.com/gbprod/nord.nvim/,,gbprod-nord
|
|||
https://github.com/David-Kunz/gen.nvim/,HEAD,
|
||||
https://github.com/jsfaint/gen_tags.vim/,,
|
||||
https://github.com/gentoo/gentoo-syntax/,,
|
||||
https://github.com/ndmitchell/ghcid/,,
|
||||
https://github.com/ldelossa/gh.nvim/,,
|
||||
https://github.com/ndmitchell/ghcid/,,
|
||||
https://github.com/eagletmt/ghcmod-vim/,,
|
||||
https://github.com/f-person/git-blame.nvim/,,
|
||||
https://github.com/akinsho/git-conflict.nvim/,HEAD,
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
}:
|
||||
mkLibretroCore {
|
||||
core = "ppsspp";
|
||||
version = "0-unstable-2025-05-19";
|
||||
version = "0-unstable-2025-05-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrydgard";
|
||||
repo = "ppsspp";
|
||||
rev = "48852ed81dbfb4b502a45eb632d4f999a892cc72";
|
||||
hash = "sha256-XgYu36byAxXTDsgq4Iz+VPWQNsPxXQP+hx+/MYZkm6k=";
|
||||
rev = "9bebc1233017c7869f8a3e1025026803d968ef81";
|
||||
hash = "sha256-Un97Xa7Nt+v7T356Gdk0EZTOPMmlkv6Xl/2dilGhsxw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
}:
|
||||
mkLibretroCore {
|
||||
core = "vice-${type}";
|
||||
version = "0-unstable-2025-05-16";
|
||||
version = "0-unstable-2025-05-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "vice-libretro";
|
||||
rev = "86bcfa8c4839236f70e31c656d220c074ff1dfb0";
|
||||
hash = "sha256-Dw+dY1IsR5cIzXa61bWO+2GhrYqgC2ASMjxQe2MVeco=";
|
||||
rev = "f27798806c60f024ce25dc9b8478f12b4d1aa0b6";
|
||||
hash = "sha256-CVDdMtw/25fCR2atJjTbejrvQcmtVwkQb+Lxj8l581c=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
(
|
||||
(buildMozillaMach rec {
|
||||
pname = "floorp";
|
||||
packageVersion = "11.26.2";
|
||||
packageVersion = "11.27.0";
|
||||
applicationName = "Floorp";
|
||||
binaryName = "floorp";
|
||||
branding = "browser/branding/official";
|
||||
|
|
@ -17,14 +17,14 @@
|
|||
allowAddonSideload = true;
|
||||
|
||||
# Must match the contents of `browser/config/version.txt` in the source tree
|
||||
version = "128.11.0";
|
||||
version = "128.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Floorp-Projects";
|
||||
repo = "Floorp";
|
||||
fetchSubmodules = true;
|
||||
rev = "v${packageVersion}";
|
||||
hash = "sha256-tbdEiCFwMkeBB5n82TycyZ0wwE2+cCgLmjROl9kTHS8=";
|
||||
hash = "sha256-lQ84NNWlu4hVKK/CDIDS5JKGdD4i7TTjv4x/dQhDJwo=";
|
||||
};
|
||||
|
||||
extraConfigureFlags = [
|
||||
|
|
@ -45,7 +45,7 @@
|
|||
updateScript = ./update.sh;
|
||||
|
||||
meta = {
|
||||
description = "Fork of Firefox, focused on keeping the Open, Private and Sustainable Web alive, built in Japan";
|
||||
description = "Fork of Firefox that seeks balance between versatility, privacy and web openness";
|
||||
homepage = "https://floorp.app/";
|
||||
maintainers = with lib.maintainers; [ christoph-heiss ];
|
||||
platforms = lib.platforms.unix;
|
||||
|
|
|
|||
|
|
@ -106,8 +106,8 @@ rec {
|
|||
thunderbird-128 = common {
|
||||
applicationName = "Thunderbird ESR";
|
||||
|
||||
version = "128.10.1esr";
|
||||
sha512 = "09b54450928c6e0d948cd79a56c28bdb5fe5a81d7c710470a1ec195dd295c433b872682102c74930f19b1184391c30115293dadcd7dc8a08ae8baeb12770ef9c";
|
||||
version = "128.11.0esr";
|
||||
sha512 = "33de73db2d5ab5152ff11c1947317081259f4e7644631b5e6b9c3b192b4473a5ae6fe897b27b3c8e240ff8c606ffaa8cc14e169c34a94b8de6e64b0c5f0f6810";
|
||||
|
||||
updateScript = callPackage ./update.nix {
|
||||
attrPath = "thunderbirdPackages.thunderbird-128";
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ast-grep";
|
||||
version = "0.38.2";
|
||||
version = "0.38.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ast-grep";
|
||||
repo = "ast-grep";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-mUqjD/otB891kJ8aIF3NP9ewo7yAuGE3yPK+gIIrm2w=";
|
||||
hash = "sha256-KTgpcuojg9sNTTqd8+qp+QIn3bZyNg3Rv/QlkoFGUHg=";
|
||||
};
|
||||
|
||||
# error: linker `aarch64-linux-gnu-gcc` not found
|
||||
|
|
@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
'';
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-s2h2Zt0cRW6V0VAKNuTL8WkHdfkLvuZA/bnSkQKcr9w=";
|
||||
cargoHash = "sha256-UR+5vW6C6nivX2++QcIO/XAvuL869IYzCxtAkN+eUU8=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -6,17 +6,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-sort";
|
||||
version = "1.0.9";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "devinr528";
|
||||
repo = "cargo-sort";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fqmyL4ZSz+nKfUIrcrfLRT9paEas5d00Y/kvEqyz2vw=";
|
||||
sha256 = "sha256-OFDEM/qYIaWsjHKZhf/kmJo7drY+649gpe4VSE18sXc=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-z5YT+6fU12WrByu3NZwodU9Y5489eCRrHUY+H/Hka+c=";
|
||||
cargoHash = "sha256-nQ1g0rBWx7yHQO9U/J0/XI76quEAvpCyhZDcTJKYYXo=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to check that your Cargo.toml dependencies are sorted alphabetically";
|
||||
|
|
|
|||
|
|
@ -23,15 +23,15 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "2025.4.929";
|
||||
version = "2025.4.943";
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}.0_amd64.deb";
|
||||
hash = "sha256-9pofIjiKbe/8vKWe8bc1xoRE1PSexeDxnJcVqfxHd2c=";
|
||||
hash = "sha256-QWLeAq1bhIBw1UzGp62cR7KaOcGOmHgBZJHR3NgB3JY=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}.0_arm64.deb";
|
||||
hash = "sha256-Y3VMuf9rxsvvfL/UVbW2d8hWHfEMhoDZcv/oahinFNo=";
|
||||
hash = "sha256-PDS64b4F3VzUlKNSUBynBRemDkRgbx53xZ7pOL00N0A=";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
let
|
||||
pname = "erigon";
|
||||
version = "3.0.3";
|
||||
version = "3.0.4";
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version;
|
||||
|
|
@ -16,11 +16,11 @@ buildGoModule {
|
|||
owner = "ledgerwatch";
|
||||
repo = "erigon";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-gSgkdg7677OBOkAbsEjxX1QttuIbfve2A3luUZoZ5Ik=";
|
||||
hash = "sha256-MQpHRlKxWCBD2Tj9isxMKwvYBy9HtDkQPyKPse8uB3g=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-8eyC3JkRcRlFw8CyTK5w1XySur2jAeFGXkEaY/3Oq0k=";
|
||||
vendorHash = "sha256-ocnq97cMsiMgDTZhwZ/fiGzaHiSAiJckPwWZu2q3f58=";
|
||||
proxyVendor = true;
|
||||
|
||||
# Build errors in mdbx when format hardening is enabled:
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gh";
|
||||
version = "2.73.0";
|
||||
version = "2.74.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cli";
|
||||
repo = "cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-enD7y0PA8+W2NIHQ617bKeYI5lJt+xUhEBwjPZ2vwjg=";
|
||||
hash = "sha256-jnS2S21iHBmi+AZAKs6QgJWsmZGc4ly8bIGSMg+cNCA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-vTUsR9aDBztJktdZQEg98/nhV4R1fxLevksQ8a6GhDc=";
|
||||
vendorHash = "sha256-S1s+Es7vOvyiPY7RJaMs6joy8QIZ1xY9mR6WvNIs0OY=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "ghmap";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uhourri";
|
||||
repo = "ghmap";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ZA7jtcmvjZEIS3iYaTv9rFqeQSqsh8pCxcbpQDUPDfs=";
|
||||
hash = "sha256-hv+44udltQYzLofs1APlEAi8HgT26dvcfK1GT8yfxFw=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
|
|
|||
|
|
@ -7,10 +7,10 @@
|
|||
let
|
||||
pname = "lmstudio";
|
||||
|
||||
version_aarch64-darwin = "0.3.15-11";
|
||||
hash_aarch64-darwin = "sha256-Bi5UbZR0fDYF+x9mtFaqZsOZZ1gMQAJN+IS/ST/5Wkc=";
|
||||
version_x86_64-linux = "0.3.15-11";
|
||||
hash_x86_64-linux = "sha256-EfynIN6DGSvzOgI+E7CxycJ2KUlFZx2YRwRihjhE3SM=";
|
||||
version_aarch64-darwin = "0.3.16-8";
|
||||
hash_aarch64-darwin = "sha256-iuC43czK26Yf4DM9BhUUBjgDilQeURq+ZdeN2BHPeVo=";
|
||||
version_x86_64-linux = "0.3.16-8";
|
||||
hash_x86_64-linux = "sha256-vouDzaSgkYN++FKz0tLn9ItHg0tQmnFk2U7RlQyAUWg=";
|
||||
|
||||
meta = {
|
||||
description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
# Generated by ./update.sh - do not update manually!
|
||||
# Last updated: 2025-05-19
|
||||
# Last updated: 2025-05-30
|
||||
{
|
||||
version = "3.2.17-2025.5.19";
|
||||
amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.17_250519_amd64_01.deb";
|
||||
arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.17_250519_arm64_01.deb";
|
||||
arm64_hash = "sha256-IGwcZfxePhhu46ARCML/TgVCC2QrIqsd6sh5As30JBY=";
|
||||
amd64_hash = "sha256-kCA5MmLHumCJqQ959L3wXO9bX5mzhowyrRxy5LRocfY=";
|
||||
version = "3.2.17-2025.5.21";
|
||||
amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.17_250521_amd64_01.deb";
|
||||
arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.17_250521_arm64_01.deb";
|
||||
arm64_hash = "sha256-PdZ9yHyyx55Y6J59ZsjDsXhXHyNkk1JBS9K0i0vuX/Q=";
|
||||
amd64_hash = "sha256-BG6Qz+hquexSa5QCwWx6vucb4TS0dUQ6UYKB/zkkI1g=";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,9 +43,10 @@ buildGoModule {
|
|||
paths = [ actualPlugins ];
|
||||
};
|
||||
in
|
||||
runCommand "tflint-with-plugins"
|
||||
runCommand "tflint-with-plugins-${version}"
|
||||
{
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
inherit version;
|
||||
}
|
||||
''
|
||||
makeWrapper ${tflint}/bin/tflint $out/bin/tflint \
|
||||
|
|
|
|||
|
|
@ -5,22 +5,22 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zeekstd";
|
||||
version = "0.2.3";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rorosen";
|
||||
repo = "zeekstd";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-URQ8UiCy8qnm0VM55BqPgIthR4AIyRk+fgowAFxvXwM=";
|
||||
tag = "v${finalAttrs.version}-cli";
|
||||
hash = "sha256-9sUo3RptvCtxmtV49+X09TrOH2t+zB/PCYmeYLWNeGU=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-lS4RQuwvY6bRpsev7RI3XWBPbrdek5im/rkzP+Cmgpc=";
|
||||
cargoHash = "sha256-ggEXjfv4PxVfD7poeFXeACMIMh0A7ar2sm2epY5TO1Y=";
|
||||
|
||||
meta = {
|
||||
description = "CLI tool that works with the zstd seekable format";
|
||||
homepage = "https://github.com/rorosen/zeekstd";
|
||||
changelog = "https://github.com/rorosen/zeekstd/releases/tag/v${finalAttrs.version}";
|
||||
changelog = "https://github.com/rorosen/zeekstd/releases/tag/v${finalAttrs.version}-cli";
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = [ lib.maintainers.rorosen ];
|
||||
mainProgram = "zeekstd";
|
||||
|
|
|
|||
|
|
@ -35,13 +35,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lxqt-panel";
|
||||
version = "2.2.0";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-BMdiSm+FJXeLRGGoCdUpJjFu8JRk0+95LPZJSTFMqrM=";
|
||||
hash = "sha256-PKiuFstkUGrRZE4TOvMq8R5991Ay6Ghw17GCtzlybuU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qps";
|
||||
version = "2.11.0";
|
||||
version = "2.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-Ob9SSN7czCx2I/4fTfwEc1jPEvArpovRFjFnwQqHPUM=";
|
||||
hash = "sha256-uWKTcFO5CoTU5jXB9x5tQ0goEvUpMaeUlMlTG2/xvYg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -156,11 +156,11 @@ else
|
|||
|
||||
# Boot libraries are located differently than other libraries since GHC 9.6, so handle them separately.
|
||||
if [[ -x "${bootLibDir}" ]]; then
|
||||
ln -s "${bootLibDir}"/*.dylib $dynamicLinksDir
|
||||
find "${bootLibDir}" -name '*.dylib' -exec ln -s {} "$dynamicLinksDir" \;
|
||||
fi
|
||||
|
||||
for d in $(grep -Poz "dynamic-library-dirs:\s*\K .+\n" $packageConfDir/*|awk '{print $2}'|sort -u); do
|
||||
ln -s $d/*.dylib $dynamicLinksDir
|
||||
find "$d" -name '*.dylib' -exec ln -s {} "$dynamicLinksDir" \;
|
||||
done
|
||||
for f in $packageConfDir/*.conf; do
|
||||
# Initially, $f is a symlink to a read-only file in one of the inputs
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
importlib-resources,
|
||||
numpy,
|
||||
typing-extensions,
|
||||
jax,
|
||||
|
||||
# tests
|
||||
gymnasium,
|
||||
|
|
@ -33,14 +34,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ale-py";
|
||||
version = "0.11.0";
|
||||
version = "0.11.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Farama-Foundation";
|
||||
repo = "Arcade-Learning-Environment";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-RgFVpbjJp54FncQzFtdZM7p/1GBMsQ2HvLgIoaokiQc=";
|
||||
hash = "sha256-VrPc3i1VYuThKdQn/wimNzMHNmPIAdTxbh2tuJb4YJY=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
@ -59,12 +60,16 @@ buildPythonPackage rec {
|
|||
opencv
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
gymnasium
|
||||
importlib-resources
|
||||
numpy
|
||||
typing-extensions
|
||||
];
|
||||
dependencies =
|
||||
[
|
||||
gymnasium
|
||||
importlib-resources
|
||||
numpy
|
||||
typing-extensions
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
jax
|
||||
];
|
||||
|
||||
postPatch =
|
||||
# Relax the pybind11 version
|
||||
|
|
|
|||
|
|
@ -6,16 +6,21 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tflint-ruleset-aws";
|
||||
version = "0.37.0";
|
||||
version = "0.40.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "terraform-linters";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7xS1V7Ec3eWiVjMB/4MLeKlGxNKRYeHVFc61dpoBU/8=";
|
||||
hash = "sha256-n8o43zCZWrTmLdEuCPe9B1lqxnCbytwRUXSof2sI1Zw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XUGcRky0GMV2RSahUk6k/KWkWvxdCLi/7TpXn2MdNoM=";
|
||||
vendorHash = "sha256-PBXObv/9QwWPmLnTReV7iuFyas1RFtvlboEjPfyIi7w=";
|
||||
|
||||
postPatch = ''
|
||||
# some automation for creating new releases on GitHub, which we don't need
|
||||
rm -rf tools/release
|
||||
'';
|
||||
|
||||
# upstream Makefile also does a go test $(go list ./... | grep -v integration)
|
||||
preCheck = ''
|
||||
|
|
@ -23,8 +28,15 @@ buildGoModule rec {
|
|||
'';
|
||||
|
||||
postInstall = ''
|
||||
# allow use as a versioned dependency, i.e., with `source = ...` and
|
||||
# `version = ...` in `.tflintrc`:
|
||||
mkdir -p $out/github.com/terraform-linters/${pname}/${version}
|
||||
mv $out/bin/${pname} $out/github.com/terraform-linters/${pname}/${version}/
|
||||
|
||||
# allow use as an unversioned dependency, e.g., if one wants `.tflintrc` to
|
||||
# solely rely on Nix to pin versions:
|
||||
ln -s $out/github.com/terraform-linters/${pname}/${version}/${pname} $out/
|
||||
|
||||
# remove other binaries from bin
|
||||
rm -R $out/bin
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -25,8 +25,14 @@ buildGoModule rec {
|
|||
subPackages = [ "." ];
|
||||
|
||||
postInstall = ''
|
||||
# allow use as a versioned dependency, i.e., with `source = ...` and
|
||||
# `version = ...` in `.tflintrc`:
|
||||
mkdir -p $out/github.com/terraform-linters/${pname}/${version}
|
||||
mv $out/bin/${pname} $out/github.com/terraform-linters/${pname}/${version}/
|
||||
|
||||
# allow use as an unversioned dependency, e.g., if one wants `.tflintrc` to
|
||||
# solely rely on Nix to pin versions:
|
||||
ln -s $out/github.com/terraform-linters/${pname}/${version}/${pname} $out/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -12,35 +12,35 @@
|
|||
},
|
||||
"34": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "3e2fd510e2c3703862bfb3114f4aa167504ef97130cfc06d538764b8c8b7211e",
|
||||
"aarch64-linux": "05a5e7601672a8bca016fb6e1fe67afc39d54a5e6ab469eff3d5cbbce3a43557",
|
||||
"armv7l-linux": "c5aa5f77ba3386f2989e330858e6a41b7293b3e741abc4146cf19b5a08b34473",
|
||||
"aarch64-darwin": "5d9bba193dd522548da5c9289eae79016f053cefad77d0540e8412f1318462a8",
|
||||
"aarch64-linux": "65e4c5fbbf452378664777696727384853ca4de699da7c84ac39463d8d0e7de9",
|
||||
"armv7l-linux": "cd3dbedf798ddfcd28f3931b8d2214ee49af8a753c21b16d4068edad44dba2ef",
|
||||
"headers": "0gxibckgmbvbr84469fvl1f32aw1hbycnsj1lz5cmx196rpdj0r6",
|
||||
"x86_64-darwin": "c1d30282cbc12cd47f6bfddf18a97a71964ee1c6933ceb91292547a45c7baee0",
|
||||
"x86_64-linux": "a557db3c99b30a0712849fc9b6b96b56d5a62e51f1d8ace29df4902dc6edea01"
|
||||
"x86_64-darwin": "8171d8f26305eb01001ddb2d8ff6c922a6142378e1cdac8d5cc72f727bd4e6b6",
|
||||
"x86_64-linux": "0ad6461a74c6bb7ef076ee4b2f5c22801ea1efb585d716b01ba499d9158d34e5"
|
||||
},
|
||||
"version": "34.5.5"
|
||||
"version": "34.5.7"
|
||||
},
|
||||
"35": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "a01c6589909768dced83f5f5b1cb2f85906ace17fae8e9aab4b900db6268e0e5",
|
||||
"aarch64-linux": "e6dc44d0a89e344de8751d4b8f6f3b4ce558fd4d18c0744894a8108a70a8d593",
|
||||
"armv7l-linux": "26980b8f10f913b976fa0caf3faa06f5c55956801a2c5a6fb61ac403d82c07fc",
|
||||
"headers": "1la2xfr8lyvq7dc4mxllj3qksrrwxmz3nc2fnr2h0l08bfn2y1ay",
|
||||
"x86_64-darwin": "06426674106607c73b858ba6d69446cd0c56f40bbcb3ec35de36a516da11833b",
|
||||
"x86_64-linux": "d76cef792b8a8a05e707337b3ebc8a44b2c6dd98c2a9ee7a53112633308f7817"
|
||||
"aarch64-darwin": "03b2926356c6cf8718b2d62ee8dd1eaa0812c1f44c5a751c332401dd2867aa47",
|
||||
"aarch64-linux": "9e98b01d5c6611437e8eecece093307e3e59733bb64c068fc3f9bd226b92238d",
|
||||
"armv7l-linux": "3072f6865c6f0202d4059224cb43ecab27f03852025addf09a4fa1b6606cb80c",
|
||||
"headers": "0wspga950dap8wk6ak2idsmp8irjn4xaxq431vxr5ik6r07zn89b",
|
||||
"x86_64-darwin": "3cfff8110bd11d2b3c342b56674d3fd5863698d8413a2a97be80169f61e23ddf",
|
||||
"x86_64-linux": "4e9d927a8edecf59dde02b98fe6bfde64814141898650ca1c69820ae0edbcfa4"
|
||||
},
|
||||
"version": "35.3.0"
|
||||
"version": "35.5.0"
|
||||
},
|
||||
"36": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "58da93c88626005c419906e15d4ae0a38f876453b4146fa357ec1545aeff46ae",
|
||||
"aarch64-linux": "34705bb8645a64e33861cca51693afd02b5f74e9bbb3a9e6be76fec9ffed3328",
|
||||
"armv7l-linux": "7d7c2a4fced66e3f1373810b66b2185f4bc9e27aa0d1ea910c52397b63c2e4d5",
|
||||
"headers": "1rn0p8yf1dm43czl4wn0fsxf4gr4y5pqh08invjgvj8671xsn06d",
|
||||
"x86_64-darwin": "c33a52795bfd51d8801594f4f1a3b17b34571edc8842e30b986b1aa27c3a82d0",
|
||||
"x86_64-linux": "013dface80733221d4153aaf538e8969b93f50d68798d7de2425d5e758e6956b"
|
||||
"aarch64-darwin": "2b51b3001a0e79d9130a379d5276b87c22c054ddf4f19413fd9e0aa2983b4a9e",
|
||||
"aarch64-linux": "0e68a05932d1c662ec8c33a2773aea5575eae1081514cf6ce1c4efe331b772bf",
|
||||
"armv7l-linux": "216d0c8b6a76ef78e7c3b82a45cda251e5d6b038de89bc62f32a7317590d3995",
|
||||
"headers": "1s0didlyil9vzxjkmnf49h7k99319l71m37fdz6zj45v5dnqqj7g",
|
||||
"x86_64-darwin": "460d54a596a3a8a04c6414fb7866e453b7075c1a848bc3230aa01b6d566e8b03",
|
||||
"x86_64-linux": "d124c39544faf125f45f3adccf83e53ca23589d9f35115f69644cfc5c8133e4e"
|
||||
},
|
||||
"version": "36.2.0"
|
||||
"version": "36.3.2"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,35 +12,35 @@
|
|||
},
|
||||
"34": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "36f00fa118aeb349961983e4c4866e0f20096f5cf4ac647f036777b411c7e220",
|
||||
"aarch64-linux": "6358fc8a91d625397cde14bfdae32b0eb57a3b079b3ecf355017eaa18badadf9",
|
||||
"armv7l-linux": "ca654e2cebf1b2ed1448932862e64325d361be445f9763e4d38e2e4dfa67318e",
|
||||
"aarch64-darwin": "f8d82b6fde28011e3fd75410fe0d9141deeac78a9a3754f3e9e517b485f75b52",
|
||||
"aarch64-linux": "1a65ef666f61c695bf92c7beb52ea9ec70e105d822363ade0998277d19e5cd01",
|
||||
"armv7l-linux": "bfa62551c5ef52f907ebb52004504b083a075d6f6582c1ef41dd180873d86518",
|
||||
"headers": "0gxibckgmbvbr84469fvl1f32aw1hbycnsj1lz5cmx196rpdj0r6",
|
||||
"x86_64-darwin": "7b4cb534ec96b26a94ad710de288148c984de43453cb43ff2c8f75fbf0f14d19",
|
||||
"x86_64-linux": "ff1759b9b7acd79b90bcc5d070be52df67e57950f767b15bf051b104b963e0a4"
|
||||
"x86_64-darwin": "5dff162e53b4c5200b581cd4e3d93a9d5aec31bd3d69b7ede7d2a697daee7f97",
|
||||
"x86_64-linux": "8fad178d82cc5e65fa18061f213f6d071e2ae1d773824e18703006dab18acf95"
|
||||
},
|
||||
"version": "34.5.5"
|
||||
"version": "34.5.7"
|
||||
},
|
||||
"35": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "cab8392356a0eecea3cc0ce0484ec721ed55e5343aeda4e4bab43bf874eca03f",
|
||||
"aarch64-linux": "bd73195f28a134b48c6872d4fd2b02cbf556ce6b9542c2eb0db24a1973947711",
|
||||
"armv7l-linux": "d757d538247f3225d0334eeb0f707fcd3fb483ed920be7d17ada7a27ade7068b",
|
||||
"headers": "1la2xfr8lyvq7dc4mxllj3qksrrwxmz3nc2fnr2h0l08bfn2y1ay",
|
||||
"x86_64-darwin": "1ef4c2712558300fe12c279199275d9fb911b790abcada98d85fcb41db4fa98a",
|
||||
"x86_64-linux": "4a82a0322279e98de71ae7599dd1d152b16a69e794e54a4a17f5d1cdd2aaa9ea"
|
||||
"aarch64-darwin": "511a3c6a6b6032985224bcbc1c4884f8673f7573bde7f3919e9797d6645b53c4",
|
||||
"aarch64-linux": "25923b319e958285847d4e5c154eb7877b49380042a20c781185d8b6eb558afa",
|
||||
"armv7l-linux": "d67750b53d37699ade36ebe1912bd72b64af6e825d2d0ac5095531a0b84b191d",
|
||||
"headers": "0wspga950dap8wk6ak2idsmp8irjn4xaxq431vxr5ik6r07zn89b",
|
||||
"x86_64-darwin": "c995faf74d2d7e5b6000b8a1e9551d60e396a19a29796608a090417388a9dd1a",
|
||||
"x86_64-linux": "a1ef549561d64a9d10c1e658f8e86cd735d4261f0c4fc871d8c342240c23d9e0"
|
||||
},
|
||||
"version": "35.3.0"
|
||||
"version": "35.5.0"
|
||||
},
|
||||
"36": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "fd60bfe2f014e90faf071321568089e0907fb0077d29f3bb9341b059af8a634f",
|
||||
"aarch64-linux": "1ad1ce228687516ab70d858ab90067234c6a3b2a607b81bc130ddd5ab5576f41",
|
||||
"armv7l-linux": "03af68d98a2257b05f3ae0c02ded4018fc3cd142523cbe30fd7560e740b0370c",
|
||||
"headers": "1rn0p8yf1dm43czl4wn0fsxf4gr4y5pqh08invjgvj8671xsn06d",
|
||||
"x86_64-darwin": "ce5116a70e68daeacfd1511b332ac694520b8a4a63ca738353c7e610420d75dc",
|
||||
"x86_64-linux": "7851aa60540fd72aa309a649317966f0bc193547ca942b706b78df36c48ff51b"
|
||||
"aarch64-darwin": "dbbfe5a72cdce199204c32039e5cf38992dd4a5bde95d9a1f351a130fadde340",
|
||||
"aarch64-linux": "ffacf585beb157ab6e2607ac0d288d8cac979f73f08355a50c2244a700272ec1",
|
||||
"armv7l-linux": "d7e290f616e8a7ba2d3b9463939e7b48e3b7f49727483424f3b06ecf7d1bebc6",
|
||||
"headers": "1s0didlyil9vzxjkmnf49h7k99319l71m37fdz6zj45v5dnqqj7g",
|
||||
"x86_64-darwin": "d1dbd94952411b0663f9da05c1c5938d87f4498c798b4b90c7db21bc311329f1",
|
||||
"x86_64-linux": "54296abbcc99416528555113ec0871f230eef5492304827a1208591457d6968a"
|
||||
},
|
||||
"version": "36.2.0"
|
||||
"version": "36.3.2"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -57,10 +57,10 @@
|
|||
},
|
||||
"src/electron": {
|
||||
"args": {
|
||||
"hash": "sha256-NdeVWtmGpBqUuRtPBc0xLn7z4YNZ9p765a9nM3XdjCw=",
|
||||
"hash": "sha256-V393R2leEFjj337xVnqo9hlSn7rq44n2PnLcaUrYQ4M=",
|
||||
"owner": "electron",
|
||||
"repo": "electron",
|
||||
"tag": "v34.5.5"
|
||||
"tag": "v34.5.7"
|
||||
},
|
||||
"fetcher": "fetchFromGitHub"
|
||||
},
|
||||
|
|
@ -1271,10 +1271,10 @@
|
|||
"fetcher": "fetchFromGitiles"
|
||||
}
|
||||
},
|
||||
"electron_yarn_hash": "10ny8cj2m8wn8zb5ljsfc8rpv6y4rp049zv5i5slyk3lj2zpgr6y",
|
||||
"electron_yarn_hash": "0gh5bcsh23s3rqxqc2l3jz5vjb553sk0a1jycn94zm821pc3csd2",
|
||||
"modules": "132",
|
||||
"node": "20.19.1",
|
||||
"version": "34.5.5"
|
||||
"version": "34.5.7"
|
||||
},
|
||||
"35": {
|
||||
"chrome": "134.0.6998.205",
|
||||
|
|
@ -1334,10 +1334,10 @@
|
|||
},
|
||||
"src/electron": {
|
||||
"args": {
|
||||
"hash": "sha256-rRrXXuCfS9X+00u7/18A3m8V+k9MK0QITuheQlHFZdQ=",
|
||||
"hash": "sha256-+Kj09hzwmAs5UvzV2wkBY4pPJDDNNmdIcjWXAbfrwz0=",
|
||||
"owner": "electron",
|
||||
"repo": "electron",
|
||||
"tag": "v35.3.0"
|
||||
"tag": "v35.5.0"
|
||||
},
|
||||
"fetcher": "fetchFromGitHub"
|
||||
},
|
||||
|
|
@ -1663,10 +1663,10 @@
|
|||
},
|
||||
"src/third_party/electron_node": {
|
||||
"args": {
|
||||
"hash": "sha256-bJPSHe3CsL9T1SYwC8hyDbAMqj/5WvgM8VqQU9mpVww=",
|
||||
"hash": "sha256-fGfV1IkJoAMQC49vZPgmoYW6OznOCJ4IIUNUiyLjIKE=",
|
||||
"owner": "nodejs",
|
||||
"repo": "node",
|
||||
"tag": "v22.14.0"
|
||||
"tag": "v22.15.1"
|
||||
},
|
||||
"fetcher": "fetchFromGitHub"
|
||||
},
|
||||
|
|
@ -2580,13 +2580,13 @@
|
|||
"fetcher": "fetchFromGitiles"
|
||||
}
|
||||
},
|
||||
"electron_yarn_hash": "0l38rbmlrcrgkw7ggj33xszcs7arm601gzq4c8v0rn3m5zp6yr77",
|
||||
"electron_yarn_hash": "1p9gs8s1zhwxvvmi9zb76k5nn1wly4yq0i12ibr0wvw5ls8bbars",
|
||||
"modules": "133",
|
||||
"node": "22.14.0",
|
||||
"version": "35.3.0"
|
||||
"node": "22.15.1",
|
||||
"version": "35.5.0"
|
||||
},
|
||||
"36": {
|
||||
"chrome": "136.0.7103.49",
|
||||
"chrome": "136.0.7103.115",
|
||||
"chromium": {
|
||||
"deps": {
|
||||
"gn": {
|
||||
|
|
@ -2596,15 +2596,15 @@
|
|||
"version": "2025-03-24"
|
||||
}
|
||||
},
|
||||
"version": "136.0.7103.49"
|
||||
"version": "136.0.7103.115"
|
||||
},
|
||||
"chromium_npm_hash": "sha256-QRjk9X4rJW3ofizK33R4T1qym1riqcnpBhDF+FfNZLo=",
|
||||
"deps": {
|
||||
"src": {
|
||||
"args": {
|
||||
"hash": "sha256-7ykQd8jKE9aVfTBPrJnOGHQYhmm+gJoMX7kET7eYFXM=",
|
||||
"hash": "sha256-yUWNV65TshvAMaz1kGOUQuy+J5vXPryjisGN3MxTU9Q=",
|
||||
"postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
|
||||
"tag": "136.0.7103.49",
|
||||
"tag": "136.0.7103.115",
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
|
|
@ -2643,10 +2643,10 @@
|
|||
},
|
||||
"src/electron": {
|
||||
"args": {
|
||||
"hash": "sha256-mErVGqPBvplWEEOnEFnEdxDU34jc5YECLj18rU7E/XM=",
|
||||
"hash": "sha256-bMQJfOkWRFE7Qg4kHiwkNcuXOSWU0EzEGSo8U1SuGTQ=",
|
||||
"owner": "electron",
|
||||
"repo": "electron",
|
||||
"tag": "v36.2.0"
|
||||
"tag": "v36.3.2"
|
||||
},
|
||||
"fetcher": "fetchFromGitHub"
|
||||
},
|
||||
|
|
@ -2684,8 +2684,8 @@
|
|||
},
|
||||
"src/third_party/angle": {
|
||||
"args": {
|
||||
"hash": "sha256-+Cgf3OocFbD2rL4izA/0Z0qjWQiIUwiTW/z0cW0pGb0=",
|
||||
"rev": "ecc378cc61109732d174d6542c41fd523c331b13",
|
||||
"hash": "sha256-bIpN9lehrKpJYBKLeo8Szz0/aVe7NU2Eo2NIO5dAZ9w=",
|
||||
"rev": "fa40b7c586fd2da9fd7e5c4d893ecb1334553b9e",
|
||||
"url": "https://chromium.googlesource.com/angle/angle.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
|
|
@ -2940,8 +2940,8 @@
|
|||
},
|
||||
"src/third_party/devtools-frontend/src": {
|
||||
"args": {
|
||||
"hash": "sha256-BHD/XVQquh9/cr+Kv43lKGFReHy4YbQIAJq5792+4Sw=",
|
||||
"rev": "e793e21a020b53a66ae13ef8673f80b8e8a73746",
|
||||
"hash": "sha256-hEksLeJli/1TNNrDcUjv19cpyIJph6kfriNfe7FWO0U=",
|
||||
"rev": "4a53cbe7a1270c91ec60903ee792de658453becb",
|
||||
"url": "https://chromium.googlesource.com/devtools/devtools-frontend"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
|
|
@ -2972,10 +2972,10 @@
|
|||
},
|
||||
"src/third_party/electron_node": {
|
||||
"args": {
|
||||
"hash": "sha256-KXhkO1qKbf7/KktyLQcPGEzcIErsIKAUE89oGTP2mbI=",
|
||||
"hash": "sha256-fGfV1IkJoAMQC49vZPgmoYW6OznOCJ4IIUNUiyLjIKE=",
|
||||
"owner": "nodejs",
|
||||
"repo": "node",
|
||||
"tag": "v22.15.0"
|
||||
"tag": "v22.15.1"
|
||||
},
|
||||
"fetcher": "fetchFromGitHub"
|
||||
},
|
||||
|
|
@ -3567,8 +3567,8 @@
|
|||
},
|
||||
"src/third_party/skia": {
|
||||
"args": {
|
||||
"hash": "sha256-LQDs+V7XFK+XcySrr53WZVX6DhyJypePBc/B8FDh5Gw=",
|
||||
"rev": "8b7f0fd0f95b97d863da34ccfa52a0f931cbd13f",
|
||||
"hash": "sha256-ei95CJRfNPrsYt8XcDi7Pnl5dGiJu3qs7R4rAcZ24Uc=",
|
||||
"rev": "bcce46ca33b67cc302dd53927a63013b8f53bf73",
|
||||
"url": "https://skia.googlesource.com/skia.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
|
|
@ -3655,8 +3655,8 @@
|
|||
},
|
||||
"src/third_party/sqlite/src": {
|
||||
"args": {
|
||||
"hash": "sha256-ltl3OTk/wZPSj3yYthNlKd3mBxef6l5uW6UYTwebNek=",
|
||||
"rev": "567495a62a62dc013888500526e82837d727fe01",
|
||||
"hash": "sha256-1vAGAF3idxgHGaqb5gT5k3KIGC2H3gqC3RTVU2ZRf4A=",
|
||||
"rev": "8a22b25ad7244abaf07e372cc6dc97e041d663a9",
|
||||
"url": "https://chromium.googlesource.com/chromium/deps/sqlite.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
|
|
@ -3898,16 +3898,16 @@
|
|||
},
|
||||
"src/v8": {
|
||||
"args": {
|
||||
"hash": "sha256-Gc7huCu+d5XBwI420V1nutKeJpqBfvJ6fhh5zpRtMw4=",
|
||||
"rev": "b6178615ecae6d84b347cb7a1812cad9afca51f2",
|
||||
"hash": "sha256-Fi4pl6xSXkHF4XaQNfNzULVjQZSzDfaHFIyIxH103go=",
|
||||
"rev": "5297e56d91816747d539abca52b578e5832135f0",
|
||||
"url": "https://chromium.googlesource.com/v8/v8.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
}
|
||||
},
|
||||
"electron_yarn_hash": "195amc05nj4p1x0mqi04m3qgw15k7fj62lw0xbrjz5iyjdyrdxan",
|
||||
"electron_yarn_hash": "10n86jnzcq8kh0nk29ljw9wi1fgj13f07h92b009i1dryagliyrs",
|
||||
"modules": "135",
|
||||
"node": "22.15.0",
|
||||
"version": "36.2.0"
|
||||
"node": "22.15.1",
|
||||
"version": "36.3.2"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,7 +21,21 @@
|
|||
}:
|
||||
|
||||
let
|
||||
pythonEnv = python3.withPackages (
|
||||
# remove ASAP: https://github.com/googleapis/google-api-python-client/issues/2554
|
||||
pythonCustom = python3.override {
|
||||
self = pythonCustom;
|
||||
packageOverrides = _: super: {
|
||||
pyopenssl = super.pyopenssl.overridePythonAttrs (old: rec {
|
||||
version = "24.2.1";
|
||||
src = old.src.override {
|
||||
tag = version;
|
||||
hash = "sha256-otK7Y7Kb/l3QOErhAcuDHB/CKG9l1vH2BTnOieAWNc0=";
|
||||
};
|
||||
});
|
||||
};
|
||||
};
|
||||
|
||||
pythonEnv = pythonCustom.withPackages (
|
||||
p:
|
||||
with p;
|
||||
[
|
||||
|
|
|
|||
|
|
@ -15635,14 +15635,14 @@ with pkgs;
|
|||
;
|
||||
|
||||
trimmomatic = callPackage ../applications/science/biology/trimmomatic {
|
||||
jdk = pkgs.jdk11_headless;
|
||||
jdk = pkgs.jdk21_headless;
|
||||
# Reduce closure size
|
||||
jre = pkgs.jre_minimal.override {
|
||||
modules = [
|
||||
"java.base"
|
||||
"java.logging"
|
||||
];
|
||||
jdk = pkgs.jdk11_headless;
|
||||
jdk = pkgs.jdk21_headless;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue