Merge master into staging-next

This commit is contained in:
github-actions[bot]
2024-10-29 00:14:34 +00:00
committed by GitHub
51 changed files with 2267 additions and 912 deletions
+5 -3
View File
@@ -290,11 +290,12 @@ in
''
+ optionalString (cfg.passwordFile != null) ''
export PAPERLESS_ADMIN_USER="''${PAPERLESS_ADMIN_USER:-admin}"
export PAPERLESS_ADMIN_PASSWORD=$(cat $CREDENTIALS_DIRECTORY/PAPERLESS_ADMIN_PASSWORD)
PAPERLESS_ADMIN_PASSWORD=$(cat "$CREDENTIALS_DIRECTORY/PAPERLESS_ADMIN_PASSWORD")
export PAPERLESS_ADMIN_PASSWORD
superuserState="$PAPERLESS_ADMIN_USER:$PAPERLESS_ADMIN_PASSWORD"
superuserStateFile="${cfg.dataDir}/superuser-state"
if [[ $(cat "$superuserStateFile" 2>/dev/null) != $superuserState ]]; then
if [[ $(cat "$superuserStateFile" 2>/dev/null) != "$superuserState" ]]; then
${cfg.package}/bin/paperless-ngx manage_superuser
echo "$superuserState" > "$superuserStateFile"
fi
@@ -353,7 +354,8 @@ in
tr -dc A-Za-z0-9 < /dev/urandom | head -c64 | ${pkgs.moreutils}/bin/sponge '${secretKeyFile}'
)
fi
export PAPERLESS_SECRET_KEY=$(cat '${secretKeyFile}')
PAPERLESS_SECRET_KEY="$(cat '${secretKeyFile}')"
export PAPERLESS_SECRET_KEY
if [[ ! $PAPERLESS_SECRET_KEY ]]; then
echo "PAPERLESS_SECRET_KEY is empty, refusing to start."
exit 1
File diff suppressed because it is too large Load Diff
@@ -401,6 +401,17 @@
};
meta.homepage = "https://github.com/UserNobody14/tree-sitter-dart";
};
desktop = buildGrammar {
language = "desktop";
version = "0.0.0+rev=0d8b8cf";
src = fetchFromGitHub {
owner = "ValdezFOmar";
repo = "tree-sitter-desktop";
rev = "0d8b8cf7c9311fe3f1730df8e193d836f6dd9d1b";
hash = "sha256-tDZB6gkQyVF1wN4343Qft0tRkTDDm49AFzhbIz+LK40=";
};
meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-desktop";
};
devicetree = buildGrammar {
language = "devicetree";
version = "0.0.0+rev=16c9cb9";
@@ -526,12 +537,12 @@
};
editorconfig = buildGrammar {
language = "editorconfig";
version = "0.0.0+rev=777f774";
version = "0.0.0+rev=38cf8d0";
src = fetchFromGitHub {
owner = "ValdezFOmar";
repo = "tree-sitter-editorconfig";
rev = "777f774d6381f1bb84adffa02a4e476fb61486ae";
hash = "sha256-7CN2fT5wwsuSwQzq7uBj26OPYRtZ6rwLNz99SKhBU74=";
rev = "38cf8d0af6049025de0e5486a40881dac06285b4";
hash = "sha256-ndZ/oGquSMkxsEHUPh5/qDEUVfhyZbI4mcQKtLHVBOU=";
};
meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-editorconfig";
};
@@ -559,12 +570,12 @@
};
elixir = buildGrammar {
language = "elixir";
version = "0.0.0+rev=2ac7a0f";
version = "0.0.0+rev=5345854";
src = fetchFromGitHub {
owner = "elixir-lang";
repo = "tree-sitter-elixir";
rev = "2ac7a0f81f0731d83068b2872c4a8fee39263a85";
hash = "sha256-u0gwq4eIoFNcTeoJpY2lRE97M7JSHZ5X2zSKrNlTycM=";
rev = "53458546e3bb717beee1d15df30724c81eb41d1c";
hash = "sha256-Zuqjv4QEeCiHYCxGT9HYAXlqrRFTi8V88wAsot6O5TI=";
};
meta.homepage = "https://github.com/elixir-lang/tree-sitter-elixir";
};
@@ -713,12 +724,12 @@
};
fortran = buildGrammar {
language = "fortran";
version = "0.0.0+rev=4a593dd";
version = "0.0.0+rev=cb4cb11";
src = fetchFromGitHub {
owner = "stadelmanma";
repo = "tree-sitter-fortran";
rev = "4a593dda9cbc050a6686187249f8350ceea292ce";
hash = "sha256-HsGDyjUymJHpaQ7ZlcTOg/fg4avVicnPf3zF9OoWQes=";
rev = "cb4cb11ca2dced205fb54005684a44e2ceb813c1";
hash = "sha256-c15BxiXhmQeOz0G5v2R9fpBUbhmcibm15ax6hbWQOnI=";
};
meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran";
};
@@ -1331,12 +1342,12 @@
};
javascript = buildGrammar {
language = "javascript";
version = "0.0.0+rev=c4ce9dc";
version = "0.0.0+rev=a2ef079";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-javascript";
rev = "c4ce9dc8e7e98ea25757ea26bfe9a022043ccd77";
hash = "sha256-ZSuogu8ljy0Ve8MGzkX1Q+dkHNbVmy8LhcCmshvw7+U=";
rev = "a2ef0796e8b9db9107c9ad210b3121b8ad918d5e";
hash = "sha256-0WTH1bj2uKgfLnJqaoHYJFUFY4OWpCnY0YfbPiqIbiM=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript";
};
@@ -1419,12 +1430,12 @@
};
just = buildGrammar {
language = "just";
version = "0.0.0+rev=6aee3d2";
version = "0.0.0+rev=1014d2f";
src = fetchFromGitHub {
owner = "IndianBoy42";
repo = "tree-sitter-just";
rev = "6aee3d2f5b3a47286bae0916daaa6c7a217f6fa4";
hash = "sha256-A5dN76/ZxoXBzqNHDhE5JeNeKBpamZ2Jp6Y67U6gZ/w=";
rev = "1014d2fd6396856c312054d6c30df4d78b62966c";
hash = "sha256-8vr55zhJOJxZhc8bXZpvO6a/eEYUJQ+HBWC4xRYbrgk=";
};
meta.homepage = "https://github.com/IndianBoy42/tree-sitter-just";
};
@@ -1463,12 +1474,12 @@
};
koto = buildGrammar {
language = "koto";
version = "0.0.0+rev=cbf637e";
version = "0.0.0+rev=9e5ab09";
src = fetchFromGitHub {
owner = "koto-lang";
repo = "tree-sitter-koto";
rev = "cbf637e5163065934c827d254b293f4d2f08f523";
hash = "sha256-/yeC7pAk0QsPcuMfdp2l1MLGZlQ7CwgdMWNZe/hCfXU=";
rev = "9e5ab09710b9f035efdcef1eecaadbf261af7ec3";
hash = "sha256-xlU3iOjwYcoCf6kdkxTX/zASY0+n+TwAn8GBfACYr1k=";
};
meta.homepage = "https://github.com/koto-lang/tree-sitter-koto";
};
@@ -1708,12 +1719,12 @@
};
mlir = buildGrammar {
language = "mlir";
version = "0.0.0+rev=0238b7f";
version = "0.0.0+rev=8cde51a";
src = fetchFromGitHub {
owner = "artagnon";
repo = "tree-sitter-mlir";
rev = "0238b7fb6a630f77b3fc8b8a48285ef6ed45cbcc";
hash = "sha256-rQDkvs/z+sunTlcquHLMN6wmsCP3RRT6vcnSqxNNo+0=";
rev = "8cde51ac0484fdf59a90641fefb92a0e846dcc7c";
hash = "sha256-bIqWBIOkUq9TitqNneiB+epu/+kVgW1szOm96yMrFaE=";
};
generate = true;
meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
@@ -2711,12 +2722,12 @@
};
superhtml = buildGrammar {
language = "superhtml";
version = "0.0.0+rev=3325bbb";
version = "0.0.0+rev=e561df3";
src = fetchFromGitHub {
owner = "kristoff-it";
repo = "superhtml";
rev = "3325bbb2dda260131a8db0cae1f1f557d17ebced";
hash = "sha256-3NAS3eqayFYRziryNgOWfY+3d1HcVe+jPcKkkL9jbWY=";
rev = "e561df3b5ce94e598a4c3d0ee4abd9635bad63b3";
hash = "sha256-sF5uAEYV32HROnqvM3oltvpwtBydx2au8SIJCAMmpMY=";
};
location = "tree-sitter-superhtml";
meta.homepage = "https://github.com/kristoff-it/superhtml";
@@ -2745,12 +2756,12 @@
};
swift = buildGrammar {
language = "swift";
version = "0.0.0+rev=d351cb3";
version = "0.0.0+rev=5098007";
src = fetchFromGitHub {
owner = "alex-pinkus";
repo = "tree-sitter-swift";
rev = "d351cb321c28f0a3e66242ef2f61b1f890ec4b44";
hash = "sha256-7b9wNyHF2ZKMhMcqaFVb1xGcxWdZOS5k1CBvg4RVqXE=";
rev = "5098007f58f4663a5613b2fecb6b866e3d41e37b";
hash = "sha256-VIBjnR9pkPt9RWjaDBWv6Rhuzr8eTjNJtrfXI/+2mCs=";
};
generate = true;
meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift";
@@ -2779,12 +2790,12 @@
};
t32 = buildGrammar {
language = "t32";
version = "0.0.0+rev=0f6a5b1";
version = "0.0.0+rev=e455373";
src = fetchFromGitLab {
owner = "xasc";
repo = "tree-sitter-t32";
rev = "0f6a5b1e031c97ebf58d3c76eadb2c6bf1e4f780";
hash = "sha256-Pd6rudBmDVvBwlVSLtBmSsoOBU9aG0iSyEPbTaYX6JE=";
rev = "e455373021812abf4a0b5170caa0d882a9578bab";
hash = "sha256-SJYT34qw55xiN0lJ37NfPkV4WHi7/5Ymdxruk4vyOV4=";
};
meta.homepage = "https://gitlab.com/xasc/tree-sitter-t32.git";
};
@@ -2835,12 +2846,12 @@
};
templ = buildGrammar {
language = "templ";
version = "0.0.0+rev=4519e3e";
version = "0.0.0+rev=1dcd7db";
src = fetchFromGitHub {
owner = "vrischmann";
repo = "tree-sitter-templ";
rev = "4519e3ec9ca92754ca25659bb1fd410d5e0f8d88";
hash = "sha256-ic5SlqDEZoYakrJFe0H9GdzravqovlL5sTaHjyhe74M=";
rev = "1dcd7db19c047bc0327907a544df3207ba814ea4";
hash = "sha256-/WOEN+FGb65IpRZCzB2+0/aTjourcL5CYchrZxwlFWs=";
};
meta.homepage = "https://github.com/vrischmann/tree-sitter-templ";
};
@@ -2891,12 +2902,12 @@
};
tlaplus = buildGrammar {
language = "tlaplus";
version = "0.0.0+rev=8a8413f";
version = "0.0.0+rev=ffb6c4b";
src = fetchFromGitHub {
owner = "tlaplus-community";
repo = "tree-sitter-tlaplus";
rev = "8a8413f1d08e7ee40b347206d26eac4324db9fd9";
hash = "sha256-k34gkAd0ueXEAww/Hc1mtBfn0Kp1pIBQtjDZ9GQeB4Q=";
rev = "ffb6c4b91862a03af767d6b0e627d3d20539b79a";
hash = "sha256-eKHpiAtOYn9fFhR35m1d1jLNwLeXL1GT5cAWWoYZI/k=";
};
meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus";
};
@@ -3160,12 +3171,12 @@
};
vimdoc = buildGrammar {
language = "vimdoc";
version = "0.0.0+rev=59c5392";
version = "0.0.0+rev=d2e4b5c";
src = fetchFromGitHub {
owner = "neovim";
repo = "tree-sitter-vimdoc";
rev = "59c539286e7487b267bc7808b16833f9e3ad6793";
hash = "sha256-YDeyD9z/pXISAD7IVfzEenNy2qPORLMqG466c+6yQf0=";
rev = "d2e4b5c172a109966c2ce0378f73df6cede39400";
hash = "sha256-Vrl4/cZL+TWlUMEeWZoHCAWhvlefcl3ajGcwyTNKOhI=";
};
meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc";
};
@@ -1644,7 +1644,7 @@ in
inherit (old) version src;
sourceRoot = "${old.src.name}/spectre_oxi";
cargoHash = "sha256-D7KUJ8q521WWgUqBBOgepGJ3NQ4DdKr+Bg/4k3Lf+mw=";
cargoHash = "sha256-yYUbfqkICsGDKexYjfhXfpIoT1+QrZQJPpKzk+gwm+s=";
preCheck = ''
mkdir tests/tmp/
@@ -2558,11 +2558,7 @@ in
};
vim-tabby = super.vim-tabby.overrideAttrs {
postPatch = ''
substituteInPlace autoload/tabby/globals.vim --replace-fail \
"let g:tabby_node_binary = get(g:, 'tabby_node_binary', 'node')" \
"let g:tabby_node_binary = get(g:, 'tabby_node_binary', '${nodejs}/bin/node')"
'';
nvimRequirecheck = "tabby";
};
vim-textobj-entire = super.vim-textobj-entire.overrideAttrs {
@@ -597,11 +597,11 @@
"vendorHash": "sha256-GoOKTT+EOhaPhpbgSW3SycYsE8LEQP0v4eQfiTEnPy8="
},
"huaweicloud": {
"hash": "sha256-hDb3dOKaHL1fw0m+dBx6izhw7tltvzm05IyCGJgbGJw=",
"hash": "sha256-gCdB2aIpI4IjRldvvVTnV7OTzd64nouiFNQ5bVpGNck=",
"homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud",
"owner": "huaweicloud",
"repo": "terraform-provider-huaweicloud",
"rev": "v1.69.0",
"rev": "v1.69.1",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -1102,13 +1102,13 @@
"vendorHash": "sha256-MP44e56j7rLyT4+TbFDfDb5GNc/LzZNLplm1/qqeGiw="
},
"sentry": {
"hash": "sha256-iTwl5FowrrhznO+Zr7QXy7/6HlYWCryZTMxNsBGSfWI=",
"hash": "sha256-HGjePQGetglWQEGDtPZ2WAPMlvjEm+KYdagakiko39E=",
"homepage": "https://registry.terraform.io/providers/jianyuan/sentry",
"owner": "jianyuan",
"repo": "terraform-provider-sentry",
"rev": "v0.13.1",
"rev": "v0.14.0",
"spdx": "MIT",
"vendorHash": "sha256-nMI79G1e1+ISdWNjL0Qh/pD8JkD1/1khNkwULU6PyxU="
"vendorHash": "sha256-8ONdkr6RoAyjI6ugeGVsWDc+Sn00sJttojYS94HBqsQ="
},
"shell": {
"hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=",
+8 -10
View File
@@ -1,12 +1,10 @@
{ callPackage
, libsForQt5
, python311Packages
}:
let
mkGui = args: callPackage (import ./gui.nix (args)) {
inherit (libsForQt5) wrapQtAppsHook;
python3Packages = python311Packages;
};
mkServer = args: callPackage (import ./server.nix (args)) { };
@@ -14,25 +12,25 @@ in
{
guiStable = mkGui {
channel = "stable";
version = "2.2.49";
hash = "sha256-hvLJ4VilcgtpxHeboeSUuGAco9LEnUB8J6vy/ZPajbU=";
version = "2.2.50";
hash = "sha256-A6aLp/fN/0u5VIOX6d0QrZ2zWuNPvhI1xfw7cKU9jRA=";
};
guiPreview = mkGui {
channel = "stable";
version = "2.2.49";
hash = "sha256-hvLJ4VilcgtpxHeboeSUuGAco9LEnUB8J6vy/ZPajbU=";
version = "2.2.50";
hash = "sha256-A6aLp/fN/0u5VIOX6d0QrZ2zWuNPvhI1xfw7cKU9jRA=";
};
serverStable = mkServer {
channel = "stable";
version = "2.2.49";
hash = "sha256-fI49MxA6b2kPkUihLl32a6jo8oHcEwDEjmvSVDj8/So=";
version = "2.2.50";
hash = "sha256-m5Od3IPn31JaFOtilKh79aISH4lRd+KatSLRqsF8n4Y=";
};
serverPreview = mkServer {
channel = "stable";
version = "2.2.49";
hash = "sha256-fI49MxA6b2kPkUihLl32a6jo8oHcEwDEjmvSVDj8/So=";
version = "2.2.50";
hash = "sha256-m5Od3IPn31JaFOtilKh79aISH4lRd+KatSLRqsF8n4Y=";
};
}
+5 -5
View File
@@ -1,9 +1,9 @@
{
"owner": "advplyr",
"repo": "audiobookshelf",
"rev": "d80752cc9d7ace01fee57a627b7745adedc08589",
"hash": "sha256-iT2Ww+iRyGS5qBT3QcM7weiYq/6c408jTSPuZinNXgs=",
"version": "2.15.1",
"depsHash": "sha256-km/cx2IaJ2/1UxZk2uXHE46VF3MiR6hasYRuKKBitY4=",
"clientDepsHash": "sha256-3XsXCZrDMtZFs8xwqydfVouAuxarQl/KdMdHkq+Vp9A="
"rev": "fba9cce82ec1a94e002d34a6b012eadf34c759a0",
"hash": "sha256-BoNveMooYfRPKUJK5aqzeKVmY4MNyH9FwO0/EON2cZY=",
"version": "2.16.0",
"depsHash": "sha256-yr5k151jGGT3O2CfDfdKfN7s2e8tUdrS8PWA5tX1BMA=",
"clientDepsHash": "sha256-LJk+cbW3JTzUl6M0PqWj3tLWx29bGYgG+HohCiFoaME="
}
+13 -9
View File
@@ -6,6 +6,7 @@
gobject-introspection,
wrapGAppsHook3,
gtk3,
getent,
}:
python3Packages.buildPythonPackage rec {
pname = "auto-cpufreq";
@@ -29,15 +30,18 @@ python3Packages.buildPythonPackage rec {
python3Packages.poetry-core
];
propagatedBuildInputs = with python3Packages; [
click
distro
psutil
pygobject3
poetry-dynamic-versioning
setuptools
pyinotify
];
propagatedBuildInputs =
with python3Packages;
[
click
distro
psutil
pygobject3
poetry-dynamic-versioning
setuptools
pyinotify
]
++ [ getent ];
doCheck = false;
pythonImportsCheck = [ "auto_cpufreq" ];
@@ -1,20 +1,20 @@
{ lib
, fetchFromGitHub
, fetchgit
, php
}:
php.buildComposerProject (finalAttrs: {
php.buildComposerProject2 (finalAttrs: {
pname = "composer-require-checker";
version = "4.8.0";
version = "4.13.0";
src = fetchFromGitHub {
owner = "maglnet";
repo = "ComposerRequireChecker";
rev = finalAttrs.version;
hash = "sha256-qCHUNaPunCPuWax/YUbYXaVh1JlJEwYvG/NmaSc1VpA=";
# Upstream no longer provides the composer.lock in their release artifact
src = fetchgit {
url = "https://github.com/maglnet/ComposerRequireChecker";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-xq8W5SXwtmJ3uu5g26/rxL02jqBuxvEEQpwazPdCE5Y=";
};
vendorHash = "sha256-B5w5n2S/mTF7vpsLuHtf2DGR5aPBfO9QGmodYGXE+Cg=";
vendorHash = "sha256-GGT/9kBpd7PU/pMJFWw1rrEW2QFUlrp3lljUCyo+/bw=";
meta = {
description = "CLI tool to check whether a specific composer package uses imported symbols that aren't part of its direct composer dependencies";
+30 -6
View File
@@ -3,12 +3,17 @@
lib,
fetchFromGitHub,
pkg-config,
wayland,
wayland-scanner,
wayland-protocols,
unstableGitUpdater,
pixman,
fcft,
wayland,
writeText,
# Boolean flags
withCustomConfigH ? (configH != null),
# Configurable options
configH ? null,
}:
stdenv.mkDerivation {
@@ -26,10 +31,6 @@ stdenv.mkDerivation {
pkg-config
];
env = {
PREFIX = placeholder "out";
};
buildInputs = [
wayland-scanner
wayland-protocols
@@ -38,6 +39,26 @@ stdenv.mkDerivation {
wayland
];
# Allow alternative config.def.h usage. Taken from dwl.nix.
postPatch =
let
configFile =
if lib.isDerivation configH || builtins.isPath configH then
configH
else
writeText "config.h" configH;
in
lib.optionalString withCustomConfigH "cp ${configFile} config.h";
env = {
PREFIX = placeholder "out";
};
outputs = [
"out"
"man"
];
passthru.updateScript = unstableGitUpdater { };
meta = {
@@ -45,7 +66,10 @@ stdenv.mkDerivation {
homepage = "https://github.com/kolunmi/dwlb";
license = lib.licenses.gpl3Plus;
mainProgram = "dwlb";
maintainers = with lib.maintainers; [ bot-wxt1221 ];
maintainers = with lib.maintainers; [
bot-wxt1221
lonyelon
];
platforms = wayland.meta.platforms;
};
}
+2 -2
View File
@@ -6,13 +6,13 @@
}:
buildGoModule rec {
pname = "eigenlayer";
version = "0.10.6";
version = "0.10.8";
src = fetchFromGitHub {
owner = "Layr-Labs";
repo = "eigenlayer-cli";
rev = "v${version}";
hash = "sha256-FvmS9rWmf6bzY5QjVS3otylHYPyQ7KqXVJ0m28/zEi8=";
hash = "sha256-/8fLIdD14k8KgUdlfEHU+xSovFj6f0FfaweZKegihyQ=";
};
vendorHash = "sha256-7KC99PqAPfGnm7yA4nfAlC7V4NhCEYDyPxY7CdOdwno=";
+48 -26
View File
@@ -1,11 +1,13 @@
{ lib
, fetchFromGitHub
, rustPlatform
, pkg-config
, openssl
, sqlite
, installShellFiles
, stdenv
{
lib,
fetchFromGitHub,
rustPlatform,
pkg-config,
openssl,
sqlite,
installShellFiles,
stdenv,
buildPackages,
}:
rustPlatform.buildRustPackage rec {
@@ -21,34 +23,54 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-kMiKlZj+G1vfjaEiB3rtPoJl0K3W9xRVwgVz8q2pn1s=";
nativeBuildInputs = [ pkg-config installShellFiles ];
nativeBuildInputs = [
pkg-config
installShellFiles
];
buildInputs = [ openssl sqlite ];
outputs = [ "out" "man" ];
buildInputs = [
openssl
sqlite
];
outputs = [
"out"
"man"
];
postInstall = ''
export OUT_DIR=$(mktemp -d)
postInstall =
let
emulator = stdenv.hostPlatform.emulator buildPackages;
flawz-mangen = "${emulator} $out/bin/flawz-mangen";
flawz-completions = "${emulator} $out/bin/flawz-completions";
in
lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ''
export OUT_DIR=$(mktemp -d)
# Generate the man pages
cargo run --bin flawz-mangen
installManPage $OUT_DIR/flawz.1
# Generate the man pages
${flawz-mangen}
installManPage $OUT_DIR/flawz.1
# Generate shell completions
cargo run --bin flawz-completions
installShellCompletion \
--bash $OUT_DIR/flawz.bash \
--fish $OUT_DIR/flawz.fish \
--zsh $OUT_DIR/_flawz
# Generate shell completions
${flawz-completions}
installShellCompletion \
--bash $OUT_DIR/flawz.bash \
--fish $OUT_DIR/flawz.fish \
--zsh $OUT_DIR/_flawz
# Clean up temporary directory
rm -rf $OUT_DIR
'';
# Clean up temporary directory
rm -rf $OUT_DIR
# No need for these binaries to end up in the output
rm $out/bin/flawz-{completions,mangen}
'';
meta = {
description = "Terminal UI for browsing CVEs";
homepage = "https://github.com/orhun/flawz";
changelog = "https://github.com/orhun/flawz/releases/tag/v${version}";
license = with lib.licenses; [ mit asl20 ];
license = with lib.licenses; [
mit
asl20
];
mainProgram = "flawz";
maintainers = with lib.maintainers; [ anas ];
platforms = with lib.platforms; unix ++ windows;
+3 -3
View File
@@ -1,7 +1,7 @@
import ./generic.nix {
version = "7.0.9";
hash = "sha256-JoHF49n2HWMHl/LMWxQlj7utkmzyZ5pHEfeSU8gjyfU=";
npmDepsHash = "sha256-9U2I+JzDGQlfjyvZRbfPbDMmoHxIJ/SOBhMdn1la0EI=";
version = "7.0.10";
hash = "sha256-shPrbWuNmoSYXcL0QcgNjapdoWnO3/2h6eUFdMnteR4=";
npmDepsHash = "sha256-RR1FVbyXgeXAWkNYjgleAE7hPqVur00bO1jF3WhGYKA=";
vendorHash = "sha256-hfbNyCQMQzDzJxFc2MPAR4+v/qNcnORiQNbwbbIA4Nw=";
lts = true;
nixUpdateExtraArgs = [
+3 -3
View File
@@ -1,7 +1,7 @@
import ./generic.nix {
version = "9.0.0";
hash = "sha256-GzkuJ2aJ7I4/xDLLIrwcgXuInXoXzMWvQ7Z1mdGaOPw=";
npmDepsHash = "sha256-UFUNOR+ks3hDmT7uVEToX+rMmlFL6gQqigAxl6RP37Q=";
version = "9.0.1";
hash = "sha256-j+lgLorwSEgWrg45GtEKgXEqb38pHtkZ3CgqRSKbXKk=";
npmDepsHash = "sha256-SD+xCFESNZQJJH/daSycEZsYiFdVSJFAncbP49PiMh0=";
vendorHash = "sha256-j3BY6fEXCL82TDna80vjL25FDFLUhyMtmQW8d6GLQdk=";
lts = false;
nixUpdateExtraArgs = [
+4 -4
View File
@@ -17,18 +17,18 @@
}:
rustPlatform.buildRustPackage rec {
pname = "lrcget";
version = "0.4.0";
version = "0.5.0";
src = fetchFromGitHub {
owner = "tranxuanthang";
repo = "lrcget";
rev = "${version}";
hash = "sha256-OrmSaRKhGCl5sTirzICx8PBsQm23pYUBBtb07+P1ZbY=";
hash = "sha256-phsiVscbgQwMVWwVizb1n/6OlftQYWvkJ5+As5ITFrQ=";
};
sourceRoot = "${src.name}/src-tauri";
cargoHash = "sha256-V9+/sfCxeZJ39nOuMBv2YlkzewoS+N3kFyBGdIqkw/A=";
cargoHash = "sha256-mHti3KLjKe25qPLFf0ofzcM2wU4nvhiusIC4bpUdtiY=";
frontend = buildNpmPackage {
inherit version src;
@@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec {
# To fix `npm ERR! Your cache folder contains root-owned files`
makeCacheWritable = true;
npmDepsHash = "sha256-qQ5UMO3UuD6IvUveTRF35qTlGq5PMbxp1Q4UroDqVtk=";
npmDepsHash = "sha256-vjDj3b7GVZvM9ioVBp5JpRbWUa33EK6qFTDVgCZkGRA=";
postBuild = ''
cp -r dist/ $out
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "octoscan";
version = "0.1.1";
version = "0.1.2";
src = fetchFromGitHub {
owner = "synacktiv";
repo = "octoscan";
rev = "refs/tags/v${version}";
hash = "sha256-KoNM+Wqv+NmlXHYUn5YIXrG4rHkccVk2QWsNd0iK8YI=";
hash = "sha256-v8KINZwVH/AqRKLaornIOu7VsmjbQ6CuejXgKaomWso=";
};
vendorHash = "sha256-9IT8qTFzn8otWGTBP7ODcT8iBckIJ/3+jkbF1dq6aDw=";
+396 -321
View File
File diff suppressed because it is too large Load Diff
+4 -4
View File
@@ -3,19 +3,19 @@
, lib
}:
(php.withExtensions ({ enabled, all }: enabled ++ [ all.pcov ])).buildComposerProject (finalAttrs: {
(php.withExtensions ({ enabled, all }: enabled ++ [ all.pcov ])).buildComposerProject2 (finalAttrs: {
pname = "paratest";
version = "7.4.3";
version = "7.6.0";
src = fetchFromGitHub {
owner = "paratestphp";
repo = "paratest";
rev = "v${finalAttrs.version}";
hash = "sha256-Shf/fsGhDmupFn/qERzXGg3ko7mBgUqYzafO/VPqmoU=";
hash = "sha256-p7m/MDHy+NOh+MnoIWy74Ipm/5hevp4x6Qwn4uPIEAM=";
};
composerLock = ./composer.lock;
vendorHash = "sha256-9KFh6Vwzt17v6WlEutRpwCauLOcj05hR4JGDcPbYL1U=";
vendorHash = "sha256-NQWwfSYgvAmvWnr563vAKh+IdFRDB/CJZReDUzftOvw=";
meta = {
changelog = "https://github.com/paratestphp/paratest/releases/tag/v${finalAttrs.version}";
+2
View File
@@ -220,6 +220,8 @@ python.pkgs.buildPythonApplication rec {
"test_schedule_page_text_table"
"test_schedule_page_text_wrong_format"
"test_versioned_schedule_page"
# Test is racy
"test_can_reset_password_by_email"
];
passthru = {
@@ -1,30 +1,33 @@
{ lib, stdenv
, fetchFromGitLab
, glm
, glslang
, meson
, ninja
, openxr-loader
, pkg-config
, vulkan-headers
, vulkan-loader
, xxd
, SDL2
, makeWrapper
, libGL
, glib
{
SDL2,
fetchFromGitLab,
glib,
glm,
glslang,
lib,
libGL,
makeWrapper,
meson,
ninja,
openxr-loader,
pkg-config,
stdenv,
unstableGitUpdater,
vulkan-headers,
vulkan-loader,
xxd,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "xrgears";
version = "unstable-2021-06-19";
version = "1.0.1-unstable-2024-07-09";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "monado";
repo = "demos/xrgears";
rev = "6331b98e065494995c9cc4b48ccdd9d5ccaef461";
sha256 = "sha256-buw2beTPIWScq+3VQjUyF+uOwS6VF+mnAPHZ2eFGZjc=";
rev = "9cabbd34b1f60f27402a9a50fc260f77a41b835b";
sha256 = "sha256-9VV1zAOZKkl1zzjnsQQQOINi+T+wpbltdWpJ/d66+cM=";
};
nativeBuildInputs = [
@@ -46,15 +49,25 @@ stdenv.mkDerivation rec {
fixupPhase = ''
wrapProgram $out/bin/xrgears \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ SDL2 libGL ]}
--prefix LD_LIBRARY_PATH : ${
lib.makeLibraryPath [
SDL2
libGL
]
}
'';
passthru.updateScript = unstableGitUpdater { };
meta = with lib; {
homepage = "https://gitlab.freedesktop.org/monado/demos/xrgears";
description = "OpenXR example using Vulkan for rendering";
mainProgram = "xrgears";
platforms = platforms.linux;
license = licenses.mit;
maintainers = with maintainers; [ expipiplus1 ];
maintainers = with maintainers; [
expipiplus1
Scrumplex
];
};
}
+2 -2
View File
@@ -8,14 +8,14 @@
python3Packages.buildPythonApplication rec {
pname = "zabbix-cli";
version = "3.1.2";
version = "3.1.3";
pyproject = true;
src = fetchFromGitHub {
owner = "usit-gd";
repo = "zabbix-cli";
rev = "refs/tags/${version}";
hash = "sha256-It0SVbGNIxf2i4gleqVRAZCIks/Tf/WYSAgipOC+HwE=";
hash = "sha256-hvLtc6owEOD29Y1oC7EmOOFp9P8hWOuj9N7qhtqkpks=";
};
pythonRelaxDeps = [ "click-repl" ];
@@ -69,7 +69,9 @@ runCommand "flutter-artifacts-${flutterPlatform}-${systemPlatform}"
lndir -silent '${flutter'}/bin/cache/dart-sdk' "$FLUTTER_ROOT/bin/cache/dart-sdk"
'' + ''
HOME="$(mktemp -d)" flutter precache -v '--${flutterPlatform}' ${builtins.concatStringsSep " " (map (p: "'--no-${p}'") (lib.remove flutterPlatform flutterPlatforms))}
HOME="$(mktemp -d)" flutter precache ${lib.optionalString (flutter ? engine && flutter.engine.meta.available) "--local-engine ${flutter.engine.outName}"} \
-v '--${flutterPlatform}' ${builtins.concatStringsSep " " (map (p: "'--no-${p}'") (lib.remove flutterPlatform flutterPlatforms))}
rm -rf "$FLUTTER_ROOT/bin/cache/lockfile"
'' + lib.optionalString (lib.versionAtLeast flutter'.version "3.26") ''
rm -rf "$FLUTTER_ROOT/bin/cache/dart-sdk"
@@ -100,7 +100,7 @@ runCommand
rm -rf $out/src/{buildtools,fuchsia}
rm -rf $out/src/flutter/{buildtools,prebuilts,third_party/swiftshader,third_party/gn/.versions}
rm -rf $out/src/flutter/{third_party/dart/tools/sdks/dart-sdk,third_party/ninja/ninja}
rm -rf $out/src/flutter/{third_party/dart/tools/sdks/dart-sdk,third_party/ninja/ninja,third_party/java}
rm -rf $out/src/third_party/{dart/tools/sdks/dart-sdk,libcxx/test}
rm -rf $out/.cipd $out/.gclient $out/.gclient_entries $out/.gclient_previous_custom_vars $out/.gclient_previous_sync_commits
@@ -71,6 +71,10 @@ in
sed -i 's/''${platform}/${host-constants.platform}/g' "$ensureFile"
sed -i 's/gn\/gn\/${stdenv-constants.platform}/gn\/gn\/${constants.platform}/g' "$ensureFile"
if grep flutter/java/openjdk "$ensureFile" >/dev/null; then
sed -i '/src\/flutter\/third_party\/java\/openjdk/,+2 d' "$ensureFile"
fi
else
params="$params $1"
shift 1
@@ -1,4 +1,4 @@
{ callPackage, symlinkJoin, lib }:
{ callPackage, symlinkJoin, stdenv, lib }:
let
nixpkgsRoot = "@nixpkgs_root@";
version = "@flutter_version@";
@@ -17,9 +17,11 @@ let
++ (map
(targetPlatform:
callPackage "${nixpkgsRoot}/pkgs/development/compilers/flutter/engine/source.nix" {
targetPlatform = lib.systems.elaborate targetPlatform;
hostPlatform = lib.systems.elaborate buildPlatform;
buildPlatform = lib.systems.elaborate buildPlatform;
stdenv = stdenv.override {
targetPlatform = lib.systems.elaborate targetPlatform;
hostPlatform = lib.systems.elaborate buildPlatform;
buildPlatform = lib.systems.elaborate buildPlatform;
};
flutterVersion = version;
version = engineVersion;
@@ -1,33 +1,33 @@
{
"version": "3.24.3",
"engineVersion": "36335019a8eab588c3c2ea783c618d90505be233",
"version": "3.24.4",
"engineVersion": "db49896cf25ceabc44096d5f088d86414e05a7aa",
"engineSwiftShaderHash": "sha256-mRLCvhNkmHz7Rv6GzXkY7OB1opBSq+ATWZ466qZdgto=",
"engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f",
"channel": "stable",
"engineHashes": {
"aarch64-linux": {
"aarch64-linux": "sha256-D0TiOX/dkGIia+diy+vDy9ufFkbtbh2s4z+oKE83kr0=",
"x86_64-linux": "sha256-D0TiOX/dkGIia+diy+vDy9ufFkbtbh2s4z+oKE83kr0="
"aarch64-linux": "sha256-/jkMlcE0AZFWgTtUaUk8e/RxD31mObG91C6nfLzXdYU=",
"x86_64-linux": "sha256-/jkMlcE0AZFWgTtUaUk8e/RxD31mObG91C6nfLzXdYU="
},
"x86_64-linux": {
"aarch64-linux": "sha256-MhZW4ymqh513WCxPrWEw0zEGwcEfkt6o5T8xfQfNXqs=",
"x86_64-linux": "sha256-MhZW4ymqh513WCxPrWEw0zEGwcEfkt6o5T8xfQfNXqs="
"aarch64-linux": "sha256-/jkMlcE0AZFWgTtUaUk8e/RxD31mObG91C6nfLzXdYU=",
"x86_64-linux": "sha256-/jkMlcE0AZFWgTtUaUk8e/RxD31mObG91C6nfLzXdYU="
}
},
"dartVersion": "3.5.3",
"dartVersion": "3.5.4",
"dartHash": {
"x86_64-linux": "sha256-/Y8w88OAtAk0hjWyD2B2lWdQCZ76QZ9N8Bf7n7yd4EE=",
"aarch64-linux": "sha256-6GxmguNxSkbZ5eLleoH+1o0DHH6G4udNqIm2W++4Kco=",
"x86_64-darwin": "sha256-g0afx9CYOdEHmrUo2IP9yM/gHSb4QblrDfGyGqoDO8s=",
"aarch64-darwin": "sha256-AgHSytmxf55kD9bsvRM74Z28SFor0CX7sGIgUybRHXs="
"x86_64-linux": "sha256-jHyCMOkrd8DEq/IBqCMTqJg9uFkcoAwHiJBFNUHENZY=",
"aarch64-linux": "sha256-fFHpWvwKYBC4fbKTMwfhemu4RCdyAqj+cIJgcoE1P30=",
"x86_64-darwin": "sha256-9BJL3FjwmPbJw2pdiXH0EjPqjaYavzxt6ohyNKAeyOg=",
"aarch64-darwin": "sha256-tebVH1N2VtPnyecH6wYyptkE0xjINpPv/mvKgaucBHk="
},
"flutterHash": "sha256-7MyvXIsj0OX2h++lXmKEQqxM+6bvGGt5WxIwYC5lz2M=",
"flutterHash": "sha256-ykR2ul5JWEvopTMqXvRCAfqZ8ZlirNu0txVczWc/Nvg=",
"artifactHashes": {
"android": {
"aarch64-darwin": "sha256-2MJbj1wt7c/fMG5uca9dq9t+fdGE/f2vaDpDoBSI5Jo=",
"aarch64-linux": "sha256-LHA4MeiqXCwsSAWWxidah2g+VEIijmUkoJ4S9X6Fetg=",
"x86_64-darwin": "sha256-2MJbj1wt7c/fMG5uca9dq9t+fdGE/f2vaDpDoBSI5Jo=",
"x86_64-linux": "sha256-LHA4MeiqXCwsSAWWxidah2g+VEIijmUkoJ4S9X6Fetg="
"aarch64-darwin": "sha256-LlTVOf+8AixZ/W5J+dlagdldwZTE7D2aA3tWYi3te+8=",
"aarch64-linux": "sha256-XfsBmIjmPzU+VNJvqu6uXOcKUwfUPXXoL2hUPso3DNo=",
"x86_64-darwin": "sha256-LlTVOf+8AixZ/W5J+dlagdldwZTE7D2aA3tWYi3te+8=",
"x86_64-linux": "sha256-XfsBmIjmPzU+VNJvqu6uXOcKUwfUPXXoL2hUPso3DNo="
},
"fuchsia": {
"aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=",
@@ -36,38 +36,38 @@
"x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk="
},
"ios": {
"aarch64-darwin": "sha256-M9vVSuUW71+ChyFPaRO3gqJdAe9U7rLCRFqWYT0egDc=",
"aarch64-linux": "sha256-M9vVSuUW71+ChyFPaRO3gqJdAe9U7rLCRFqWYT0egDc=",
"x86_64-darwin": "sha256-M9vVSuUW71+ChyFPaRO3gqJdAe9U7rLCRFqWYT0egDc=",
"x86_64-linux": "sha256-M9vVSuUW71+ChyFPaRO3gqJdAe9U7rLCRFqWYT0egDc="
"aarch64-darwin": "sha256-LilLQf/+aBaaG7nVMSd4Ms36e1yos+yH6mbZQxukh8E=",
"aarch64-linux": "sha256-LilLQf/+aBaaG7nVMSd4Ms36e1yos+yH6mbZQxukh8E=",
"x86_64-darwin": "sha256-LilLQf/+aBaaG7nVMSd4Ms36e1yos+yH6mbZQxukh8E=",
"x86_64-linux": "sha256-LilLQf/+aBaaG7nVMSd4Ms36e1yos+yH6mbZQxukh8E="
},
"linux": {
"aarch64-darwin": "sha256-8I8g0Pp/mfGo2THwIBztQRm2iravHTWD9fz7OFn0fmk=",
"aarch64-linux": "sha256-8I8g0Pp/mfGo2THwIBztQRm2iravHTWD9fz7OFn0fmk=",
"x86_64-darwin": "sha256-QBx3qm860fQT3+NQ36eVxzkPCS4Z4/LbbkqQ6VU5eeo=",
"x86_64-linux": "sha256-QBx3qm860fQT3+NQ36eVxzkPCS4Z4/LbbkqQ6VU5eeo="
"aarch64-darwin": "sha256-876g3jlrzaAiVN8zYbQe2B2eCXi7gygQNNZH+NSH6IU=",
"aarch64-linux": "sha256-876g3jlrzaAiVN8zYbQe2B2eCXi7gygQNNZH+NSH6IU=",
"x86_64-darwin": "sha256-zbyMRvUGIGj1Zk/U8xC/bewKAtWssWnAvQFj3wb8XcM=",
"x86_64-linux": "sha256-zbyMRvUGIGj1Zk/U8xC/bewKAtWssWnAvQFj3wb8XcM="
},
"macos": {
"aarch64-darwin": "sha256-li5Ry3h36fUvSLXMAhAFdu0y9ShzpF2JWHR/a+1rO0A=",
"aarch64-linux": "sha256-li5Ry3h36fUvSLXMAhAFdu0y9ShzpF2JWHR/a+1rO0A=",
"x86_64-darwin": "sha256-li5Ry3h36fUvSLXMAhAFdu0y9ShzpF2JWHR/a+1rO0A=",
"x86_64-linux": "sha256-li5Ry3h36fUvSLXMAhAFdu0y9ShzpF2JWHR/a+1rO0A="
"aarch64-darwin": "sha256-mNKPcQh8cn3C45kQ474crY9vmWBdR8MdlLMCXofqv9w=",
"aarch64-linux": "sha256-mNKPcQh8cn3C45kQ474crY9vmWBdR8MdlLMCXofqv9w=",
"x86_64-darwin": "sha256-mNKPcQh8cn3C45kQ474crY9vmWBdR8MdlLMCXofqv9w=",
"x86_64-linux": "sha256-mNKPcQh8cn3C45kQ474crY9vmWBdR8MdlLMCXofqv9w="
},
"universal": {
"aarch64-darwin": "sha256-obWaVD7+q+OihPWhB92tkeWJmwFcA+Ut/139SCAmMyc=",
"aarch64-linux": "sha256-MCEvE3K+/qrEue8pU9E4MJb7ZSqgTm2MB73eEe55s1s=",
"x86_64-darwin": "sha256-UnNwbawZuPbetL/LehNkqJ+cQnrFX+rcSfDgVhGLuks=",
"x86_64-linux": "sha256-D2g7wgDKqOXx9Yk/ojbOUBiTKBfwgKSUejgzlNiXY0Q="
"aarch64-darwin": "sha256-SVrhfvGunkEKraIapt2PcNr4VzWI9d5DYMwkE82hKC8=",
"aarch64-linux": "sha256-N4/BCd8JTXqMdfX65IhKlZo7EK88t0I47QVoqdlOg7s=",
"x86_64-darwin": "sha256-GdBinxPZHgYZdmHvtcT9+qPGadZKqWTOIHJcIJwN2rU=",
"x86_64-linux": "sha256-a/AMUZC3n4e/TAquu076vXq+4cuODYJyvIrayTw4o5U="
},
"web": {
"aarch64-darwin": "sha256-ox+KytkK7lMVuTOk2eRwn+7TftUJ+AkXaZ8cUgwBzt4=",
"aarch64-linux": "sha256-ox+KytkK7lMVuTOk2eRwn+7TftUJ+AkXaZ8cUgwBzt4=",
"x86_64-darwin": "sha256-ox+KytkK7lMVuTOk2eRwn+7TftUJ+AkXaZ8cUgwBzt4=",
"x86_64-linux": "sha256-ox+KytkK7lMVuTOk2eRwn+7TftUJ+AkXaZ8cUgwBzt4="
"aarch64-darwin": "sha256-9JyId7oDRkwjjQp9tdD/LMiKs/DMorO/vyfxRcb+q8g=",
"aarch64-linux": "sha256-9JyId7oDRkwjjQp9tdD/LMiKs/DMorO/vyfxRcb+q8g=",
"x86_64-darwin": "sha256-9JyId7oDRkwjjQp9tdD/LMiKs/DMorO/vyfxRcb+q8g=",
"x86_64-linux": "sha256-9JyId7oDRkwjjQp9tdD/LMiKs/DMorO/vyfxRcb+q8g="
},
"windows": {
"x86_64-darwin": "sha256-hmUQ1XG47FDwlY6gyFWyPQaXc9ZGm02ViCb/K/ypcRU=",
"x86_64-linux": "sha256-hmUQ1XG47FDwlY6gyFWyPQaXc9ZGm02ViCb/K/ypcRU="
"x86_64-darwin": "sha256-EvESJuNqDpnXw3RuEM11tq5k+DGF3Ytm4fqw1WT9dbI=",
"x86_64-linux": "sha256-EvESJuNqDpnXw3RuEM11tq5k+DGF3Ytm4fqw1WT9dbI="
}
},
"pubspecLock": {
@@ -272,11 +272,11 @@
"dependency": "direct main",
"description": {
"name": "dds",
"sha256": "14dcd48de0c83e98528d6da555de03c29d52b6711a82eb8c5495d41a110becec",
"sha256": "f3bca60b6b7d2b005268a1a579c82e38bec3d85cc85c332a872fe623c7ba94d7",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.2.4+1"
"version": "4.2.4+2"
},
"dds_service_extensions": {
"dependency": "direct main",
@@ -5,9 +5,13 @@
"engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f",
"channel": "beta",
"engineHashes": {
"aarch64-linux": {
"aarch64-linux": "sha256-cDXCGikGuPWxMZZ0HWcnbS7Dt22no9wwbh4wei7w8Bw=",
"x86_64-linux": "sha256-cDXCGikGuPWxMZZ0HWcnbS7Dt22no9wwbh4wei7w8Bw="
},
"x86_64-linux": {
"aarch64-linux": "sha256-tOrgkuPsQedWjCObrwZ9ICY15YWi+aVpxOQPE6vdeGc=",
"x86_64-linux": "sha256-tOrgkuPsQedWjCObrwZ9ICY15YWi+aVpxOQPE6vdeGc="
"aarch64-linux": "sha256-cDXCGikGuPWxMZZ0HWcnbS7Dt22no9wwbh4wei7w8Bw=",
"x86_64-linux": "sha256-cDXCGikGuPWxMZZ0HWcnbS7Dt22no9wwbh4wei7w8Bw="
}
},
"dartVersion": "3.6.0-216.1.beta",
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,19 @@
diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart
index 252021cf78..e50ef0885d 100644
--- a/packages/flutter_tools/lib/src/flutter_cache.dart
+++ b/packages/flutter_tools/lib/src/flutter_cache.dart
@@ -51,14 +51,6 @@ class FlutterCache extends Cache {
registerArtifact(IosUsbArtifacts(artifactName, this, platform: platform));
}
registerArtifact(FontSubsetArtifacts(this, platform: platform));
- registerArtifact(PubDependencies(
- logger: logger,
- // flutter root and pub must be lazily initialized to avoid accessing
- // before the version is determined.
- flutterRoot: () => Cache.flutterRoot!,
- pub: () => pub,
- projectFactory: projectFactory,
- ));
}
}
@@ -0,0 +1,30 @@
diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart
index e4e474ab6e..5548599802 100644
--- a/packages/flutter_tools/lib/src/runner/flutter_command.dart
+++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart
@@ -1693,7 +1693,7 @@ Run 'flutter -h' (or 'flutter <command> -h') for available flutter commands and
// Populate the cache. We call this before pub get below so that the
// sky_engine package is available in the flutter cache for pub to find.
- if (shouldUpdateCache) {
+ if (false) {
// First always update universal artifacts, as some of these (e.g.
// ios-deploy on macOS) are required to determine `requiredArtifacts`.
final bool offline;
diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
index 50783f8435..db94062840 100644
--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
@@ -377,11 +377,7 @@ class FlutterCommandRunner extends CommandRunner<void> {
globals.analytics.suppressTelemetry();
}
- globals.flutterVersion.ensureVersionFile();
final bool machineFlag = topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false;
- if (await _shouldCheckForUpdates(topLevelResults, topLevelMachineFlag: machineFlag)) {
- await globals.flutterVersion.checkFlutterVersionFreshness();
- }
// See if the user specified a specific device.
final String? specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?;
@@ -0,0 +1,69 @@
From 6df275df3b8694daf16302b407520e3b1dee6724 Mon Sep 17 00:00:00 2001
From: Philip Hayes <philiphayes9@gmail.com>
Date: Thu, 12 Sep 2024 13:23:00 -0700
Subject: [PATCH] fix: cleanup xcode_backend.sh to fix iOS build w/
`NixOS/nixpkgs` flutter
This patch cleans up `xcode_backend.sh`. It now effectively just runs
`exec $FLUTTER_ROOT/bin/dart ./xcode_backend.dart`.
The previous `xcode_backend.sh` tries to discover `$FLUTTER_ROOT` from
argv[0], even though its presence is already guaranteed (the wrapped
`xcode_backend.dart` also relies on this env).
When using nixpkgs flutter, the flutter SDK directory is composed of several
layers, joined together using symlinks (called a `symlinkJoin`). Without this
patch, the auto-discover traverses the symlinks into the wrong layer, and so it
uses an "unwrapped" `dart` command instead of a "wrapped" dart that sets some
important envs/flags (like `$FLUTTER_ROOT`).
Using the "unwrapped" dart then manifests in this error when compiling, since
it doesn't see the ios build-support artifacts:
```
$ flutter run -d iphone
Running Xcode build...
Xcode build done. 6.4s
Failed to build iOS app
Error (Xcode): Target debug_unpack_ios failed: Error: Flutter failed to create a directory at "/<nix-store>/XXXX-flutter-3.24.1-unwrapped/bin/cache/artifacts".
```
---
packages/flutter_tools/bin/xcode_backend.sh | 25 ++++-----------------
1 file changed, 4 insertions(+), 21 deletions(-)
diff --git a/packages/flutter_tools/bin/xcode_backend.sh b/packages/flutter_tools/bin/xcode_backend.sh
index 2889d7c8e4..48b9d06c6e 100755
--- a/packages/flutter_tools/bin/xcode_backend.sh
+++ b/packages/flutter_tools/bin/xcode_backend.sh
@@ -6,24 +6,7 @@
# exit on error, or usage of unset var
set -euo pipefail
-# Needed because if it is set, cd may print the path it changed to.
-unset CDPATH
-
-function follow_links() (
- cd -P "$(dirname -- "$1")"
- file="$PWD/$(basename -- "$1")"
- while [[ -h "$file" ]]; do
- cd -P "$(dirname -- "$file")"
- file="$(readlink -- "$file")"
- cd -P "$(dirname -- "$file")"
- file="$PWD/$(basename -- "$file")"
- done
- echo "$file"
-)
-
-PROG_NAME="$(follow_links "${BASH_SOURCE[0]}")"
-BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)"
-FLUTTER_ROOT="$BIN_DIR/../../.."
-DART="$FLUTTER_ROOT/bin/dart"
-
-"$DART" "$BIN_DIR/xcode_backend.dart" "$@"
+# Run `dart ./xcode_backend.dart` with the dart from $FLUTTER_ROOT.
+dart="${FLUTTER_ROOT}/bin/dart"
+xcode_backend_dart="${BASH_SOURCE[0]%.sh}.dart"
+exec "${dart}" "${xcode_backend_dart}" "$@"
--
2.46.0
@@ -0,0 +1,44 @@
This patch introduces an intermediate Gradle build step to alter the behavior
of flutter_tools' Gradle project, specifically moving the creation of `build`
and `.gradle` directories from within the Nix Store to somewhere in `$HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev`.
Without this patch, flutter_tools' Gradle project tries to generate `build` and `.gradle`
directories within the Nix Store. Resulting in read-only errors when trying to build a
Flutter Android app at runtime.
This patch takes advantage of the fact settings.gradle takes priority over settings.gradle.kts to build the intermediate Gradle project
when a Flutter app runs `includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")`
`rootProject.buildFileName = "/dev/null"` so that the intermediate project doesn't use `build.gradle.kts` that's in the same directory.
The intermediate project makes a `settings.gradle` file in `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/` and `includeBuild`s it.
This Gradle project will build the actual `packages/flutter_tools/gradle` project by setting
`rootProject.projectDir = new File("$settingsDir")` and `apply from: new File("$settingsDir/settings.gradle.kts")`.
Now the `.gradle` will be built in `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/`, but `build` doesn't.
To move `build` to `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/` as well, we need to set `buildDirectory`.
diff --git a/packages/flutter_tools/gradle/settings.gradle b/packages/flutter_tools/gradle/settings.gradle
new file mode 100644
index 0000000000..b2485c94b4
--- /dev/null
+++ b/packages/flutter_tools/gradle/settings.gradle
@@ -0,0 +1,19 @@
+rootProject.buildFileName = "/dev/null"
+
+def engineShortRev = (new File("$settingsDir/../../../bin/internal/engine.version")).text.take(10)
+def dir = new File("$System.env.HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev")
+dir.mkdirs()
+def file = new File(dir, "settings.gradle")
+
+file.text = """
+rootProject.projectDir = new File("$settingsDir")
+apply from: new File("$settingsDir/settings.gradle.kts")
+
+gradle.allprojects { project ->
+ project.beforeEvaluate {
+ project.layout.buildDirectory = new File("$dir/build")
+ }
+}
+"""
+
+includeBuild(dir)
@@ -5,6 +5,7 @@
, openssl
, zlib
, libuv
, removeReferencesTo
# External poll is required for e.g. mosquitto, but discouraged by the maintainer.
, withExternalPoll ? false
}:
@@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
buildInputs = [ openssl zlib libuv ];
nativeBuildInputs = [ cmake ];
nativeBuildInputs = [ cmake removeReferencesTo ];
cmakeFlags = [
"-DLWS_WITH_PLUGINS=ON"
@@ -42,6 +43,7 @@ stdenv.mkDerivation rec {
);
postInstall = ''
find "$out" -type f -exec remove-references-to -t ${stdenv.cc.cc} '{}' +
# Fix path that will be incorrect on move to "dev" output.
substituteInPlace "$out/lib/cmake/libwebsockets/LibwebsocketsTargets-release.cmake" \
--replace "\''${_IMPORT_PREFIX}" "$out"
+1 -1
View File
@@ -307,7 +307,7 @@ let
$out/bin/${o.program} \
--add-flags "${toString o.flags}" \
--set ASDF "${o.asdfFasl}/asdf.${o.faslExt}" \
--prefix CL_SOURCE_REGISTRY : "$CL_SOURCE_REGISTRY" \
--prefix CL_SOURCE_REGISTRY : "$CL_SOURCE_REGISTRY''${CL_SOURCE_REGISTRY:+:}" \
--prefix ASDF_OUTPUT_TRANSLATIONS : "$(echo $CL_SOURCE_REGISTRY | sed s,//:,::,g):" \
--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \
--prefix DYLD_LIBRARY_PATH : "$DYLD_LIBRARY_PATH" \
@@ -555,14 +555,14 @@ buildLuarocksPackage {
fzf-lua = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
buildLuarocksPackage {
pname = "fzf-lua";
version = "0.0.1476-1";
version = "0.0.1479-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/fzf-lua-0.0.1476-1.rockspec";
sha256 = "1k3qmxraf906652lkn0l0r9lh1j7hdxzrklr570dj1jai292n433";
url = "mirror://luarocks/fzf-lua-0.0.1479-1.rockspec";
sha256 = "1xj0vw2y9y0ff88gcsh1q8vg9lsrsak435pzx8bizpcxkpaqizc4";
}).outPath;
src = fetchzip {
url = "https://github.com/ibhagwan/fzf-lua/archive/fc0f2b5781587d388b743c2c114127a7036d1a31.zip";
sha256 = "08k9xmnkjian4mr5ak7fzbw5v14rlhr6zl6a9nk4xq155p5qlk2s";
url = "https://github.com/ibhagwan/fzf-lua/archive/ce1e24f2a48089b65deefcb0a71a9856839002b5.zip";
sha256 = "0nfihl95bxrjmkin8wj6d8sznch695fk2wxkwk6wd92v5dlapypx";
};
disabled = luaOlder "5.1";
@@ -853,16 +853,16 @@ buildLuarocksPackage {
llscheck = callPackage({ ansicolors, argparse, buildLuarocksPackage, fetchFromGitHub, fetchurl, lua-cjson, luaOlder, luafilesystem, penlight }:
buildLuarocksPackage {
pname = "llscheck";
version = "0.5.0-1";
version = "0.6.0-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/llscheck-0.5.0-1.rockspec";
sha256 = "1bcyg1gphlgwmra8l1503yaw6wfihs1fksdvvp1y38zryhkvj0dy";
url = "mirror://luarocks/llscheck-0.6.0-1.rockspec";
sha256 = "1scgsjgsjbapqgwvwcd9l378sipin2w85mcjdi0fzgldsx87gwni";
}).outPath;
src = fetchFromGitHub {
owner = "jeffzi";
repo = "llscheck";
rev = "v0.5.0";
hash = "sha256-cG/FNzOwvLvrAEut4OvXI8WWSVzNEl4r3OgiSnp3S5c=";
rev = "v0.6.0";
hash = "sha256-XYfcVPiYCDrmuHyR1TN4QvsWIvbs86FN3UQYfrRHPiI=";
};
disabled = luaOlder "5.1";
@@ -1992,16 +1992,16 @@ buildLuarocksPackage {
luaprompt = callPackage({ argparse, buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }:
buildLuarocksPackage {
pname = "luaprompt";
version = "0.8-1";
version = "0.9-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/luaprompt-0.8-1.rockspec";
sha256 = "17v7yqkvm4rxszqvqk3f6a6vqysh80p18l1ryif79bc7ic948br4";
url = "mirror://luarocks/luaprompt-0.9-1.rockspec";
sha256 = "0bh4fpfrqbg9bappnrfr6blvl3lzc99plq7jac67mhph1bjki7rk";
}).outPath;
src = fetchFromGitHub {
owner = "dpapavas";
repo = "luaprompt";
rev = "v0.8";
hash = "sha256-GdI5sj7FBeb9q23oxVOzT+yVhMYTnggaN8Xt/z/2xZo=";
rev = "v0.9";
hash = "sha256-S6bzlIY1KlMK3wy01wGuRujGFgPxcNWmCaISQ87EBGs=";
};
disabled = luaOlder "5.1";
@@ -2064,16 +2064,16 @@ buildLuarocksPackage {
luarocks-build-rust-mlua = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl }:
buildLuarocksPackage {
pname = "luarocks-build-rust-mlua";
version = "0.2.2-1";
version = "0.2.3-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/luarocks-build-rust-mlua-0.2.2-1.rockspec";
sha256 = "0y9ms0cf0jp4b26m6qbxsj4s4ng4z112qq4wc79q7xm7zw9dha4p";
url = "mirror://luarocks/luarocks-build-rust-mlua-0.2.3-1.rockspec";
sha256 = "0vkbl2xcjjpi5gn7v2fr7nyyd7fg91zknrgm61cz91mwp4x5i3pf";
}).outPath;
src = fetchFromGitHub {
owner = "mlua-rs";
repo = "luarocks-build-rust-mlua";
rev = "0.2.2";
hash = "sha256-vyFX5LFGrC+RXjmwLgBdmVawOCNatJva53MFvKa7ozM=";
rev = "0.2.3";
hash = "sha256-SktU54lLaa9x6ntsyeaomsvCQJOtkJhIK/q5uDDFHqY=";
};
@@ -2492,14 +2492,14 @@ buildLuarocksPackage {
lz-n = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
buildLuarocksPackage {
pname = "lz.n";
version = "2.9.0-1";
version = "2.9.1-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/lz.n-2.9.0-1.rockspec";
sha256 = "1014pjjkk0m1hki95gj8zk8nv8nzq3ikaf44i3byg44n84r2if80";
url = "mirror://luarocks/lz.n-2.9.1-1.rockspec";
sha256 = "0x2xgmgxj9zvpa9x57981j3g21wm3zsylpwidk0wsbln7nag6b92";
}).outPath;
src = fetchzip {
url = "https://github.com/nvim-neorocks/lz.n/archive/v2.9.0.zip";
sha256 = "1l9w5dkagk10nqskj25903mkzra3fr8ds0xfvqry9a1aly79wkvy";
url = "https://github.com/nvim-neorocks/lz.n/archive/v2.9.1.zip";
sha256 = "1xk4m8i61aiwcd9k5xp3wpn3frxkkjy5fk2921qkma1vsadd83yk";
};
disabled = luaOlder "5.1";
@@ -3072,14 +3072,14 @@ buildLuarocksPackage {
rocks-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, fidget-nvim, fzy, luaOlder, luarocks, nvim-nio, rtp-nvim, toml-edit }:
buildLuarocksPackage {
pname = "rocks.nvim";
version = "2.40.5-1";
version = "2.41.0-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/rocks.nvim-2.40.5-1.rockspec";
sha256 = "0cbj6aqw4f36lc4y4jksr4s6dp0vhzw0pj3kd1fi0vclc8g77q1z";
url = "mirror://luarocks/rocks.nvim-2.41.0-1.rockspec";
sha256 = "1srhz85sfhkzlsy68mvwhdixvwz0awhrn530sny0287zhnrxrilp";
}).outPath;
src = fetchzip {
url = "https://github.com/nvim-neorocks/rocks.nvim/archive/v2.40.5.zip";
sha256 = "1vkjd8dasz8vhpnyjvvvwfpkakrfri6si242ga34wwf9jfg9bfbz";
url = "https://github.com/nvim-neorocks/rocks.nvim/archive/v2.41.0.zip";
sha256 = "0j44chcziimqn6jm2ckbwmn97nin0dwhnnrdpm87j754kbqsj21a";
};
disabled = luaOlder "5.1";
@@ -3338,8 +3338,8 @@ buildLuarocksPackage {
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
rev = "df534c3042572fb958586facd02841e10186707c";
hash = "sha256-HWNfj3/b+CUFgWR26IzAuMzlSCEuiK/7n8tWHwqAAik=";
rev = "37dc9233a473dd6c3f54456ef9994d8f77c80211";
hash = "sha256-zidYSt0WrnATuCpSGGhYuafNpPPN6dJ6hEuCgFytfEk=";
};
disabled = lua.luaversion != "5.1";
@@ -3420,7 +3420,7 @@ buildLuarocksPackage {
nativeBuildInputs = [ luarocks-build-rust-mlua ];
meta = {
homepage = "https://github.com/vhyrro/toml-edit.lua";
homepage = "https://github.com/nvim-neorocks/toml-edit.lua";
description = "TOML Parser + Formatting and Comment-Preserving Editor";
maintainers = with lib.maintainers; [ mrcjkb ];
license.fullName = "MIT";
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "airthings-ble";
version = "0.9.1";
version = "0.9.2";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "vincegio";
repo = "airthings-ble";
rev = "refs/tags/${version}";
hash = "sha256-pk/S0ufzirH4Xny0+nFVH366d0imqB2K6NvkGP7jAU4=";
hash = "sha256-m2jsXLrj2yS2Wi2dSwyxBv/nXmU738gd5iJ1JVfakUg=";
};
postPatch = ''
@@ -1,17 +1,17 @@
{
lib,
buildPythonPackage,
pythonOlder,
fetchFromGitHub,
setuptools,
arviz,
blackjax,
buildPythonPackage,
fetchFromGitHub,
formulae,
graphviz,
numpyro,
pandas,
pymc,
blackjax,
numpyro,
pytestCheckHook,
pythonOlder,
setuptools-scm,
}:
buildPythonPackage rec {
@@ -19,7 +19,7 @@ buildPythonPackage rec {
version = "0.14.0";
pyproject = true;
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.10";
src = fetchFromGitHub {
owner = "bambinos";
@@ -28,9 +28,9 @@ buildPythonPackage rec {
hash = "sha256-kxrNNbZfC96/XHb1I7aUHYZdFJvGR80ZI8ell/0FQXc=";
};
nativeBuildInputs = [ setuptools ];
build-system = [ setuptools-scm ];
propagatedBuildInputs = [
dependencies = [
arviz
formulae
graphviz
@@ -38,9 +38,10 @@ buildPythonPackage rec {
pymc
];
preCheck = ''
export HOME=$(mktemp -d)
'';
# bayeux-ml is not available in nixpkgs
# optional-dependencies = {
# jax = [ bayeux-ml ];
# };
nativeCheckInputs = [
blackjax
@@ -48,6 +49,10 @@ buildPythonPackage rec {
pytestCheckHook
];
preCheck = ''
export HOME=$(mktemp -d)
'';
disabledTests = [
# Tests require network access
"test_alias_equal_to_name"
@@ -65,29 +70,38 @@ buildPythonPackage rec {
"test_group_effects"
"test_hdi_prob"
"test_legend"
"test_model_with_group_specific_effects"
"test_model_with_intercept"
"test_model_without_intercept"
"test_non_distributional_model"
"test_normal_with_splines"
"test_predict_offset"
"test_predict_new_groups"
"test_predict_new_groups_fail"
"test_predict_new_groups"
"test_predict_offset"
"test_set_alias_warnings"
"test_subplot_kwargs"
"test_transforms"
"test_use_hdi"
"test_with_groups"
"test_with_group_and_panel"
"test_with_groups"
"test_with_user_values"
];
disabledTestPaths = [
# bayeux-ml is not available
"tests/test_alternative_samplers.py"
# Tests require network access
"tests/test_interpret.py"
"tests/test_interpret_messages.py"
];
pythonImportsCheck = [ "bambi" ];
meta = with lib; {
homepage = "https://bambinos.github.io/bambi";
description = "High-level Bayesian model-building interface";
homepage = "https://bambinos.github.io/bambi";
changelog = "https://github.com/bambinos/bambi/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ bcdarwin ];
# https://github.com/NixOS/nixpkgs/issues/310940
broken = true;
};
}
@@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "django-otp-webauthn";
version = "0.4.0";
version = "0.3.0";
pyproject = true;
src = fetchPypi {
inherit version;
pname = "django_otp_webauthn";
hash = "sha256-BXwIjQjynTjFK+bNML5i35qxQ7TJeb4Xc+duS6Y+5Fk=";
hash = "sha256-+Y46/PDeXL9zayoZykaU63faQmnLHzYPmqJJeRBx+hs=";
};
build-system = [ hatchling ];
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "py-opensonic";
version = "5.1.1";
version = "5.2.0";
pyproject = true;
src = fetchFromGitHub {
owner = "khers";
repo = "py-opensonic";
rev = "v${version}";
hash = "sha256-wXTXuX+iIMEoALxsciopucmvBxAyEeiOgjJPrbD63gM=";
rev = "refs/tags/v${version}";
hash = "sha256-8QhYzGZ9b2pyzhl5vyAWhjxtvF/vaEa6Qcw+RBGzkTQ=";
};
build-system = [ setuptools ];
@@ -56,7 +56,7 @@
yq
];
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ "NIX_NPM_REGISTRY" ];
installPhase = ''
runHook preInstall
@@ -82,6 +82,7 @@
--ignore-scripts \
${lib.escapeShellArgs filterFlags} \
${lib.escapeShellArgs pnpmInstallFlags} \
--registry="$NIX_NPM_REGISTRY" \
--frozen-lockfile
runHook postInstall
@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "supabase-cli";
version = "1.202.3";
version = "1.210.1";
src = fetchFromGitHub {
owner = "supabase";
repo = "cli";
rev = "v${version}";
hash = "sha256-ikwOG2hbip44fStcIXVuZ4Y2hrt9of2jKavp35OJs1I=";
hash = "sha256-QQfuoM+CQIvQarEkfKlca8RBZkreesyjrrfSxrpUlCg=";
};
vendorHash = "sha256-1g+J7IEkslASyLlfk0zxaFVpNtYDmfZPjkHcAiUzQDM=";
vendorHash = "sha256-akNozQxElu+/BA5tDXRUPlMrQ2DBm2i713ZrQbwC4I0=";
ldflags = [
"-s"
+6 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, nixosTests }:
{ stdenv, lib, fetchFromGitHub, nixosTests, nix-update-script }:
stdenv.mkDerivation rec {
pname = "rss-bridge";
@@ -16,8 +16,11 @@ stdenv.mkDerivation rec {
cp -R ./* $out
'';
passthru.tests = {
basic-functionality = nixosTests.rss-bridge;
passthru = {
tests = {
basic-functionality = nixosTests.rss-bridge;
};
updateScript = nix-update-script { };
};
meta = with lib; {
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "clair";
version = "4.7.4";
version = "4.8.0";
src = fetchFromGitHub {
owner = "quay";
repo = pname;
rev = "v${version}";
hash = "sha256-NEivDkcMB6Upc8UJFFnCs4yjsENXP/qOK3X582VVbmY=";
hash = "sha256-itIjDdTKQ0PCfOkefXxqu6MpdWK3F1j6ArvaInQd/hc=";
};
vendorHash = "sha256-12nrMAGS7CRTq2Dr8Lnm9B/HTZAzJOaJ8TqTOHknCRE=";
vendorHash = "sha256-CpIOQiEjQGC6qeoxRS/jFohUnELefAX0KOERudL6BGM=";
nativeBuildInputs = [
makeWrapper
@@ -43,7 +43,7 @@ buildGoModule rec {
changelog = "https://github.com/turbot/steampipe-plugin-aws/blob/v${version}/CHANGELOG.md";
description = "AWS Plugin for Steampipe";
homepage = "https://github.com/turbot/steampipe-plugin-aws";
license = lib.licenses.apsl20;
license = lib.licenses.asl20;
longDescription = "Use SQL to instantly query AWS resources across regions and accounts.";
maintainers = with lib.maintainers; [ anthonyroussel ];
platforms = steampipe.meta.platforms;
@@ -43,7 +43,7 @@ buildGoModule rec {
changelog = "https://github.com/turbot/steampipe-plugin-github/blob/v${version}/CHANGELOG.md";
description = "GitHub Plugin for Steampipe";
homepage = "https://github.com/turbot/steampipe-plugin-github";
license = lib.licenses.apsl20;
license = lib.licenses.asl20;
longDescription = "Use SQL to instantly query repositories, users, gists and more from GitHub.";
maintainers = with lib.maintainers; [ anthonyroussel ];
platforms = steampipe.meta.platforms;
+1 -1
View File
@@ -70,7 +70,7 @@ buildFHSEnv {
jython
libcanberra-gtk3
libdrm
libudev0-shim
udev
libxkbcommon
mesa
nspr
+2 -2
View File
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "octodns";
version = "1.9.1";
version = "1.10.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "octodns";
repo = "octodns";
rev = "refs/tags/v${version}";
hash = "sha256-5EKa5G1rX/BRMMpGd861qTaACa2tBgNrKX52uJPV+N8=";
hash = "sha256-L3c4lYt/fgMctJFArc1XlR+hvpz10kcBcYYXajnNQr0=";
};
build-system = [
+6 -46
View File
@@ -1193,25 +1193,6 @@ dependencies = [
"crossbeam-utils",
]
[[package]]
name = "crossbeam-deque"
version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
dependencies = [
"crossbeam-epoch",
"crossbeam-utils",
]
[[package]]
name = "crossbeam-epoch"
version = "0.9.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
dependencies = [
"crossbeam-utils",
]
[[package]]
name = "crossbeam-utils"
version = "0.8.20"
@@ -4115,26 +4096,6 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
[[package]]
name = "rayon"
version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
dependencies = [
"either",
"rayon-core",
]
[[package]]
name = "rayon-core"
version = "1.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
dependencies = [
"crossbeam-deque",
"crossbeam-utils",
]
[[package]]
name = "redox_syscall"
version = "0.2.16"
@@ -4995,7 +4956,6 @@ dependencies = [
"libc",
"ntapi",
"once_cell",
"rayon",
"windows 0.52.0",
]
@@ -5751,7 +5711,7 @@ dependencies = [
[[package]]
name = "veilid-cli"
version = "0.4.0"
version = "0.4.1"
dependencies = [
"arboard",
"async-std",
@@ -5792,7 +5752,7 @@ dependencies = [
[[package]]
name = "veilid-core"
version = "0.4.0"
version = "0.4.1"
dependencies = [
"argon2",
"async-io 1.13.0",
@@ -5896,7 +5856,7 @@ dependencies = [
[[package]]
name = "veilid-flutter"
version = "0.4.0"
version = "0.4.1"
dependencies = [
"allo-isolate",
"android_log-sys 0.3.1",
@@ -5954,7 +5914,7 @@ dependencies = [
[[package]]
name = "veilid-server"
version = "0.4.0"
version = "0.4.1"
dependencies = [
"ansi_term",
"async-std",
@@ -6009,7 +5969,7 @@ dependencies = [
[[package]]
name = "veilid-tools"
version = "0.4.0"
version = "0.4.1"
dependencies = [
"android_logger 0.13.3",
"async-lock 3.4.0",
@@ -6067,7 +6027,7 @@ dependencies = [
[[package]]
name = "veilid-wasm"
version = "0.4.0"
version = "0.4.1"
dependencies = [
"cfg-if 1.0.0",
"console_error_panic_hook",
+2 -2
View File
@@ -14,13 +14,13 @@
rustPlatform.buildRustPackage rec {
pname = "veilid";
version = "0.4.0";
version = "0.4.1";
src = fetchFromGitLab {
owner = "veilid";
repo = pname;
rev = "v${version}";
hash = "sha256-5Xjdc66VA7FFk75jnTARCs2oGT/hWX8VPlZV48q6kpI=";
hash = "sha256-/RdPq2rHs+lfB3odwO7yRGFi3j0INdJvbWccTsGO54g=";
};
cargoLock = {
+3 -3
View File
@@ -11,16 +11,16 @@
buildGoModule rec {
pname = "gitleaks";
version = "8.21.0";
version = "8.21.2";
src = fetchFromGitHub {
owner = "zricethezav";
repo = "gitleaks";
rev = "refs/tags/v${version}";
hash = "sha256-oBX9V7OQ+t1hBLsYvX3u5BY8VSj2YGNJ/6qdJH6BVhg=";
hash = "sha256-1MCSGFpjYD4XdES+kJTz/NTN/B00TWMQ1Rmk/nsKf2Q=";
};
vendorHash = "sha256-BxuqNe021wfvFHpTRQtDImallBg2PcIX5qM7aLB+uH0=";
vendorHash = "sha256-iIgS0fXdiVMYKr3FZTYlCSEqqaH9sxZh1MFry9pGET8=";
ldflags = [
"-s"
+1 -2
View File
@@ -14444,6 +14444,7 @@ with pkgs;
flutterPackages-source = recurseIntoAttrs (callPackage ../development/compilers/flutter { useNixpkgsEngine = true; });
flutterPackages = flutterPackages-bin;
flutter = flutterPackages.stable;
flutter327 = flutterPackages.v3_27;
flutter326 = flutterPackages.v3_26;
flutter324 = flutterPackages.v3_24;
flutter319 = flutterPackages.v3_19;
@@ -33628,8 +33629,6 @@ with pkgs;
xrestop = callPackage ../tools/X11/xrestop { };
xrgears = callPackage ../applications/graphics/xrgears { };
xsd = callPackage ../development/libraries/xsd {
stdenv = gcc9Stdenv;
};