Merge staging-next into staging
This commit is contained in:
@@ -48,6 +48,7 @@ unzip.section.md
|
||||
validatePkgConfig.section.md
|
||||
versionCheckHook.section.md
|
||||
waf.section.md
|
||||
writable-tmpdir-as-home-hook.section.md
|
||||
zig.section.md
|
||||
xcbuild.section.md
|
||||
xfce4-dev-tools.section.md
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
# writableTmpDirAsHomeHook {#writableTmpDirAsHomeHook}
|
||||
|
||||
This setup hook provides a writable home directory for packages that require it.
|
||||
|
||||
To use, just add the hook to the `nativeBuildInputs` of the package.
|
||||
@@ -1040,6 +1040,9 @@
|
||||
"tar-files": [
|
||||
"index.html#tar-files"
|
||||
],
|
||||
"writableTmpDirAsHomeHook": [
|
||||
"index.html#writableTmpDirAsHomeHook"
|
||||
],
|
||||
"x86_64-darwin-26.05": [
|
||||
"release-notes.html#x86_64-darwin-26.05"
|
||||
],
|
||||
|
||||
@@ -8657,6 +8657,13 @@
|
||||
githubId = 88741530;
|
||||
name = "Fabian Rigoll";
|
||||
};
|
||||
fabiob = {
|
||||
email = "fabio@atelie.dev.br";
|
||||
github = "fabiob";
|
||||
githubId = 140875;
|
||||
name = "Fábio Batista";
|
||||
keys = [ { fingerprint = "D2D8 69D8 5EEC 30AD D327 B4A5 6CD5 5257 DB01 8B72"; } ];
|
||||
};
|
||||
fallenbagel = {
|
||||
name = "fallenbagel";
|
||||
github = "fallenbagel";
|
||||
@@ -15594,12 +15601,6 @@
|
||||
githubId = 4312404;
|
||||
name = "Chris Rendle-Short";
|
||||
};
|
||||
lightdiscord = {
|
||||
email = "root@arnaud.sh";
|
||||
github = "lightdiscord";
|
||||
githubId = 24509182;
|
||||
name = "Arnaud Pascal";
|
||||
};
|
||||
lightquantum = {
|
||||
email = "self@lightquantum.me";
|
||||
github = "PhotonQuantum";
|
||||
@@ -19237,6 +19238,12 @@
|
||||
name = "Naufal Fikri";
|
||||
keys = [ { fingerprint = "1575 D651 E31EC 6117A CF0AA C1A3B 8BBC A515 8835"; } ];
|
||||
};
|
||||
naurissteins = {
|
||||
name = "Nauris Steins";
|
||||
email = "me@naurissteins.com";
|
||||
github = "naurissteins";
|
||||
githubId = 5653746;
|
||||
};
|
||||
naxdy = {
|
||||
name = "Naxdy";
|
||||
email = "naxdy@naxdy.org";
|
||||
|
||||
@@ -49,6 +49,7 @@ lpeglabel,,,,1.6.0,,
|
||||
lrexlib-gnu,,,,,,
|
||||
lrexlib-oniguruma,,,,,,junestepp
|
||||
lrexlib-pcre,,,,,,
|
||||
lrexlib-pcre2,,,,,,wishstudio
|
||||
lrexlib-posix,,,,,,
|
||||
lsp-progress.nvim,,,,,5.1,gepbird
|
||||
lsqlite3,,,,,,
|
||||
|
||||
|
@@ -223,6 +223,8 @@
|
||||
|
||||
- `post-resume.target` has been removed. See {manpage}`systemd.special(7)` about `sleep.target` for instructions on ordering a process after resume with `ExecStop=`.
|
||||
|
||||
- `services.vsftpd` no longer automatically configures a PAM module. This means configurations using `services.vsftpd.localUsers` will no longer work unless `services.vsftpd.enableVirtualUsers` and `services.vsftpd.userDbPath` are also configured. The old behaviour can be restored by setting `security.pam.services.vsftpd.enable = true`, although this only ever worked by accident and may not be secure.
|
||||
|
||||
- `services.kubernetes.addons.dns.coredns` has been renamed to `services.kubernetes.addons.dns.corednsImage` and now expects a
|
||||
package instead of attrs. Now, by default, nixpkgs.coredns in conjunction with dockerTools.buildImage is used, instead
|
||||
of pulling the upstream container image from Docker Hub. If you want the old behavior, you can set:
|
||||
|
||||
@@ -33,7 +33,10 @@ in
|
||||
|
||||
enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
default = builtins.pathExists config.programs.command-not-found.dbPath;
|
||||
defaultText = lib.literalExpression ''
|
||||
builtins.pathExists config.programs.command-not-found.dbPath
|
||||
'';
|
||||
description = ''
|
||||
Whether interactive shells should show which Nix package (if
|
||||
any) provides a missing command.
|
||||
@@ -45,6 +48,11 @@ in
|
||||
};
|
||||
|
||||
dbPath = lib.mkOption {
|
||||
type = lib.types.path;
|
||||
default = pkgs.path + "/programs.sqlite";
|
||||
defaultText = lib.literalExpression ''
|
||||
pkgs.path + "/programs.sqlite"
|
||||
'';
|
||||
description = ''
|
||||
Absolute path to `programs.sqlite`, which contains mappings from binary names to package names.
|
||||
|
||||
@@ -54,39 +62,29 @@ in
|
||||
`/nix/var/nix/profiles/per-user/root/channels/nixos/programs.sqlite`.
|
||||
If you do so, you can update it with `sudo nix-channels --update`.
|
||||
'';
|
||||
type = lib.types.path;
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkMerge [
|
||||
{
|
||||
programs.command-not-found = {
|
||||
enable = lib.mkDefault (builtins.pathExists cfg.dbPath);
|
||||
dbPath = pkgs.path + "/programs.sqlite";
|
||||
};
|
||||
}
|
||||
config = lib.mkIf cfg.enable {
|
||||
programs.bash.interactiveShellInit = ''
|
||||
command_not_found_handle() {
|
||||
'${commandNotFound}/bin/command-not-found' "$@"
|
||||
}
|
||||
'';
|
||||
|
||||
(lib.mkIf cfg.enable {
|
||||
programs.bash.interactiveShellInit = ''
|
||||
command_not_found_handle() {
|
||||
'${commandNotFound}/bin/command-not-found' "$@"
|
||||
}
|
||||
'';
|
||||
programs.zsh.interactiveShellInit = ''
|
||||
command_not_found_handler() {
|
||||
'${commandNotFound}/bin/command-not-found' "$@"
|
||||
}
|
||||
'';
|
||||
|
||||
programs.zsh.interactiveShellInit = ''
|
||||
command_not_found_handler() {
|
||||
'${commandNotFound}/bin/command-not-found' "$@"
|
||||
}
|
||||
'';
|
||||
# NOTE: Fish by itself checks for nixos command-not-found, let's instead makes it explicit.
|
||||
programs.fish.interactiveShellInit = ''
|
||||
function fish_command_not_found
|
||||
"${commandNotFound}/bin/command-not-found" $argv
|
||||
end
|
||||
'';
|
||||
|
||||
# NOTE: Fish by itself checks for nixos command-not-found, let's instead makes it explicit.
|
||||
programs.fish.interactiveShellInit = ''
|
||||
function fish_command_not_found
|
||||
"${commandNotFound}/bin/command-not-found" $argv
|
||||
end
|
||||
'';
|
||||
|
||||
environment.systemPackages = [ commandNotFound ];
|
||||
})
|
||||
];
|
||||
environment.systemPackages = [ commandNotFound ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -47,6 +47,9 @@ in
|
||||
|
||||
{
|
||||
config = lib.mkIf (cfg.enable && nixPackage.pname == "lix") {
|
||||
# Require the tun kernel module for pasta, can be disabled if pasta is not used.
|
||||
boot.kernelModules.tun = lib.mkDefault true;
|
||||
|
||||
environment.systemPackages = [
|
||||
nixPackage
|
||||
pkgs.nix-info
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
|
||||
nodes = {
|
||||
server = {
|
||||
security.pam.services.vsftpd.enable = true;
|
||||
|
||||
services.vsftpd = {
|
||||
enable = true;
|
||||
userlistDeny = false;
|
||||
|
||||
@@ -21,9 +21,9 @@ let
|
||||
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.3.4.7/android-studio-panda4-patch1-linux.tar.gz";
|
||||
};
|
||||
betaVersion = {
|
||||
version = "2025.3.4.5"; # "Android Studio Panda 4 | 2025.3.4 RC 1"
|
||||
sha256Hash = "sha256-NiNq1j+rzPU4KsLKYymfi5/Vx2Bn3hK8I3OVIUFloX0=";
|
||||
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.3.4.5/android-studio-panda4-rc1-linux.tar.gz";
|
||||
version = "2026.1.1.6"; # "Android Studio Quail 1 | 2026.1.1 RC 1"
|
||||
sha256Hash = "sha256-b6PVgBTTjIgm6BI171RL7T6GJD9ApnTWGOTqvt703PQ=";
|
||||
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.1.6/android-studio-quail1-rc1-linux.tar.gz";
|
||||
};
|
||||
latestVersion = {
|
||||
version = "2026.1.2.2"; # "Android Studio Quail 2 | 2026.1.2 Canary 2"
|
||||
|
||||
@@ -84,8 +84,8 @@ buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "remote-ssh";
|
||||
publisher = "ms-vscode-remote";
|
||||
version = "0.122.0";
|
||||
hash = "sha256-apSBO3hsCSS2XTMQrqr+qqSnv3vRUJQ4U/ZOd4KlUJg=";
|
||||
version = "0.123.0";
|
||||
hash = "sha256-/9NyRSNUCx65FOA6w86e2DvrynAHRleIULzDpneV25E=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "ppsspp";
|
||||
version = "0-unstable-2026-05-17";
|
||||
version = "0-unstable-2026-05-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrydgard";
|
||||
repo = "ppsspp";
|
||||
rev = "4fb74aa5a90c8eaededa5ad6883683e6a4271ef0";
|
||||
hash = "sha256-5xgLQQye9LTQq1QLSphbmNb5vzG6m3MvUslHdeSHpZE=";
|
||||
rev = "68296a4f75cc3c30b39ea6e82dac8c4e83fd41a4";
|
||||
hash = "sha256-mME2g2a1HLGsby2ZV5S/brYAeHBhBCIUF5plQMQWLac=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "vice-${type}";
|
||||
version = "0-unstable-2026-04-23";
|
||||
version = "0-unstable-2026-05-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "vice-libretro";
|
||||
rev = "626ee68726035e0bec8c05b702ed3cb378daf4f5";
|
||||
hash = "sha256-vOZ6EEaJWdMZKIlF7oi3MKkLMjjJfVD1+yxOW+/ZNmU=";
|
||||
rev = "b0d88812a0af0dcba40041d78709480ad1d90833";
|
||||
hash = "sha256-OD1OB68g8WxpXLyJ0YIQ9Ys6D4eoARFjjFx+gAdeYGg=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -319,11 +319,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"digitalocean_digitalocean": {
|
||||
"hash": "sha256-HGPoP6vJ7fVgFrqL92ZeO8Kno6bSGhcsHjqZipo0XoY=",
|
||||
"hash": "sha256-Ekuvv1D3f+ePvTpuye207/y5HGf+2WqtdeFgQCtjQ2w=",
|
||||
"homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean",
|
||||
"owner": "digitalocean",
|
||||
"repo": "terraform-provider-digitalocean",
|
||||
"rev": "v2.86.0",
|
||||
"rev": "v2.87.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -517,11 +517,11 @@
|
||||
"vendorHash": "sha256-ieYDog2HS8OwfKvzPIsXZcSAsT7D9qzXPXuHhtfthV0="
|
||||
},
|
||||
"hashicorp_awscc": {
|
||||
"hash": "sha256-OC57nzpz8l+26/oBXVCFUMNK+gMlgpEK35uIyG1sFOo=",
|
||||
"hash": "sha256-kpLC5NdlpBNXj2V0hR8ZvsJjyVgKCXFt7xK8Z7AOyoQ=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/awscc",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-awscc",
|
||||
"rev": "v1.84.0",
|
||||
"rev": "v1.85.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-ryLMz2eh5LO0e6OLJJUoMbM+U53uDTq9sHNcnSuuWt4="
|
||||
},
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
diff --git a/acl2.lisp b/acl2.lisp
|
||||
index 036657d902..c2b7e4fad9 100644
|
||||
--- a/acl2.lisp
|
||||
+++ b/acl2.lisp
|
||||
@@ -1963,11 +1963,7 @@ ACL2 from scratch.")
|
||||
(* *my-most-positive-double-float*
|
||||
*my-most-positive-double-float*)
|
||||
(error () 0.0d0))
|
||||
- 'double-float))
|
||||
- #+sbcl
|
||||
- (member :overflow
|
||||
- (cadr (member :traps
|
||||
- (sb-int:get-floating-point-modes)))))
|
||||
+ 'double-float)))
|
||||
(error "This Lisp is unsuitable for ACL2, because it failed ~%a check that ~
|
||||
floating-point overflow causes an error."))
|
||||
|
||||
diff --git a/float-raw.lisp b/float-raw.lisp
|
||||
index 1364491fdf..e6d0417971 100644
|
||||
--- a/float-raw.lisp
|
||||
+++ b/float-raw.lisp
|
||||
@@ -46,13 +46,13 @@
|
||||
; #.*infinity-double* and #.*negative-infinity-double*), so we do so, but we
|
||||
; don't bother testing for Nan in LispWorks.
|
||||
|
||||
-; We return form unchanged in other than Allegro CL and LispWorks, because we
|
||||
+; We return form unchanged in other than Allegro CL, LispWorks, and SBCL, because we
|
||||
; already know that an error is signalled on overflow for other Lisps that host
|
||||
; ACL2; see break-on-overflow-and-nan.
|
||||
|
||||
- #-(or allegro lispworks)
|
||||
+ #-(or allegro lispworks sbcl)
|
||||
(declare (ignore op))
|
||||
- #-(or allegro lispworks)
|
||||
+ #-(or allegro lispworks sbcl)
|
||||
form
|
||||
#+allegro
|
||||
`(let ((result ,form))
|
||||
@@ -65,6 +65,14 @@
|
||||
(when (or (= result +1D++0) (= result -1D++0))
|
||||
(error "Floating-point overflow for a call of ~s"
|
||||
',op))
|
||||
+ result)
|
||||
+ #+sbcl
|
||||
+ `(let ((result ,form))
|
||||
+ (when (or (sb-ext:float-nan-p result)
|
||||
+ (= result sb-ext:double-float-positive-infinity)
|
||||
+ (= result sb-ext:double-float-negative-infinity))
|
||||
+ (error "Floating-point exception for a call of ~s"
|
||||
+ ',op))
|
||||
result))
|
||||
|
||||
(defmacro defun-df-binary (name op)
|
||||
@@ -62,6 +62,13 @@ stdenv.mkDerivation rec {
|
||||
libssl = "${lib.getLib openssl}/lib/libssl${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
libcrypto = "${lib.getLib openssl}/lib/libcrypto${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
})
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [
|
||||
# ACL2 8.6 assumes SBCL can enable floating-point traps. On
|
||||
# aarch64-linux, SBCL can leave :TRAPS NIL after enabling them, so use
|
||||
# ACL2's existing exceptional-float checking path instead. See:
|
||||
# https://github.com/acl2-devel/acl2-devel/commit/0632b37adffb6b5fd71d8438d519133281f837ec
|
||||
./0002-sbcl-fp-trap-fallback.patch
|
||||
];
|
||||
|
||||
# We need the timestamps on the source tree to be stable for certification to
|
||||
|
||||
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
# To avoid compiler error in LoadDataBase.c:366:27
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-incompatible-pointer-types";
|
||||
env.NIX_CFLAGS_COMPILE = "-std=gnu99 -Wno-incompatible-pointer-types";
|
||||
|
||||
postPatch = ''
|
||||
# texlive for docs seems extreme
|
||||
@@ -77,6 +77,5 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = with lib.licenses; gpl2Plus;
|
||||
maintainers = [ ];
|
||||
platforms = with lib.platforms; linux;
|
||||
broken = true;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
#ifdef __CLING__
|
||||
#pragma link off all globals;
|
||||
#pragma link off all classes;
|
||||
#pragma link off all functions;
|
||||
#pragma link C++ class TFileString+;
|
||||
#endif
|
||||
@@ -0,0 +1,6 @@
|
||||
#ifdef __CLING__
|
||||
#pragma link off all globals;
|
||||
#pragma link off all classes;
|
||||
#pragma link off all functions;
|
||||
#pragma link C++ class TFileVector+;
|
||||
#endif
|
||||
@@ -0,0 +1,10 @@
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -16130,7 +16130,6 @@
|
||||
$as_echo "$as_me: WARNING: ****************************************************************" >&2;}
|
||||
fi
|
||||
|
||||
-( echo $CXXFLAGS | grep -q "m64" ) || CXXFLAGS+=" -m64 "
|
||||
|
||||
|
||||
|
||||
@@ -18,7 +18,26 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-h+ZNGj33FIwg4fOCyfGJrUKM2vDDQl76JcLhtboAOtc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Upstream's configure unconditionally injects `-m64` into CXXFLAGS, which is
|
||||
# invalid on aarch64 (and redundant on x86_64). The line was added in r1946
|
||||
# for applgrid 1.6.17 with the commit message "add default m64 compilation".
|
||||
# There is no public bug tracker upstream, and the line is still present in
|
||||
# trunk. We patch only the generated `configure` (not `configure.ac`) so
|
||||
# that make doesn't try to re-run autotools during the build.
|
||||
./no-m64.patch
|
||||
|
||||
# ROOT 6.40 made rootcling fail when no selection rules are provided
|
||||
# (https://root.cern/doc/v640/release-notes.html#core-libraries). The patch
|
||||
# appends $*LinkDef.h to the dictionary pattern rule so rootcint picks up
|
||||
# the LinkDef.h files we drop into src/ in postPatch.
|
||||
./rootcling-linkdef.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
cp ${./TFileStringLinkDef.h} src/TFileStringLinkDef.h
|
||||
cp ${./TFileVectorLinkDef.h} src/TFileVectorLinkDef.h
|
||||
|
||||
sed -i appl_grid/serialise_base.h -e '1i#include <cstdint>'
|
||||
'';
|
||||
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
--- a/src/Makefile.in
|
||||
+++ b/src/Makefile.in
|
||||
@@ -1027,7 +1027,7 @@
|
||||
$(CC) $(AM_CFLAGS) -c $<
|
||||
|
||||
@USE_ROOT_TRUE@%Dict.cxx : %.h %.cxx
|
||||
-@USE_ROOT_TRUE@ $(CINT) -f $@ -c $< -I..
|
||||
+@USE_ROOT_TRUE@ $(CINT) -f $@ -c $< -I.. $*LinkDef.h
|
||||
|
||||
#../appl_grid/$*LinkDef.h
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "atuin";
|
||||
version = "18.15.2";
|
||||
version = "18.16.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "atuinsh";
|
||||
repo = "atuin";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-EzN42LMe21XqxlAwhAdk1bO4nsV2WumuBKjazHcoe+4=";
|
||||
hash = "sha256-XrJFetPs7TsbX5Cxekj+h3hlmQLoOpB7U+c36NM/jeA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-QMLEbki3QhAxEd0Wuzfs7UN1O/MaEQ/ggxA6cFGDL6U=";
|
||||
cargoHash = "sha256-eqxeE7+UxBTdaYjlonOz6pYQ3mar8lNUd/K0CSuzquc=";
|
||||
|
||||
# atuin's default features include 'check-updates', which do not make sense
|
||||
# for distribution builds. List all other default features.
|
||||
|
||||
@@ -3,7 +3,8 @@
|
||||
lib,
|
||||
stdenv,
|
||||
libiconv,
|
||||
texliveFull,
|
||||
libxslt,
|
||||
texliveBasic,
|
||||
xercesc,
|
||||
}:
|
||||
|
||||
@@ -21,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
postPatch =
|
||||
lib.optionalString stdenv.cc.isClang ''
|
||||
substituteInPlace makefile \
|
||||
--replace "\$(CXX)" "\$(CXX) -std=c++98"
|
||||
--replace-fail "\$(CXX)" "\$(CXX) -std=c++98"
|
||||
''
|
||||
+
|
||||
# fix the doc build on TeX Live 2023
|
||||
''
|
||||
substituteInPlace Documentation/manual.tex \
|
||||
--replace '\usepackage[utf8x]{inputenc}' '\usepackage[utf8]{inputenc}'
|
||||
--replace-fail '\usepackage[utf8x]{inputenc}' '\usepackage[utf8]{inputenc}'
|
||||
'';
|
||||
|
||||
outputs = [
|
||||
@@ -35,7 +36,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"doc"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ texliveFull ]; # scheme-full needed for ucs package
|
||||
nativeBuildInputs = [
|
||||
libxslt
|
||||
(texliveBasic.withPackages (ps: [
|
||||
ps.cm-super
|
||||
ps.ucs
|
||||
]))
|
||||
];
|
||||
buildInputs = [ xercesc ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
|
||||
|
||||
buildFlags = [
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
wrapGAppsHook4,
|
||||
appstream-glib,
|
||||
desktop-file-utils,
|
||||
fvs2,
|
||||
librsvg,
|
||||
gtk4,
|
||||
gtksourceview5,
|
||||
@@ -87,7 +88,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
icoextract
|
||||
patool
|
||||
pathvalidate
|
||||
fvs
|
||||
orjson
|
||||
pycairo
|
||||
pygobject3
|
||||
@@ -110,6 +110,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
gamescope
|
||||
mangohud
|
||||
vmtouch
|
||||
fvs2
|
||||
|
||||
# Undocumented (subprocess.Popen())
|
||||
lsb-release
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "buildkite-agent-metrics";
|
||||
version = "5.12.2";
|
||||
version = "5.12.3";
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
@@ -18,7 +18,7 @@ buildGoModule (finalAttrs: {
|
||||
owner = "buildkite";
|
||||
repo = "buildkite-agent-metrics";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-O/6YGxX7sJEaqmMMzOPxkiIWJs1VRa+tgZ2w8UjfoKk=";
|
||||
hash = "sha256-h6RPAqRNCcsT49d+D+q3FShoPZK4z7e8JCkB1FOHgNY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-2os2V1iyw1k6XwX2wLz0abMnu+X5p+Aqau7ajC3JIRc=";
|
||||
@@ -35,5 +35,6 @@ buildGoModule (finalAttrs: {
|
||||
description = "Command-line tool (and Lambda) for collecting Buildkite agent metrics";
|
||||
homepage = "https://github.com/buildkite/buildkite-agent-metrics";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ cbrxyz ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "cdncheck";
|
||||
version = "1.2.36";
|
||||
version = "1.2.37";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "cdncheck";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-hDcGf7orlVsIOd0iROikrlXcBVsU5n9IHzfkWejXUGg=";
|
||||
hash = "sha256-gw3WhhuCXFTAaqO4Sp8TDZ1W6xTCvH91hK5R/GEgoY0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-aolS1mhIM8/fOeHeLQgiS8z/zO++U+36Th7wNpKlkFU=";
|
||||
vendorHash = "sha256-gCq1m+9XCo4HGL1sT5AEMP0M430sy+5aKeOHwUWlme4=";
|
||||
|
||||
subPackages = [ "cmd/cdncheck/" ];
|
||||
|
||||
|
||||
@@ -6,25 +6,44 @@
|
||||
versionCheckHook,
|
||||
cmake,
|
||||
pkg-config,
|
||||
nodejs,
|
||||
fetchNpmDeps,
|
||||
npmHooks,
|
||||
nix-update-script,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "clash-rs";
|
||||
version = "0.10.0";
|
||||
version = "0.10.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Watfaq";
|
||||
repo = "clash-rs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-r+9tFw4B/7g/4EEYnX0Zcv4jPeGbcVgdtpAcSyk/cxA=";
|
||||
hash = "sha256-ncMJxVNHAgeXWhqZgWt3nth4BXqrrBaAEWmOVF/KsPg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-D/TalJ0fBD4ZoHwU6uj5P0O6xFwinL9hE91bQhxC7s8=";
|
||||
patches = [
|
||||
# Remove the `npm ci` call in build.rs as it fails.
|
||||
./skip-npm-ci.patch
|
||||
];
|
||||
|
||||
cargoHash = "sha256-WI+wg6cu0cBFrZYyN3GXlfHOmo/cVo2uMLn1D5YTOCQ=";
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
|
||||
inherit (finalAttrs) src;
|
||||
sourceRoot = "${finalAttrs.src.name}/clash-dashboard";
|
||||
hash = "sha256-8fDeO7Yx+m2s0mzTO7MkQOQ0UYs8B2vFnNevHHZFghc=";
|
||||
};
|
||||
|
||||
npmRoot = "clash-dashboard";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
rustPlatform.bindgenHook
|
||||
nodejs
|
||||
npmHooks.npmConfigHook
|
||||
];
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
@@ -33,8 +52,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
];
|
||||
|
||||
env = {
|
||||
# requires features: sync_unsafe_cell, unbounded_shifts, let_chains, ip
|
||||
# requires features: sync_unsafe_cell, unbounded_shifts, let_chains, ip, if_let_guard
|
||||
RUSTC_BOOTSTRAP = 1;
|
||||
RUSTFLAGS = "-Zcrate-attr=feature(if_let_guard)";
|
||||
};
|
||||
|
||||
buildFeatures = [ "plus" ];
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
diff --git a/clash-lib/build.rs b/clash-lib/build.rs
|
||||
index e8c8d44..adf9a74 100644
|
||||
--- a/clash-lib/build.rs
|
||||
+++ b/clash-lib/build.rs
|
||||
@@ -81,25 +81,11 @@ fn build_dashboard() -> anyhow::Result<()> {
|
||||
// On Windows npm is a .cmd script, not a binary.
|
||||
let npm = if cfg!(windows) { "npm.cmd" } else { "npm" };
|
||||
|
||||
- // Use /tmp for the npm cache so that non-root users inside cross containers
|
||||
- // (which run as UID 1001) are not blocked by a root-owned /.npm directory
|
||||
- // that the nodesource pre-build step may have created.
|
||||
- let npm_cache = std::env::temp_dir().join("npm-cache");
|
||||
-
|
||||
- // Run `npm ci` to install dependencies (no-op if already up to date).
|
||||
- let status = match std::process::Command::new(npm)
|
||||
- .args(["ci", "--prefer-offline", "--cache"])
|
||||
- .arg(&npm_cache)
|
||||
- .current_dir(&dashboard_dir)
|
||||
- .status()
|
||||
- {
|
||||
- Ok(s) => s,
|
||||
- Err(e) => {
|
||||
- anyhow::bail!("npm not found; is Node.js installed? ({e})");
|
||||
- }
|
||||
- };
|
||||
-
|
||||
- anyhow::ensure!(status.success(), "`npm ci` failed with status {status}");
|
||||
+ // Use npm_config_cache from the environment if available (Nix),
|
||||
+ // otherwise fall back to /tmp for the npm cache.
|
||||
+ let npm_cache = std::env::var_os("npm_config_cache")
|
||||
+ .map(std::path::PathBuf::from)
|
||||
+ .unwrap_or_else(|| std::env::temp_dir().join("npm-cache"));
|
||||
|
||||
// Run `npm run build`.
|
||||
let status = std::process::Command::new(npm)
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cmark";
|
||||
version = "0.31.1";
|
||||
version = "0.31.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "commonmark";
|
||||
repo = "cmark";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-+JLw7zCjjozjq1RhRQGFqHj/MTUTq3t7A0V3T2U2PQk=";
|
||||
sha256 = "sha256-d7oL7qWUcuEzTAp61iJMvX0VvcoYpHJw2w5UmODmLdo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -0,0 +1,69 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchurl,
|
||||
_7zz,
|
||||
makeBinaryWrapper,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "cmux";
|
||||
version = "0.64.10";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/manaflow-ai/cmux/releases/download/v${finalAttrs.version}/cmux-macos.dmg";
|
||||
hash = "sha256-+MKcMChZTFiDF482mVIh6mzeyKghDMV9gLA+6BjamXw=";
|
||||
};
|
||||
|
||||
# -snld prevents "ERROR: Dangerous symbolic link path was ignored"
|
||||
# -xr'!*:com.apple.*' avoids extended attributes being extracted as files
|
||||
# from the APFS image, which would corrupt the .app bundle.
|
||||
unpackCmd = "7zz x -snld -xr'!*:com.apple.*' $curSrc";
|
||||
|
||||
nativeBuildInputs = [
|
||||
_7zz
|
||||
makeBinaryWrapper
|
||||
];
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/Applications
|
||||
cp -R cmux.app $out/Applications/
|
||||
|
||||
mkdir -p $out/bin
|
||||
makeBinaryWrapper \
|
||||
"$out/Applications/cmux.app/Contents/MacOS/cmux" \
|
||||
"$out/bin/cmux"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# Preserve the notarized signature of the bundled binaries and resources.
|
||||
dontFixup = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Native macOS terminal built on Ghostty, designed for AI coding agents";
|
||||
longDescription = ''
|
||||
cmux is a macOS-native terminal application built on Ghostty that
|
||||
provides vertical tabs, notification rings, an in-app browser, and
|
||||
first-class support for AI coding agents such as Claude Code.
|
||||
It exposes scriptable CLI and socket APIs.
|
||||
'';
|
||||
homepage = "https://cmux.com";
|
||||
changelog = "https://github.com/manaflow-ai/cmux/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
mainProgram = "cmux";
|
||||
maintainers = with lib.maintainers; [ imcvampire ];
|
||||
platforms = lib.platforms.darwin;
|
||||
};
|
||||
})
|
||||
@@ -6,18 +6,18 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "cnspec";
|
||||
version = "13.9.0";
|
||||
version = "13.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mondoohq";
|
||||
repo = "cnspec";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-pAiHfizC5GZwmGz3vWjYkj7YSimoOaWvmAOL2ERke0Q=";
|
||||
hash = "sha256-MhORGeHFIiNHCipbpCl18utmCVD09UyN5dwNravus0o=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-6dNZEf8boh6sRRmVh4UhpwUvcCwUtMDqwmrOs8R+sck=";
|
||||
vendorHash = "sha256-4p8vsWUdeVVG6qy1QMbuyxJarA1l72euzoswmMDn7gM=";
|
||||
|
||||
subPackages = [ "apps/cnspec" ];
|
||||
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "coin";
|
||||
version = "4.0.7";
|
||||
version = "4.0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coin3d";
|
||||
repo = "coin";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Sb0WWuUKgKaBvOXChEoWt2CeTqSq4gXig4eGxvtN+/M=";
|
||||
hash = "sha256-2rKTDyDdmY7ItxUCHHfs3OyTlOQHdHaWITLxdGhrQ/I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -2,26 +2,27 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
cmake,
|
||||
ninja,
|
||||
qt6,
|
||||
libx11,
|
||||
libxfixes,
|
||||
libxtst,
|
||||
wayland,
|
||||
miniaudio,
|
||||
pkg-config,
|
||||
kdePackages,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "CopyQ";
|
||||
version = "13.0.0";
|
||||
version = "15.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hluk";
|
||||
repo = "CopyQ";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-wxjUL5mGXAMNVGP+dAh1NrE9tw71cJW9zmLsaCVphTo=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-D1huGKvYa/GsVeLQcP69MCWF8p+ytcQxlu0qynmYbGw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -37,26 +38,23 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
qt6.qtsvg
|
||||
qt6.qttools
|
||||
qt6.qtdeclarative
|
||||
libx11
|
||||
libxfixes
|
||||
libxtst
|
||||
qt6.qtwayland
|
||||
wayland
|
||||
miniaudio
|
||||
kdePackages.kconfig
|
||||
kdePackages.kstatusnotifieritem
|
||||
kdePackages.knotifications
|
||||
kdePackages.kguiaddons
|
||||
kdePackages.qca
|
||||
kdePackages.qtkeychain
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "WITH_QT6" true)
|
||||
];
|
||||
|
||||
patches = [
|
||||
# https://github.com/hluk/CopyQ/pull/3268
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/hluk/CopyQ/commit/103903593c37c9db5406d276e0097fbf18d2a8c4.patch?full_index=1";
|
||||
hash = "sha256-zywE6ntMw+WvTyilXwvd4lfQRAAB9R/AGpwtwwPFZZE=";
|
||||
})
|
||||
(lib.cmakeFeature "MINIAUDIO_INCLUDE_DIR" "${lib.getInclude miniaudio}/include/miniaudio")
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -17,6 +17,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-DANSI_FUNC";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/bryanpkc/corkscrew";
|
||||
description = "Tool for tunneling SSH through HTTP proxies";
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dalfox";
|
||||
version = "2.13.0";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hahwul";
|
||||
repo = "dalfox";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-GAlLmgIs2r8VCm69MuFPuQERHSZYAE/Zz8/y4ewYJME=";
|
||||
hash = "sha256-EYX+nag7aaqm9Saa9w4fbuxyuHxx1TIIgIj/yTKfE98=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-UmQGsuLOpUJpGnWBot6YjG56LLNYHjm9mCejhEzkoBk=";
|
||||
vendorHash = null;
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
|
||||
@@ -32,17 +32,17 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "deno";
|
||||
version = "2.7.14";
|
||||
version = "2.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "denoland";
|
||||
repo = "deno";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true; # required for tests
|
||||
hash = "sha256-tkZc89JOhXCdMVSAOQYGR6HDe7KmCI5/haLH1RP2p7I=";
|
||||
hash = "sha256-gcDQ2nkiLtnOJCneiHAWwvYxHUwQ/2n2lsmWAMgf/yc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-bFQLsAF4hFBRw04VaL+sxvxIZ9p7nXOLSr2BIZKcwiI=";
|
||||
cargoHash = "sha256-1vHgkLWqwTt3tO4qSkfqwCj5KMfKCT3kscChf2FrkH8=";
|
||||
|
||||
patches = [
|
||||
./patches/0002-tests-replace-hardcoded-paths.patch
|
||||
|
||||
@@ -70,34 +70,26 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rusty-v8";
|
||||
version = "147.4.0";
|
||||
version = "149.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "denoland";
|
||||
repo = "rusty_v8";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-cS9oBDY2+9RtdqPuOadNl0Lce89ESpBb1qPiWSHPiCg=";
|
||||
hash = "sha256-OdVz8d8hkBhXZnX9vKV51rlHAYN2PbVycmqrDWNLV5M=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./librusty_v8_no_downloads.patch
|
||||
(fetchpatch {
|
||||
name = "chromium-146-revert-Update-fsanitizer=array-bounds-config.patch";
|
||||
# https://chromium-review.googlesource.com/c/chromium/src/+/7539408
|
||||
url = "https://chromium.googlesource.com/chromium/src/+/acb47d9a6b56c4889a2ed4216e9968cfc740086c^!?format=TEXT";
|
||||
decode = "base64 -d";
|
||||
revert = true;
|
||||
includes = [ "build/config/compiler/BUILD.gn" ];
|
||||
hash = "sha256-0yEK66IEyS8xABDHY4W8oIvl4Ga1JfL1wxQy8PhXyqI=";
|
||||
})
|
||||
./librusty_v8_revert_-fno-lifetime-dse.patch
|
||||
./llvm22.patch
|
||||
./gn_inputs_fix.patch
|
||||
]
|
||||
++ lib.optionals stdenv.targetPlatform.isDarwin [
|
||||
./librusty_v8-darwin-fix-__rust_no_alloc_shim_is_unstable_v2.patch
|
||||
];
|
||||
|
||||
cargoHash = "sha256-e/G9AevaJwqYdr8022kmv05Mwzi4Cishj9imLproNB0=";
|
||||
cargoHash = "sha256-uj1B3lkgbZG5emJgfsilJXdHbqg0JNAywaSVLe/LbWk=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
llvmPackages.clang
|
||||
@@ -119,6 +111,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
apple-sdk_15
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
ln -sv ${rustToolchain} third_party/rust-toolchain
|
||||
'';
|
||||
|
||||
env = {
|
||||
V8_FROM_SOURCE = 1;
|
||||
PYTHON = "python3";
|
||||
@@ -132,9 +128,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
"rustc_version=\"${rustc.version}\""
|
||||
"rust_sysroot_absolute=\"${rustToolchain}\""
|
||||
"rust_bindgen_root=\"${rustToolchain}\""
|
||||
# To accomodate our newer rustc compiler
|
||||
"removed_rust_stdlib_libs=[\"adler\"]"
|
||||
"added_rust_stdlib_libs=[\"adler2\"]"
|
||||
]
|
||||
++ lib.optional stdenv.targetPlatform.isDarwin "mac_deployment_target=\"${stdenv.targetPlatform.darwinMinVersion}\""
|
||||
);
|
||||
|
||||
@@ -0,0 +1,105 @@
|
||||
Submodule build contains modified content
|
||||
diff --git a/build/toolchain/gcc_toolchain.gni b/build/toolchain/gcc_toolchain.gni
|
||||
index b9b5b0d76..4004f306e 100644
|
||||
--- a/build/toolchain/gcc_toolchain.gni
|
||||
+++ b/build/toolchain/gcc_toolchain.gni
|
||||
@@ -712,7 +712,6 @@ template("single_gcc_toolchain") {
|
||||
"$rustc_common_args {{rustdeps}} {{externs}} SOURCES {{sources}}"
|
||||
command = "$rustc_wrapper --depfile=$depfile --emit=dep-info=$depfile,link -o $libname -- -Clinker=\"${invoker.cxx}\" {{source}} LDFLAGS RUSTENV {{rustenv}}"
|
||||
rust_sysroot = rust_sysroot_relative
|
||||
- inputs = rustc_wrapper_inputs
|
||||
}
|
||||
|
||||
tool("rust_rlib") {
|
||||
@@ -745,7 +744,6 @@ template("single_gcc_toolchain") {
|
||||
"$rustc_common_args {{rustdeps}} {{externs}} SOURCES {{sources}}"
|
||||
command = "$rustc_wrapper --depfile=$depfile --emit=dep-info=$depfile,link,metadata=$rmetaname -o $rlibname -- -Clinker=\"${invoker.cxx}\" {{source}} LDFLAGS RUSTENV {{rustenv}}"
|
||||
rust_sysroot = rust_sysroot_relative
|
||||
- inputs = rustc_wrapper_inputs
|
||||
}
|
||||
|
||||
tool("rust_bin") {
|
||||
@@ -767,7 +765,6 @@ template("single_gcc_toolchain") {
|
||||
"$rustc_common_args {{rustdeps}} {{externs}} SOURCES {{sources}}"
|
||||
command = "$rustc_wrapper --depfile=$depfile --emit=dep-info=$depfile,link -o $exename -- -Clinker=\"${invoker.cxx}\" {{source}} LDFLAGS {{ldflags}} ${extra_ldflags} RUSTENV {{rustenv}}"
|
||||
rust_sysroot = rust_sysroot_relative
|
||||
- inputs = rustc_wrapper_inputs
|
||||
}
|
||||
|
||||
tool("rust_cdylib") {
|
||||
@@ -790,7 +787,6 @@ template("single_gcc_toolchain") {
|
||||
"$rustc_common_args {{rustdeps}} {{externs}} SOURCES {{sources}}"
|
||||
command = "$rustc_wrapper --depfile=$depfile --emit=dep-info=$depfile,link -o $dllname -- -Clinker=\"${invoker.cxx}\" {{source}} LDFLAGS {{ldflags}} ${extra_ldflags} RUSTENV {{rustenv}}"
|
||||
rust_sysroot = rust_sysroot_relative
|
||||
- inputs = rustc_wrapper_inputs
|
||||
}
|
||||
|
||||
tool("rust_dylib") {
|
||||
@@ -815,7 +811,6 @@ template("single_gcc_toolchain") {
|
||||
"$rustc_common_args {{rustdeps}} {{externs}} SOURCES {{sources}}"
|
||||
command = "$rustc_wrapper --depfile=$depfile --emit=dep-info=$depfile,link,metadata=$rmetaname -o $dllname -- -Clinker=\"${invoker.cxx}\" {{source}} LDFLAGS {{ldflags}} ${extra_ldflags} RUSTENV {{rustenv}}"
|
||||
rust_sysroot = rust_sysroot_relative
|
||||
- inputs = rustc_wrapper_inputs
|
||||
}
|
||||
|
||||
tool("rust_macro") {
|
||||
@@ -838,7 +833,6 @@ template("single_gcc_toolchain") {
|
||||
"$rustc_common_args {{rustdeps}} {{externs}} SOURCES {{sources}}"
|
||||
command = "$rustc_wrapper --depfile=$depfile --emit=dep-info=$depfile,link -o $dllname -- -Clinker=\"${invoker.cxx}\" {{source}} LDFLAGS {{ldflags}} ${extra_ldflags} RUSTENV {{rustenv}}"
|
||||
rust_sysroot = rust_sysroot_relative
|
||||
- inputs = rustc_wrapper_inputs
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/build/toolchain/apple/toolchain.gni b/build/toolchain/apple/toolchain.gni
|
||||
index 0aa4e736f..e3f59728d 100644
|
||||
--- a/build/toolchain/apple/toolchain.gni
|
||||
+++ b/build/toolchain/apple/toolchain.gni
|
||||
@@ -325,7 +325,6 @@ template("single_apple_toolchain") {
|
||||
"$rustc_common_args {{rustdeps}} {{externs}} SOURCES {{sources}}"
|
||||
command = "$rustc_wrapper --depfile=$depfile --emit=dep-info=$depfile,link -o $libname -- -Clinker=\"$_cxx\" {{source}} LDFLAGS $bin_flag RUSTENV {{rustenv}}"
|
||||
rust_sysroot = rust_sysroot_relative
|
||||
- inputs = rustc_wrapper_inputs
|
||||
}
|
||||
|
||||
tool("rust_rlib") {
|
||||
@@ -359,7 +358,6 @@ template("single_apple_toolchain") {
|
||||
"$rustc_common_args {{rustdeps}} {{externs}} SOURCES {{sources}}"
|
||||
command = "$rustc_wrapper --depfile=$depfile --emit=dep-info=$depfile,link,metadata=$rmetaname -o $rlibname -- -Clinker=\"$_cxx\" {{source}} LDFLAGS RUSTENV {{rustenv}}"
|
||||
rust_sysroot = rust_sysroot_relative
|
||||
- inputs = rustc_wrapper_inputs
|
||||
}
|
||||
|
||||
tool("rust_bin") {
|
||||
@@ -392,7 +390,6 @@ template("single_apple_toolchain") {
|
||||
"$rustc_common_args {{rustdeps}} {{externs}} SOURCES {{sources}}"
|
||||
command = "$linker_driver_env $rustc_wrapper --depfile=$depfile --emit=dep-info=$depfile,link -o $exename -- -Clinker=\"$linker_driver\" {{source}} LDFLAGS $linker_driver_args $bin_flag {{ldflags}} RUSTENV {{rustenv}}"
|
||||
rust_sysroot = rust_sysroot_relative
|
||||
- inputs = rustc_wrapper_inputs
|
||||
}
|
||||
|
||||
tool("rust_cdylib") {
|
||||
@@ -427,7 +424,6 @@ template("single_apple_toolchain") {
|
||||
"$rustc_common_args {{rustdeps}} {{externs}} SOURCES {{sources}}"
|
||||
command = "$linker_driver_env $rustc_wrapper --depfile=$depfile --emit=dep-info=$depfile,link -o $dllname -- -Clinker=\"$linker_driver\" {{source}} LDFLAGS $linker_driver_args $bin_flag {{ldflags}} RUSTENV {{rustenv}}"
|
||||
rust_sysroot = rust_sysroot_relative
|
||||
- inputs = rustc_wrapper_inputs
|
||||
}
|
||||
|
||||
tool("rust_dylib") {
|
||||
@@ -464,7 +460,6 @@ template("single_apple_toolchain") {
|
||||
"$rustc_common_args {{rustdeps}} {{externs}} SOURCES {{sources}}"
|
||||
command = "$linker_driver_env $rustc_wrapper --depfile=$depfile --emit=dep-info=$depfile,link,metadata=$rmetaname -o $dllname -- -Clinker=\"$linker_driver\" {{source}} LDFLAGS $linker_driver_args {{ldflags}} RUSTENV {{rustenv}}"
|
||||
rust_sysroot = rust_sysroot_relative
|
||||
- inputs = rustc_wrapper_inputs
|
||||
}
|
||||
|
||||
tool("rust_macro") {
|
||||
@@ -499,7 +494,6 @@ template("single_apple_toolchain") {
|
||||
"$rustc_common_args {{rustdeps}} {{externs}} SOURCES {{sources}}"
|
||||
command = "$rustc_wrapper --depfile=$depfile --emit=dep-info=$depfile,link -o $dllname -- -Clinker=\"${_cxx}\" {{source}} LDFLAGS $bin_flag {{ldflags}} RUSTENV {{rustenv}}"
|
||||
rust_sysroot = rust_sysroot_relative
|
||||
- inputs = rustc_wrapper_inputs
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
Submodule build contains modified content
|
||||
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
|
||||
index ff8022f04..59699e1d4 100644
|
||||
--- a/build/config/compiler/BUILD.gn
|
||||
+++ b/build/config/compiler/BUILD.gn
|
||||
@@ -625,13 +625,6 @@ config("compiler") {
|
||||
]
|
||||
}
|
||||
|
||||
- # The performance improvement does not seem worth the risk. See
|
||||
- # https://crbug.com/484082200 for background and https://crrev.com/c/7593035
|
||||
- # for discussion.
|
||||
- if (!is_wasm) {
|
||||
- cflags += [ "-fno-lifetime-dse" ]
|
||||
- }
|
||||
-
|
||||
# TODO(hans): Remove this once Clang generates better optimized debug info
|
||||
# by default. https://crbug.com/765793
|
||||
cflags += [
|
||||
@@ -0,0 +1,60 @@
|
||||
Submodule build contains modified content
|
||||
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
|
||||
index 1b53cb1d4..724f867f5 100644
|
||||
--- a/build/config/compiler/BUILD.gn
|
||||
+++ b/build/config/compiler/BUILD.gn
|
||||
@@ -1916,7 +1916,6 @@ ubsan_hardening("c_array_bounds") {
|
||||
# the related warning about "unsafe-buffer-usage-in-static-sized-array",
|
||||
# since we know that the array bounds sanitizing will catch any out-of-
|
||||
# bounds accesses.
|
||||
- cflags = [ "-Wno-unsafe-buffer-usage-in-static-sized-array" ]
|
||||
}
|
||||
|
||||
# Enable UBSan subset to ensure we always hit `return` statement in non-void
|
||||
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
|
||||
index 1b53cb1d4..51367ceb2 100644
|
||||
--- a/build/config/compiler/BUILD.gn
|
||||
+++ b/build/config/compiler/BUILD.gn
|
||||
@@ -601,7 +601,6 @@ config("compiler") {
|
||||
# Flags for diagnostics.
|
||||
cflags += [ "-fcolor-diagnostics" ]
|
||||
if (!is_win) {
|
||||
- cflags += [ "-fdiagnostics-show-inlining-chain" ]
|
||||
} else {
|
||||
# Combine after https://github.com/llvm/llvm-project/pull/192241
|
||||
cflags += [ "/clang:-fdiagnostics-show-inlining-chain" ]
|
||||
diff --git a/build/config/sanitizers/sanitizers.gni b/build/config/sanitizers/sanitizers.gni
|
||||
index 329a2fc8b..083b635e3 100644
|
||||
--- a/build/config/sanitizers/sanitizers.gni
|
||||
+++ b/build/config/sanitizers/sanitizers.gni
|
||||
@@ -535,12 +535,6 @@ template("ubsan_hardening") {
|
||||
"-fsanitize=${invoker.sanitizer}",
|
||||
"-fsanitize-trap=${invoker.sanitizer}",
|
||||
|
||||
- # Prevents `__has_feature(undefined_behavior_sanitizer)`
|
||||
- # from evaluating true. Configs defined here are intended to
|
||||
- # be usable even in release builds, i.e. as widely as possible.
|
||||
- # It's important not to have full-on UBSan workarounds activate
|
||||
- # just because we built support for a specific sanitizer.
|
||||
- "-fsanitize-ignore-for-ubsan-feature=${invoker.sanitizer}",
|
||||
]
|
||||
if (defined(invoker.cflags)) {
|
||||
cflags += invoker.cflags
|
||||
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
|
||||
index ff8022f04..59699e1d4 100644
|
||||
--- a/build/config/compiler/BUILD.gn
|
||||
+++ b/build/config/compiler/BUILD.gn
|
||||
@@ -625,13 +625,6 @@ config("compiler") {
|
||||
]
|
||||
}
|
||||
|
||||
- # The performance improvement does not seem worth the risk. See
|
||||
- # https://crbug.com/484082200 for background and https://crrev.com/c/7593035
|
||||
- # for discussion.
|
||||
- if (!is_wasm) {
|
||||
- cflags += [ "-fno-lifetime-dse" ]
|
||||
- }
|
||||
-
|
||||
# TODO(hans): Remove this once Clang generates better optimized debug info
|
||||
# by default. https://crbug.com/765793
|
||||
cflags += [
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dos2unix";
|
||||
version = "7.5.4";
|
||||
version = "7.5.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://waterlan.home.xs4all.nl/dos2unix/dos2unix-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-+BGiueSgyTbGHvfBcymT0YIOXPAR9Nk4YYhcy4EByiE=";
|
||||
hash = "sha256-dfaSuEhMjCRXmi/9h98WuclCjtlUl+M5OiHRugaXrDM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -20,11 +20,11 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dropbear";
|
||||
version = "2025.89";
|
||||
version = "2026.91";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://matt.ucc.asn.au/dropbear/releases/dropbear-${finalAttrs.version}.tar.bz2";
|
||||
sha256 = "sha256-DR98pxHPwzbcioXmcsq5z9giOgL+LaCkp661jJ4RNjQ=";
|
||||
sha256 = "sha256-3vqSRHWr9rwedKvAAXPka/3IBL1Hyq+hT1pO8Mx22jQ=";
|
||||
};
|
||||
|
||||
env.CFLAGS = lib.pipe (lib.attrNames dflags) [
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dsearch";
|
||||
version = "0.2.1";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AvengeMedia";
|
||||
repo = "danksearch";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8Ka2sH6l7lnkXV832o0tMK3i9A4zSYFtaYZL6LNgWvc=";
|
||||
hash = "sha256-pEJgw0so89I/dELzYK58kwFASA+x+TH2D6moXdaFY4E=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-nvAgDX8dS3ZwAGTdPvNK1/XzlY28/QjRSW8cmqhp9io=";
|
||||
vendorHash = "sha256-scvZWbMHAhpYWCU0xZK1E6h6sAkoXegqI1iYS44fcCg=";
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "editorconfig-checker";
|
||||
version = "3.6.1";
|
||||
version = "3.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "editorconfig-checker";
|
||||
repo = "editorconfig-checker";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-kvRORmfquabvNoIchQdXEXKYKLpNjy8tgvkS6a0vmEk=";
|
||||
hash = "sha256-8DNxLACoTtB86JUkHUDopKY0SVFdhdye/ThbUXwAYQE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Olp21Sbey3zW/OCc59w0wqcnq8lwRigu/De7A82H6YU=";
|
||||
vendorHash = "sha256-sOpa9aYWAQ5qahHhV0XgKOtuGWDu1+i0lcMCyc1FvMI=";
|
||||
|
||||
# Tests run on source and don't expect vendor dir.
|
||||
doCheck = false;
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "embree";
|
||||
version = "4.4.0";
|
||||
version = "4.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "embree";
|
||||
repo = "embree";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-bHVokEfnTW2cJqx3Zz2x1hIH07WamPAVFY9tiv6nHd0=";
|
||||
hash = "sha256-ZJItp33XUmaTk5s4AbM/uzWGxSdGh5scdZAZDBYy28M=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -1,154 +0,0 @@
|
||||
diff --git i/package-lock.json w/package-lock.json
|
||||
index 07428d0..4901a94 100644
|
||||
--- i/package-lock.json
|
||||
+++ w/package-lock.json
|
||||
@@ -3 +3 @@
|
||||
- "version": "4.0.0-beta",
|
||||
+ "version": "4.0.0",
|
||||
@@ -9 +9 @@
|
||||
- "version": "4.0.0-beta",
|
||||
+ "version": "4.0.0",
|
||||
@@ -131,0 +132,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
|
||||
+ "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
|
||||
@@ -144,0 +147,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
|
||||
+ "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
|
||||
@@ -154,0 +159,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.1.tgz",
|
||||
+ "integrity": "sha512-m4DVN9ZqskZoLU5GlWZadwDnYo3vAEydiUayB9widCl9ffWx2IvPnp6n3on5rJmziJSw9Bv+Z3ChDVdMwXCY8Q==",
|
||||
@@ -161,0 +168,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.18.0.tgz",
|
||||
+ "integrity": "sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw==",
|
||||
@@ -173,0 +182,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.6.0.tgz",
|
||||
+ "integrity": "sha512-8I2Q8ykA4J0x0o7cg67FPVnehcqWTBehu/lmY+bolPFHGjh49YzGBMXTvpqVgEbBdvNCSxj6iFgiIyHzf03lzg==",
|
||||
@@ -180,0 +191,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.1.0.tgz",
|
||||
+ "integrity": "sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==",
|
||||
@@ -223,0 +236,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.4.tgz",
|
||||
+ "integrity": "sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==",
|
||||
@@ -260,0 +275,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.0.tgz",
|
||||
+ "integrity": "sha512-2cbWIHbZVEweE853g8jymffCA+NCMiuqeECeBBLm8dg2oFdjuGJhgN4UAbI+6v0CKbbhvtXA4qV8YR5Ji86nmw==",
|
||||
@@ -267,0 +284,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.5.tgz",
|
||||
+ "integrity": "sha512-KSPA4umqSG4LHYRodq31VDwKAvaTF4xmVlzM8Aeh4PlU1JQ3IG0wiA8C25d3RQ9nJyM3mBHyI53K06VVL/oFFg==",
|
||||
@@ -304,0 +323,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-4.0.0.tgz",
|
||||
+ "integrity": "sha512-TNd+u1fAG8vf8YMgXzK2BI0u0xsphFv//T5rpF1eZ+8AAXby5Ll1qptr4/XVS45dvWDIzuBmmWIpVJRvnaNqzQ==",
|
||||
@@ -318,0 +339,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-5.0.0.tgz",
|
||||
+ "integrity": "sha512-6QEzj6bZg8atviRIL+pR0tODC854cYSjvZxkyCarr8DVaOJPEyuGys7GmEG3W0Rb8kKSQec7P6okt0sJvNneFw==",
|
||||
@@ -329,0 +352,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-10.0.0.tgz",
|
||||
+ "integrity": "sha512-7dwoKCGvgZGHWTZfOj2KLmbIAIdiXP9NTrwGaTO/XDfKMEmyBahZpnombiG6JDHmiOrmK3GLEJRXrWExXCDLmQ==",
|
||||
@@ -373,0 +398,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-4.0.0.tgz",
|
||||
+ "integrity": "sha512-bhHAP7hIOxUjiTZrpjyAYD+2RFRa+PNutWeW7JdDPcWWG3GVRiFsu3pBGw9kN2PktoiilDWFGSR0dwXBzGQang==",
|
||||
@@ -385,0 +412,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-4.0.0.tgz",
|
||||
+ "integrity": "sha512-mR7JHNIvCB4o12f75KN42he7s1O9tmcSN4wJ6l04oymfXKLn+lYJFI7z9lbe4/Ald6fm8nuF38fuY5hNPl3B+A==",
|
||||
@@ -397,0 +426,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.7.tgz",
|
||||
+ "integrity": "sha512-m+Trk77mp54Zma6xLkLuY+mvanPxlE4A7yNKs2HBiyZ4UkVs28Mv5c/pgWrHeInx+USHeX/WEPzjrWrcJiQgjw==",
|
||||
@@ -404,0 +435,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-4.0.0.tgz",
|
||||
+ "integrity": "sha512-LD7MNzaX+q2OpU4Fn0i/SedhnnBCAnEzRr6L0MP6ohofFFlx9kp5EXX7flbRZlUnh8icOwC3NFmXTyP76hvo0g==",
|
||||
@@ -415,0 +448,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-3.0.0.tgz",
|
||||
+ "integrity": "sha512-DUYfROyQNWm3q+JXL3S6s1/y/cOWRstnmt5zDXhdYNJ5N8TgCnHcDXKwW/dRZL7eBZupmDVHxdKCWZDUYUqmeg==",
|
||||
@@ -426,0 +461,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-4.0.0.tgz",
|
||||
+ "integrity": "sha512-W4QRSzJDMKIvWSvQWOIhs6qba1MJ6yIoy+sazSFhl2QIwn58B0Yw3iZ/zLk3QqVcCsTmKcyrSNVWUJ5RVDLStw==",
|
||||
@@ -438,0 +475,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-7.0.0.tgz",
|
||||
+ "integrity": "sha512-y8kX/TmyBqV0H1i3cWbhiTljcuBtgVgyVXAVub3ba1j5/G+dxhYohK1JLRkaosPGKKf3LnEJsYK+GPabpfnaHw==",
|
||||
@@ -457,0 +496,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-4.0.0.tgz",
|
||||
+ "integrity": "sha512-frzJNoMsQBO1fxLXrtpxt2c8hUy/ASEmBpIOEnXY2CjylPnLsVyxrEq7hcOIqVJKHn1tIPfplfiSPowOTrrUDg==",
|
||||
@@ -469,0 +510,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-3.0.0.tgz",
|
||||
+ "integrity": "sha512-AT9vkC2KD/PLHZZXIW5Tn/FnJzEU3xEZMLxNo9OggKoreDEKfTOKVM1LkYbDg6UQUOOjntXd0SsrvoHfCzS8cw==",
|
||||
@@ -482,0 +525,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-4.0.0.tgz",
|
||||
+ "integrity": "sha512-XTN4AIFusWbNCBU1Xm2YDxbtH94e/FOrC27U3QargSsoDT1mRm+aLfqE+oOZnUuxwtTnInRT8UHRU3MVOu52wg==",
|
||||
@@ -496,0 +541,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/testing/-/testing-2.1.35.tgz",
|
||||
+ "integrity": "sha512-DUMxGJP6Y7QTrjk4hE6kunQUfMDxCphJaO0xCsH+AmaTPbvIW2HV+7ZQTCFQXrOTFuvLssF9lbbnC0keGYbVgA==",
|
||||
@@ -523,0 +570,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-3.0.0.tgz",
|
||||
+ "integrity": "sha512-YYykfbw/lefC7yKj7nanzQXILM7r3suIvyFlCcMskc99axmsSewXWkAfXKwMbgxL76iAFVmRwmYdwNZNc8gjog==",
|
||||
@@ -728,0 +777,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.2.tgz",
|
||||
+ "integrity": "sha512-4Bb+oqXZTSTZ1q27Izly9lv8B9dlV61CROxPiVtywwzv5SnytJqhvYe6FclHYuXml4cd1VHPo1zd5PmTeJozvA==",
|
||||
@@ -765,0 +816,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.0.0.tgz",
|
||||
+ "integrity": "sha512-+DwhEHAaFPPdJ2ral3kNHFQXnTfscEEFsUxzD+d7nlcLrFK23JtNjH71RGasTcHb88b4vVi4mTyfpf8u2L8bdA==",
|
||||
@@ -828,0 +881,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.9.tgz",
|
||||
+ "integrity": "sha512-sicdRoWtYevwxjOHNMPTl3vSfJM6oyW8o1wXeI7uww6b6xHg8eBznQDNSGBCDJmsE8UMxP05JgZRtsKbTqt//Q==",
|
||||
@@ -833,0 +888,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz",
|
||||
+ "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ==",
|
||||
@@ -886,0 +943,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
|
||||
+ "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
|
||||
@@ -1049,0 +1108,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/awilix/-/awilix-12.0.2.tgz",
|
||||
+ "integrity": "sha512-BoXlUZmTJc2j+uCDAMglNnWNf1b9KDEGmrgYs3vnOldK+bkiAiJnisgbIJWvGC1MFt/uYd3tG+Esd/0VmLreKw==",
|
||||
@@ -1293,0 +1354,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/chai/-/chai-5.1.1.tgz",
|
||||
+ "integrity": "sha512-pT1ZgP8rPNqUgieVaEY+ryQr6Q4HXNg8Ei9UnLUrjN4IA7dvQC5JB+/kxVcPNDHyBcc/26CXPkbNzq3qwrOEKA==",
|
||||
@@ -1569,0 +1632,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
|
||||
+ "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
|
||||
@@ -1851,0 +1916,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.12.0.tgz",
|
||||
+ "integrity": "sha512-UVIOlTEWxwIopRL1wgSQYdnVDcEvs2wyaO6DGo5mXqe3r16IoCNWkR29iHhyaP4cICWjbgbmFUGAhh0GJRuGZw==",
|
||||
@@ -1932,0 +1999,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.1.0.tgz",
|
||||
+ "integrity": "sha512-14dSvlhaVhKKsa9Fx1l8A17s7ah7Ef7wCakJ10LYk6+GYmP9yDti2oq2SEwcyndt6knfcZyhyxwY3i9yL78EQw==",
|
||||
@@ -1946,0 +2015,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.1.0.tgz",
|
||||
+ "integrity": "sha512-Q7lok0mqMUSf5a/AdAZkA5a/gHcO6snwQClVNNvFKCAVlxXucdU8pKydU5ZVZjBx5xr37vGbFFWtLQYreLzrZg==",
|
||||
@@ -1993,0 +2064,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/espree/-/espree-10.2.0.tgz",
|
||||
+ "integrity": "sha512-upbkBJbckcCNBDBDXEbuhjbP68n+scUd3k/U2EkyM9nw+I/jPiL4cLF/Al06CF96wRltFda16sxDFrxsI1v0/g==",
|
||||
@@ -2227,0 +2300,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
|
||||
+ "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
|
||||
@@ -2367,0 +2442,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/globals/-/globals-15.11.0.tgz",
|
||||
+ "integrity": "sha512-yeyNSjdbyVaWurlwCpcA6XNBrHTMIeDdj0/hnvX/OLJ9ekOXYbLsLinH/MucQyGvNnXhidTdNhTtJaffL2sMfw==",
|
||||
@@ -2581,0 +2658,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-12.0.0.tgz",
|
||||
+ "integrity": "sha512-W3mwgzLtWIqHndtAb82zCHbRfdPit3jcqEyYkAjM/4p15g/1tOoduYydx6IJ3sh31FHT82YoqYZB8RoTwoMy7w==",
|
||||
@@ -2874,0 +2953,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/ky/-/ky-1.7.2.tgz",
|
||||
+ "integrity": "sha512-OzIvbHKKDpi60TnF9t7UUVAF1B4mcqc02z5PIvrm08Wyb+yOcz63GRvEuVxNT18a9E1SrNouhB4W2NNLeD7Ykg==",
|
||||
@@ -3210,0 +3291,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.7.3.tgz",
|
||||
+ "integrity": "sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==",
|
||||
@@ -3707,0 +3790,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
|
||||
+ "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
|
||||
@@ -3899,0 +3984,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-5.0.2.tgz",
|
||||
+ "integrity": "sha512-o/3ikDxtXaA59BmZuZrJZDJv8NMDGSj+6j6XaeBmHw8eY1i1qd9+6H+LjVvQXx3HN6aRCGa1cUdJ9RaJZUugnQ==",
|
||||
@@ -4319,0 +4406,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
|
||||
+ "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
|
||||
@@ -4373,0 +4462,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
|
||||
+ "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
|
||||
@@ -4405,0 +4496,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.26.1.tgz",
|
||||
+ "integrity": "sha512-yOGpmOAL7CkKe/91I5O3gPICmJNLJ1G4zFYVAsRHg7M64biSnPtRj0WNQt++bRkjYOqjWXrhnUw1utzmVErAdg==",
|
||||
@@ -4415,0 +4508,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz",
|
||||
+ "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
|
||||
@@ -4427,0 +4522,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
|
||||
+ "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
|
||||
+5392
File diff suppressed because it is too large
Load Diff
@@ -4,6 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
esbuild,
|
||||
buildGoModule,
|
||||
nodejs_22,
|
||||
}:
|
||||
let
|
||||
esbuild' = esbuild.override {
|
||||
@@ -36,19 +37,22 @@ buildNpmPackage (finalAttrs: {
|
||||
hash = "sha256-JbTS54e1pNxoqTAlEdOqKqkEyAzFJLI6he7/jivVPzI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./package-lock-fix.patch
|
||||
];
|
||||
# upstream's package-lock.json is missing entries needed by npm >= 11
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-RNgx3Oorc/+nHHZHdOmyA9Q3fCW7yaAzX0DqHbCMqt0=";
|
||||
npmDepsHash = "sha256-OH/ippCHRy7glq+wXBwnHIVCO6yL5CItng/vCKv+0fQ=";
|
||||
|
||||
nodejs = nodejs_22;
|
||||
|
||||
npmFlags = [ "--ignore-scripts" ];
|
||||
|
||||
env.ESBUILD_BINARY_PATH = lib.getExe esbuild';
|
||||
|
||||
# While this errors, it makes the build complete successfully. Therefore, ????
|
||||
# ssh2's optional cpu-features native module needs node-gyp building to satisfy esbuild's bundler
|
||||
preBuild = ''
|
||||
npm rebuild --verbose cpu-features
|
||||
npm rebuild cpu-features
|
||||
'';
|
||||
|
||||
npmBuildScript = "build:app";
|
||||
|
||||
@@ -19,9 +19,10 @@ fi
|
||||
git clone "https://github.com/fauna/fauna-shell" -b "v$NEW_VERSION" "$WORKDIR/src"
|
||||
pushd "$WORKDIR/src"
|
||||
npx --yes npm-package-lock-add-resolved
|
||||
npm install --package-lock-only --ignore-scripts
|
||||
|
||||
# Update package-lock patch
|
||||
git diff -U0 >"$PACKAGE_DIR/package-lock-fix.patch"
|
||||
# Update vendored lock file
|
||||
cp package-lock.json "$PACKAGE_DIR/package-lock.json"
|
||||
popd
|
||||
|
||||
# Run nix-update
|
||||
|
||||
@@ -27,6 +27,10 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
subPackages = [
|
||||
"cmd/fence"
|
||||
];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "fluxcd-operator-mcp";
|
||||
version = "0.48.0";
|
||||
version = "0.50.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "controlplaneio-fluxcd";
|
||||
repo = "fluxcd-operator";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Ggx38aF9o7dMFcQxYbx5hSXCE2oRRTgvUvXCAJJN6V8=";
|
||||
hash = "sha256-4FIsad3/57KtyTVQE0T4jhQGEvuEw9/ZFWsriLyc6Ok=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xG4mJQfww/pMIg9zK2XpDw7XGCLHvJPXLvBspdSRAcg=";
|
||||
vendorHash = "sha256-DxXTepwTjgc+Xy3MAIFcYZ/XZZ3zGgyStmXN2/BqM74=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
cmake,
|
||||
doctest,
|
||||
}:
|
||||
@@ -21,6 +22,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# do not download doctest, use the system doctest instead
|
||||
# originally from: https://sources.debian.org/data/main/f/foonathan-memory/0.7.3-2/debian/patches/0001-Use-system-doctest.patch
|
||||
./0001-Use-system-doctest.patch.patch
|
||||
|
||||
(fetchpatch2 {
|
||||
# Fix build under clang on Darwin
|
||||
# https://github.com/foonathan/memory/pull/192
|
||||
name = "size-suffixes-cannot-have-a-space.patch";
|
||||
url = "https://github.com/foonathan/memory/commit/0f5ebe9f4ac2d2ad106d596c993d13e107b27820.patch?full_index=1";
|
||||
hash = "sha256-RtLGDe6ZQ4CQD25pjS20+SZLhxGSrm/A7cO6VUgPbfo=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
let
|
||||
core = fetchFromGitHub {
|
||||
owner = "fvs-lab";
|
||||
repo = "core";
|
||||
tag = "v0.0.1";
|
||||
hash = "sha256-IBNNa5LGjtPNWhI0PC0NX8rK8z2LnfzOpKpDE1TZQhw=";
|
||||
};
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "fvs2";
|
||||
version = "0.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fvs-lab";
|
||||
repo = "fvs2";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-YFtHWtkAPxHT2BqJyyKpPPwkrYyDoFEHq76mNPczJjI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-onx9DxaDcNwDWXfSNSugOG9WoLG918b2A1KJIaeQNpI=";
|
||||
|
||||
preBuild = ''
|
||||
cp -r ${core} ../core
|
||||
'';
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
meta = {
|
||||
description = "Standalone CLI for FVS v2";
|
||||
homepage = "https://github.com/fvs-lab/fvs2";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "fvs2";
|
||||
maintainers = [ lib.maintainers.Gliczy ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -7,17 +7,19 @@
|
||||
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "git-bars";
|
||||
version = "0-unstable-2023-08-08";
|
||||
format = "setuptools";
|
||||
version = "0-unstable-2023-08-20";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "knadh";
|
||||
repo = "git-bars";
|
||||
rev = "f15fbc15345d9ef021e5a9b278e352bb532dcee8";
|
||||
hash = "sha256-jHP6LqhUQv6hh97tSXAdOruWdtp2FXM6ANlpWoA+fHQ=";
|
||||
rev = "8c935c75844512553ae50e396181c422504516d7";
|
||||
hash = "sha256-aGvioTurv0OPwpBib5O+Nytt6WZqwylhTZHYk5qmCEo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ python3Packages.setuptools ];
|
||||
|
||||
dependencies = [
|
||||
git
|
||||
python3Packages.setuptools
|
||||
];
|
||||
|
||||
+495
@@ -0,0 +1,495 @@
|
||||
{
|
||||
"name": "git-run",
|
||||
"version": "0.5.5",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "git-run",
|
||||
"version": "0.5.5",
|
||||
"license": "BSD-3-Clause",
|
||||
"dependencies": {
|
||||
"async": "^2.1.4",
|
||||
"lodash.groupby": "^4.6.0",
|
||||
"minilog": "~3.1.0",
|
||||
"simple-git": "^1.65.0",
|
||||
"tabtab": "git+https://github.com/mixu/node-tabtab.git"
|
||||
},
|
||||
"bin": {
|
||||
"gr": "bin/gr"
|
||||
},
|
||||
"devDependencies": {
|
||||
"file-fixture": "0.0.2",
|
||||
"mocha": "~3.5.3"
|
||||
}
|
||||
},
|
||||
"node_modules/async": {
|
||||
"version": "2.6.4",
|
||||
"resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
|
||||
"integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"lodash": "^4.17.14"
|
||||
}
|
||||
},
|
||||
"node_modules/balanced-match": {
|
||||
"version": "1.0.2",
|
||||
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
|
||||
"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/brace-expansion": {
|
||||
"version": "1.1.14",
|
||||
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
|
||||
"integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"balanced-match": "^1.0.0",
|
||||
"concat-map": "0.0.1"
|
||||
}
|
||||
},
|
||||
"node_modules/browser-stdout": {
|
||||
"version": "1.3.0",
|
||||
"resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz",
|
||||
"integrity": "sha512-7Rfk377tpSM9TWBEeHs0FlDZGoAIei2V/4MdZJoFMBFAK6BqLpxAIUepGRHGdPFgGsLb02PXovC4qddyHvQqTg==",
|
||||
"dev": true,
|
||||
"license": "ISC"
|
||||
},
|
||||
"node_modules/commander": {
|
||||
"version": "2.9.0",
|
||||
"resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
|
||||
"integrity": "sha512-bmkUukX8wAOjHdN26xj5c4ctEV22TQ7dQYhSmuckKhToXrkUn0iIaolHdIxYYqD55nhpSPA9zPQ1yP57GdXP2A==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"graceful-readlink": ">= 1.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 0.6.x"
|
||||
}
|
||||
},
|
||||
"node_modules/concat-map": {
|
||||
"version": "0.0.1",
|
||||
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
|
||||
"integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/debug": {
|
||||
"version": "2.6.8",
|
||||
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
|
||||
"integrity": "sha512-E22fsyWPt/lr4/UgQLt/pXqerGMDsanhbnmqIS3VAXuDi1v3IpiwXe2oncEIondHSBuPDWRoK/pMjlvi8FuOXQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"ms": "2.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/diff": {
|
||||
"version": "3.2.0",
|
||||
"resolved": "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz",
|
||||
"integrity": "sha512-597ykPFhtJYaXqPq6fF7Vl1fXTKgPdLOntyxpmdzUOKiYGqK7zcnbplj5088+8qJnWdzXhyeau5iVr8HVo9dgg==",
|
||||
"dev": true,
|
||||
"license": "BSD-3-Clause",
|
||||
"engines": {
|
||||
"node": ">=0.3.1"
|
||||
}
|
||||
},
|
||||
"node_modules/escape-string-regexp": {
|
||||
"version": "1.0.5",
|
||||
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
|
||||
"integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=0.8.0"
|
||||
}
|
||||
},
|
||||
"node_modules/file-fixture": {
|
||||
"version": "0.0.2",
|
||||
"resolved": "https://registry.npmjs.org/file-fixture/-/file-fixture-0.0.2.tgz",
|
||||
"integrity": "sha512-0UmczA38JP6gD6206HzQMyySA6gBdGlBh/2YIRfx8c1ZEe7jhCyIdr05EdR/KETEup4DnxMxUq5JOjpDzvK7TA==",
|
||||
"dev": true,
|
||||
"license": "BSD",
|
||||
"dependencies": {
|
||||
"mkdirp": "0.5.x",
|
||||
"rimraf": "2.2.x"
|
||||
}
|
||||
},
|
||||
"node_modules/fs.realpath": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
|
||||
"integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
|
||||
"dev": true,
|
||||
"license": "ISC"
|
||||
},
|
||||
"node_modules/glob": {
|
||||
"version": "7.1.1",
|
||||
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
|
||||
"integrity": "sha512-mRyN/EsN2SyNhKWykF3eEGhDpeNplMWaW18Bmh76tnOqk5TbELAVwFAYOCmKVssOYFrYvvLMguiA+NXO3ZTuVA==",
|
||||
"deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
|
||||
"dev": true,
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"fs.realpath": "^1.0.0",
|
||||
"inflight": "^1.0.4",
|
||||
"inherits": "2",
|
||||
"minimatch": "^3.0.2",
|
||||
"once": "^1.3.0",
|
||||
"path-is-absolute": "^1.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/graceful-readlink": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
|
||||
"integrity": "sha512-8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/growl": {
|
||||
"version": "1.9.2",
|
||||
"resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz",
|
||||
"integrity": "sha512-RTBwDHhNuOx4F0hqzItc/siXCasGfC4DeWcBamclWd+6jWtBaeB/SGbMkGf0eiQoW7ib8JpvOgnUsmgMHI3Mfw==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/has-flag": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
|
||||
"integrity": "sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/he": {
|
||||
"version": "1.1.1",
|
||||
"resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
|
||||
"integrity": "sha512-z/GDPjlRMNOa2XJiB4em8wJpuuBfrFOlYKTZxtpkdr1uPdibHI8rYA3MY0KDObpVyaes0e/aunid/t88ZI2EKA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"bin": {
|
||||
"he": "bin/he"
|
||||
}
|
||||
},
|
||||
"node_modules/inflight": {
|
||||
"version": "1.0.6",
|
||||
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
|
||||
"integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
|
||||
"deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
|
||||
"dev": true,
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"once": "^1.3.0",
|
||||
"wrappy": "1"
|
||||
}
|
||||
},
|
||||
"node_modules/inherits": {
|
||||
"version": "2.0.4",
|
||||
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
|
||||
"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
|
||||
"dev": true,
|
||||
"license": "ISC"
|
||||
},
|
||||
"node_modules/json3": {
|
||||
"version": "3.3.2",
|
||||
"resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
|
||||
"integrity": "sha512-I5YLeauH3rIaE99EE++UeH2M2gSYo8/2TqDac7oZEH6D/DSQ4Woa628Qrfj1X9/OY5Mk5VvIDQaKCDchXaKrmA==",
|
||||
"deprecated": "Please use the native JSON object instead of JSON 3",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/lodash": {
|
||||
"version": "4.18.1",
|
||||
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz",
|
||||
"integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/lodash._baseassign": {
|
||||
"version": "3.2.0",
|
||||
"resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
|
||||
"integrity": "sha512-t3N26QR2IdSN+gqSy9Ds9pBu/J1EAFEshKlUHpJG3rvyJOYgcELIxcIeKKfZk7sjOz11cFfzJRsyFry/JyabJQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"lodash._basecopy": "^3.0.0",
|
||||
"lodash.keys": "^3.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/lodash._basecopy": {
|
||||
"version": "3.0.1",
|
||||
"resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
|
||||
"integrity": "sha512-rFR6Vpm4HeCK1WPGvjZSJ+7yik8d8PVUdCJx5rT2pogG4Ve/2ZS7kfmO5l5T2o5V2mqlNIfSF5MZlr1+xOoYQQ==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/lodash._basecreate": {
|
||||
"version": "3.0.3",
|
||||
"resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz",
|
||||
"integrity": "sha512-EDem6C9iQpn7fxnGdmhXmqYGjCkStmDXT4AeyB2Ph8WKbglg4aJZczNkQglj+zWXcOEEkViK8THuV2JvugW47g==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/lodash._getnative": {
|
||||
"version": "3.9.1",
|
||||
"resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
|
||||
"integrity": "sha512-RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/lodash._isiterateecall": {
|
||||
"version": "3.0.9",
|
||||
"resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
|
||||
"integrity": "sha512-De+ZbrMu6eThFti/CSzhRvTKMgQToLxbij58LMfM8JnYDNSOjkjTCIaa8ixglOeGh2nyPlakbt5bJWJ7gvpYlQ==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/lodash.create": {
|
||||
"version": "3.1.1",
|
||||
"resolved": "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz",
|
||||
"integrity": "sha512-IUfOYwDEbI8JbhW6psW+Ig01BOVK67dTSCUAbS58M0HBkPcAv/jHuxD+oJVP2tUCo3H9L6f/8GM6rxwY+oc7/w==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"lodash._baseassign": "^3.0.0",
|
||||
"lodash._basecreate": "^3.0.0",
|
||||
"lodash._isiterateecall": "^3.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/lodash.groupby": {
|
||||
"version": "4.6.0",
|
||||
"resolved": "https://registry.npmjs.org/lodash.groupby/-/lodash.groupby-4.6.0.tgz",
|
||||
"integrity": "sha512-5dcWxm23+VAoz+awKmBaiBvzox8+RqMgFhi7UvX9DHZr2HdxHXM/Wrf8cfKpsW37RNrvtPn6hSwNqurSILbmJw==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/lodash.isarguments": {
|
||||
"version": "3.1.0",
|
||||
"resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
|
||||
"integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/lodash.isarray": {
|
||||
"version": "3.0.4",
|
||||
"resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
|
||||
"integrity": "sha512-JwObCrNJuT0Nnbuecmqr5DgtuBppuCvGD9lxjFpAzwnVtdGoDQ1zig+5W8k5/6Gcn0gZ3936HDAlGd28i7sOGQ==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/lodash.keys": {
|
||||
"version": "3.1.2",
|
||||
"resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
|
||||
"integrity": "sha512-CuBsapFjcubOGMn3VD+24HOAPxM79tH+V6ivJL3CHYjtrawauDJHUk//Yew9Hvc6e9rbCrURGk8z6PC+8WJBfQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"lodash._getnative": "^3.0.0",
|
||||
"lodash.isarguments": "^3.0.0",
|
||||
"lodash.isarray": "^3.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/microee": {
|
||||
"version": "0.0.6",
|
||||
"resolved": "https://registry.npmjs.org/microee/-/microee-0.0.6.tgz",
|
||||
"integrity": "sha512-/LdL3jiBWDJ3oQIRLgRhfeCZNE3patM1LiwCC124+/HHn10sI/G2OAyiMfTNzH5oYWoZBk0tRZADAUOv+0Wt0A==",
|
||||
"license": "BSD"
|
||||
},
|
||||
"node_modules/minilog": {
|
||||
"version": "3.1.0",
|
||||
"resolved": "https://registry.npmjs.org/minilog/-/minilog-3.1.0.tgz",
|
||||
"integrity": "sha512-Xfm4jWjWzSAduvEWtuZX/8TMkxfJlCfH7XvikCZe3ptojYTBq1eoEs3rh9/3LNLOckUP86m+8l8+Iw5NU/pBww==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"microee": "0.0.6"
|
||||
}
|
||||
},
|
||||
"node_modules/minimatch": {
|
||||
"version": "3.1.5",
|
||||
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
|
||||
"integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
|
||||
"dev": true,
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"brace-expansion": "^1.1.7"
|
||||
},
|
||||
"engines": {
|
||||
"node": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/minimist": {
|
||||
"version": "1.2.8",
|
||||
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
|
||||
"integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/ljharb"
|
||||
}
|
||||
},
|
||||
"node_modules/mkdirp": {
|
||||
"version": "0.5.6",
|
||||
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
|
||||
"integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"minimist": "^1.2.6"
|
||||
},
|
||||
"bin": {
|
||||
"mkdirp": "bin/cmd.js"
|
||||
}
|
||||
},
|
||||
"node_modules/mocha": {
|
||||
"version": "3.5.3",
|
||||
"resolved": "https://registry.npmjs.org/mocha/-/mocha-3.5.3.tgz",
|
||||
"integrity": "sha512-/6na001MJWEtYxHOV1WLfsmR4YIynkUEhBwzsb+fk2qmQ3iqsi258l/Q2MWHJMImAcNpZ8DEdYAK72NHoIQ9Eg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"browser-stdout": "1.3.0",
|
||||
"commander": "2.9.0",
|
||||
"debug": "2.6.8",
|
||||
"diff": "3.2.0",
|
||||
"escape-string-regexp": "1.0.5",
|
||||
"glob": "7.1.1",
|
||||
"growl": "1.9.2",
|
||||
"he": "1.1.1",
|
||||
"json3": "3.3.2",
|
||||
"lodash.create": "3.1.1",
|
||||
"mkdirp": "0.5.1",
|
||||
"supports-color": "3.1.2"
|
||||
},
|
||||
"bin": {
|
||||
"_mocha": "bin/_mocha",
|
||||
"mocha": "bin/mocha"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 0.10.x",
|
||||
"npm": ">= 1.4.x"
|
||||
}
|
||||
},
|
||||
"node_modules/mocha/node_modules/minimist": {
|
||||
"version": "0.0.8",
|
||||
"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
|
||||
"integrity": "sha512-miQKw5Hv4NS1Psg2517mV4e4dYNaO3++hjAvLOAzKqZ61rH8NS1SK+vbfBWZ5PY/Me/bEWhUwqMghEW5Fb9T7Q==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/mocha/node_modules/mkdirp": {
|
||||
"version": "0.5.1",
|
||||
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
|
||||
"integrity": "sha512-SknJC52obPfGQPnjIkXbmA6+5H15E+fR+E4iR2oQ3zzCLbd7/ONua69R/Gw7AgkTLsRG+r5fzksYwWe1AgTyWA==",
|
||||
"deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"minimist": "0.0.8"
|
||||
},
|
||||
"bin": {
|
||||
"mkdirp": "bin/cmd.js"
|
||||
}
|
||||
},
|
||||
"node_modules/ms": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
|
||||
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/once": {
|
||||
"version": "1.4.0",
|
||||
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
|
||||
"integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
|
||||
"dev": true,
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"wrappy": "1"
|
||||
}
|
||||
},
|
||||
"node_modules/path-is-absolute": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
|
||||
"integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/rimraf": {
|
||||
"version": "2.2.8",
|
||||
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
|
||||
"integrity": "sha512-R5KMKHnPAQaZMqLOsyuyUmcIjSeDm+73eoqQpaXA7AZ22BL+6C+1mcUscgOsNd8WVlJuvlgAPsegcx7pjlV0Dg==",
|
||||
"deprecated": "Rimraf versions prior to v4 are no longer supported",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"bin": {
|
||||
"rimraf": "bin.js"
|
||||
}
|
||||
},
|
||||
"node_modules/simple-git": {
|
||||
"version": "1.132.0",
|
||||
"resolved": "https://registry.npmjs.org/simple-git/-/simple-git-1.132.0.tgz",
|
||||
"integrity": "sha512-xauHm1YqCTom1sC9eOjfq3/9RKiUA9iPnxBbrY2DdL8l4ADMu0jjM5l5lphQP5YWNqAL2aXC/OeuQ76vHtW5fg==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"debug": "^4.0.1"
|
||||
}
|
||||
},
|
||||
"node_modules/simple-git/node_modules/debug": {
|
||||
"version": "4.4.3",
|
||||
"resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
|
||||
"integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"ms": "^2.1.3"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=6.0"
|
||||
},
|
||||
"peerDependenciesMeta": {
|
||||
"supports-color": {
|
||||
"optional": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"node_modules/simple-git/node_modules/ms": {
|
||||
"version": "2.1.3",
|
||||
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
|
||||
"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/supports-color": {
|
||||
"version": "3.1.2",
|
||||
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz",
|
||||
"integrity": "sha512-F8dvPrZJtNzvDRX26eNXT4a7AecAvTGljmmnI39xEgSpbHKhQ7N0dO/NTxUExd0wuLHp4zbwYY7lvHq0aKpwrA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"has-flag": "^1.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=0.8.0"
|
||||
}
|
||||
},
|
||||
"node_modules/tabtab": {
|
||||
"version": "0.0.2",
|
||||
"resolved": "git+ssh://git@github.com/mixu/node-tabtab.git#94af2b878b174527b6636aec88acd46979247755",
|
||||
"engines": {
|
||||
"node": "> 0.4"
|
||||
}
|
||||
},
|
||||
"node_modules/wrappy": {
|
||||
"version": "1.0.2",
|
||||
"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
|
||||
"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
|
||||
"dev": true,
|
||||
"license": "ISC"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -16,7 +16,11 @@ buildNpmPackage rec {
|
||||
hash = "sha256-WPnar87p0GYf6ehhVEUeZd2pTjS95Zl6NpiJuIOQ5Tc=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-PdxKFopmuNRWkSwPDX1wcNTvRtbVScl1WsZi7sdkKMw=";
|
||||
npmDepsHash = "sha256-nHFkkGovO+kCxRlV02PxmKZ0GXYTqqOZd2MBspk59Ew=";
|
||||
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
'';
|
||||
|
||||
makeCacheWritable = true;
|
||||
dontBuild = true;
|
||||
|
||||
@@ -19,7 +19,10 @@ let
|
||||
homepage = "https://www.jetbrains.com/toolbox-app";
|
||||
license = lib.licenses.unfree;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with lib.maintainers; [ ners ];
|
||||
maintainers = with lib.maintainers; [
|
||||
ners
|
||||
fabiob
|
||||
];
|
||||
platforms = [
|
||||
"aarch64-linux"
|
||||
"aarch64-darwin"
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kristall";
|
||||
version = "0.3";
|
||||
version = "0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MasterQ32";
|
||||
repo = "kristall";
|
||||
rev = "V${version}";
|
||||
sha256 = "07nf7w6ilzs5g6isnvsmhh4qa1zsprgjyf0zy7rhpx4ikkj8c8zq";
|
||||
hash = "sha256-zTO55xTc7hXlqVUVlx921+LalKj/yQwjEgXW2YUdG70=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.cc.isClang ''
|
||||
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
libsForQt5.wrapQtAppsHook
|
||||
libsForQt5.qmake
|
||||
libsForQt5.qttools
|
||||
];
|
||||
|
||||
buildInputs = [ libsForQt5.qtmultimedia ];
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kubeshark";
|
||||
version = "53.2.3";
|
||||
version = "53.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubeshark";
|
||||
repo = "kubeshark";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Ey40GmwM7UdMNZIYLF1AFeJAwnT2f2xqHB6lG/uM+ds=";
|
||||
hash = "sha256-YKR0P/4X134NTPuXeh1Ha781wav7daAxp+xJWCmgkIw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4s1gxJo2w5BibZ9CJP7Jl9Z8Zzo8WpBokBnRN+zp8b4=";
|
||||
|
||||
@@ -24,16 +24,16 @@ let
|
||||
in
|
||||
phpPackage.buildComposerProject2 rec {
|
||||
pname = "librenms";
|
||||
version = "26.3.1";
|
||||
version = "26.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "librenms";
|
||||
repo = "librenms";
|
||||
tag = version;
|
||||
hash = "sha256-wLmZHE7W1ulBvUBpwVatdR8etFVhdG/zpggUpNIb65s=";
|
||||
hash = "sha256-RCSM8wSe5JOajhn4ku42NxZHDqHJjril9bg5IcPhyoE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-uJ7DBJGQ4D1UnZXSUnrO3Fy3xEFz6ZxcMQ12E2jKKSM=";
|
||||
vendorHash = "sha256-D7aPypNn5d/pDJMOeODLsnqU80m/swfXrIsqrRiPjCY=";
|
||||
|
||||
php = phpPackage;
|
||||
|
||||
@@ -82,6 +82,7 @@ phpPackage.buildComposerProject2 rec {
|
||||
--replace-fail '"default": "/usr/bin/snmpbulkwalk",' '"default": "${net-snmp}/bin/snmpbulkwalk",' \
|
||||
--replace-fail '"default": "/usr/bin/snmpget",' '"default": "${net-snmp}/bin/snmpget",' \
|
||||
--replace-fail '"default": "/usr/bin/snmptranslate",' '"default": "${net-snmp}/bin/snmptranslate",' \
|
||||
--replace-fail '"default": "/usr/bin/snmptrap",' '"default": "${net-snmp}/bin/snmptrap",' \
|
||||
--replace-fail '"default": "/usr/bin/snmpwalk",' '"default": "${net-snmp}/bin/snmpwalk",' \
|
||||
--replace-fail '"default": "/usr/bin/virsh",' '"default": "${libvirt}/bin/virsh",' \
|
||||
--replace-fail '"default": "/usr/lib/nagios/plugins",' '"default": "${monitoring-plugins}/bin",' \
|
||||
|
||||
@@ -3,10 +3,11 @@
|
||||
buildGoModule,
|
||||
lib,
|
||||
nix-update-script,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "lstk";
|
||||
version = "0.6.0";
|
||||
version = "0.9.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -14,15 +15,17 @@ buildGoModule (finalAttrs: {
|
||||
owner = "localstack";
|
||||
repo = "lstk";
|
||||
tag = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-sK3xtmbXxoqKGpFPscKxqy/8rr+G6tpcKXtRL9FLMK0=";
|
||||
sha256 = "sha256-wfU7b70SZfv/4hvTRAqfE807dyUW32j2M1V/k3R2Z20=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-wXSFZpZUaeBNevirGIG1qsrroK3S5ccZZ31z8pRdmKM=";
|
||||
vendorHash = "sha256-y1qzHSKJS2k98UicoUPmctsGQGiXweNbWKMsFpvYBMo=";
|
||||
|
||||
excludedPackages = "test/integration";
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
nativeCheckInputs = [ writableTmpDirAsHomeHook ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -11,17 +11,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mago";
|
||||
version = "1.23.0";
|
||||
version = "1.29.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "carthage-software";
|
||||
repo = "mago";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-5rdmDbAqqHZU65C+lFHxV7T8//Tw8v8gQKSNbVHSlno=";
|
||||
hash = "sha256-e/LKOQ+GAtdDye/poJdbX/98gDWle3NWIZ2zHwkGkcQ=";
|
||||
forceFetchGit = true; # Does not download all files otherwise
|
||||
};
|
||||
|
||||
cargoHash = "sha256-fOxfQTacb3ap5soCVtJnlFPSl3IH+Ju1pPs8xrFBVCw=";
|
||||
cargoHash = "sha256-stjjP8VRHy5k9zMXWGikVNExXRFte0gVBEsbKmPY6U4=";
|
||||
|
||||
env = {
|
||||
# Get openssl-sys to use pkg-config
|
||||
|
||||
@@ -46,18 +46,18 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "martin";
|
||||
version = "1.9.1";
|
||||
version = "1.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maplibre";
|
||||
repo = "martin";
|
||||
tag = "martin-v${finalAttrs.version}";
|
||||
hash = "sha256-LaPRkmzTVNn3qKJjrDNz8bcSWXy5SubevfjGvb+JvUg=";
|
||||
hash = "sha256-Zu3vkU7HQcSqzCL7n0uX4M+DxBDMC0Sii7esxM9AtpA=";
|
||||
};
|
||||
|
||||
patches = [ ./dont-build-webui.patch ];
|
||||
|
||||
cargoHash = "sha256-dOTlYQcn2TWtzhJNFf3cVyR5EOvjBgW3qgBReUlfjTg=";
|
||||
cargoHash = "sha256-OPuUvm4ez5TZUWwJ6D6fqy++cCiVt7f1qP6OPdsOEDA=";
|
||||
|
||||
webui = buildNpmPackage {
|
||||
pname = "martin-ui";
|
||||
@@ -71,7 +71,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
ln -sf ${finalAttrs.src}/demo/frontend/public/favicon.ico public/_/assets/favicon.ico
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-kuLnRFubvmskSRg1Jmdw79oTt0jrzbjW64zhcKfcuX4=";
|
||||
npmDepsHash = "sha256-lX5FSWAQyy4Sa7OPnNyTYttjHiPuYxgrPsmZpwCnpO8=";
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "narsil";
|
||||
version = "1.4.0-140-g962201f6f";
|
||||
version = "1.4.0-143-g086e3b6af";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NickMcConnell";
|
||||
repo = "NarSil";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-6vAVdogjun8Ali/Y71w0jlBU7mEXA0wy2yYCSXPSY3E=";
|
||||
hash = "sha256-/6SOftTmm0EWccyxRzBHkIAVqPz37Ga6kuJL03gMTqo=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "5.14.44";
|
||||
version = "5.15.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "d99kris";
|
||||
repo = "nchat";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-gG0YkahHP/6KjM+5uzdTRxsonn83cxlJDvdn5HE3h0Q=";
|
||||
hash = "sha256-SJG+yKYm1T8VjhfTCUzFXwgBClPqa3fqnOUOwDOyRhg=";
|
||||
};
|
||||
|
||||
libcgowm = buildGoModule {
|
||||
@@ -31,7 +31,7 @@ let
|
||||
inherit version src;
|
||||
|
||||
sourceRoot = "${src.name}/lib/wmchat/go";
|
||||
vendorHash = "sha256-5Id5+DehV2juLJnEHYvcI67/ykFUQehSrfFW+toZRM0=";
|
||||
vendorHash = "sha256-KMTMxnjz28pVcIDKkJ/l7x3iw5GtEk8LkG4ccgsjdCA=";
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
@@ -7,22 +7,19 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "pdf-parser";
|
||||
version = "0.7.10";
|
||||
version = "0.7.14";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://didierstevens.com/files/software/pdf-parser_V${
|
||||
lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version
|
||||
}.zip";
|
||||
hash = "sha256-RhgEGue3RcALjLXKOnnXyx/0subXHNuXfDg8hbO3VDg=";
|
||||
hash = "sha256-oAmTzkBxwrXXSSimaN1Uo4wP+7ySrmyJNb9jD2uWglA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# quote regular expressions correctly
|
||||
substituteInPlace pdf-parser.py \
|
||||
--replace-fail \
|
||||
"re.sub('" \
|
||||
"re.sub(r'" \
|
||||
--replace-fail \
|
||||
"re.match('" \
|
||||
"re.match(r'"
|
||||
@@ -57,7 +54,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
'';
|
||||
homepage = "https://blog.didierstevens.com/programs/pdf-tools/";
|
||||
license = lib.licenses.publicDomain;
|
||||
maintainers = [ lib.maintainers.lightdiscord ];
|
||||
maintainers = with lib.maintainers; [ cbrxyz ];
|
||||
platforms = lib.platforms.all;
|
||||
mainProgram = "pdf-parser.py";
|
||||
};
|
||||
|
||||
@@ -23,18 +23,18 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pods";
|
||||
version = "2.3.0";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "marhkb";
|
||||
repo = "pods";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-JWOxp3J+7k0ikdFJ8SDFcspuM5SO5rQm5/21G4FAAag=";
|
||||
hash = "sha256-50NOkLffLbs5/qug6xzoSWSMZ3+/Lau9sTPi9za4+LA=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-UkXBlqFmODlJEm2NBHdKoO5Yc086NAHjo9HOuWb3Jq0=";
|
||||
hash = "sha256-JbYJQdli3OAxnbGApVe5+KAAcGePTTH59fdXdFx0+hA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meta = {
|
||||
description = "Podman desktop application";
|
||||
homepage = "https://github.com/marhkb/pods";
|
||||
changelog = "https://github.com/marhkb/pods/releases/tag/v${finalAttrs.version}";
|
||||
changelog = "https://github.com/marhkb/pods/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ iamanaws ];
|
||||
platforms = lib.platforms.linux;
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "postgres-language-server";
|
||||
version = "0.24.0";
|
||||
version = "0.25.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "supabase-community";
|
||||
repo = "postgres-language-server";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-SAl5cwZah5s0VW50o1dFxW7qhs0fytu/+QZMLZje2Jo=";
|
||||
hash = "sha256-qmDatxcd6WPYuV/VHTY/+vYRPVO/ev/7W6/18ScTvx0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "radvd";
|
||||
version = "2.20";
|
||||
version = "2.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "radvd-project";
|
||||
repo = "radvd";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-s9KP6F6rSumuNDOV4rtE7I+o742al4hc3/dgNkpCCyQ=";
|
||||
hash = "sha256-02ZoLJ8nCk531M6DkP3UIPXgWyOOl2X163ou0ezHwKE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
pkgsStatic.rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rcp";
|
||||
version = "0.31.0";
|
||||
version = "0.32.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wykurz";
|
||||
repo = "rcp";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-ghFVGbud3aKJPvjNchsgPUSioNAxg4TJlUIYMp9+cJo=";
|
||||
hash = "sha256-ZMp1ZMuHdTcJ7iORq9a62pGQo5cGRueuAQy+AjSOY5g=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-eyIO8lxmGdZKEDW+GSVARm5u3X0vx1RJLG8Ljbk0Zb8=";
|
||||
cargoHash = "sha256-ZXPG429qgiAaxZxnDNiMIXiP1d0pkdWEblZuRU8+BSU=";
|
||||
|
||||
env.RUSTFLAGS = "--cfg tokio_unstable";
|
||||
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchurl,
|
||||
unzip,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "reflex-app";
|
||||
version = "2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://stuntsoftware.com/download/reflex_${finalAttrs.version}.zip";
|
||||
hash = "sha256-2CfNMs9zDFyFgrIAuh37bB3wPjDDrGsyyFY65n0CtIk=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p "$out/Applications"
|
||||
cp -R Reflex.app "$out/Applications"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Media key forwarder for Music and Spotify";
|
||||
homepage = "https://stuntsoftware.com/reflex/";
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [ iniw ];
|
||||
platforms = lib.platforms.darwin;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
})
|
||||
@@ -25,6 +25,11 @@ stdenv.mkDerivation {
|
||||
pkg-config
|
||||
];
|
||||
|
||||
patches = [
|
||||
# rename format to run-clang-format to avoid conflict
|
||||
./rename_format_to_run-clang-format.patch
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString (
|
||||
stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64
|
||||
) "-U__ARM_NEON__";
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
From c949a713c36cd7a5cf95dd0d07a5660c0204ce0d Mon Sep 17 00:00:00 2001
|
||||
From: Mathis Antony <sveitser@gmail.com>
|
||||
Date: Sat, 16 May 2026 14:35:08 +0200
|
||||
Subject: [PATCH] rename format to run-clang-format
|
||||
|
||||
- `format` conflicts with the C++ <format> header
|
||||
- fixes: https://hydra.nixos.org/build/327171293/nixlog/1
|
||||
---
|
||||
format => run-clang-format | 0
|
||||
1 file changed, 0 insertions(+), 0 deletions(-)
|
||||
rename format => run-clang-format (100%)
|
||||
|
||||
diff --git a/format b/run-clang-format
|
||||
similarity index 100%
|
||||
rename from format
|
||||
rename to run-clang-format
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
lib,
|
||||
elfutils,
|
||||
vendorCertFile ? null,
|
||||
@@ -31,6 +32,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with binutils 2.46.
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/rhboot/shim/commit/c4665d282072df2ed8ab6ae1d5fa0de41e5db02f.patch?full_index=1";
|
||||
hash = "sha256-0QGqEo5qu3TrG9yqwQLZGuKhgoeReF+RrJzlOVQYDmA=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ elfutils ];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [ "-I${toString elfutils.dev}/include" ];
|
||||
|
||||
@@ -41,6 +41,11 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-d5yzlR2uo//EcFtqhNUU2q/RCwBiXrRNUAMkEbA49ZQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://framagit.org/simgrid/simgrid/-/commit/6159c067c29ac1a3c9a94b025c79cfa3fb109ccd
|
||||
./pybind11-3.0.2.patch
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ boost ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -0,0 +1,118 @@
|
||||
--- a/src/bindings/python/simgrid_python.cpp
|
||||
+++ b/src/bindings/python/simgrid_python.cpp
|
||||
@@ -721,15 +721,19 @@ PYBIND11_MODULE(simgrid, m)
|
||||
"Non-blocking read data from disk")
|
||||
.def("write_async", &simgrid::s4u::Disk::write_async, py::call_guard<py::gil_scoped_release>(),
|
||||
"Non-blocking write data in disk")
|
||||
- .def_property("read_bandwidth", &simgrid::s4u::Disk::get_read_bandwidth, &simgrid::s4u::Disk::set_read_bandwidth,
|
||||
- py::call_guard<py::gil_scoped_release>(),
|
||||
+ .def_property("read_bandwidth",
|
||||
+ py::cpp_function{&simgrid::s4u::Disk::get_read_bandwidth, py::call_guard<py::gil_scoped_release>()},
|
||||
+ py::cpp_function{&simgrid::s4u::Disk::set_read_bandwidth, py::call_guard<py::gil_scoped_release>()},
|
||||
"The read bandwidth of this disk is the max speed at which read operations progress")
|
||||
- .def_property("write_bandwidth", &simgrid::s4u::Disk::get_write_bandwidth,
|
||||
- &simgrid::s4u::Disk::set_write_bandwidth, py::call_guard<py::gil_scoped_release>(),
|
||||
- "The write bandwidth of this disk is the max speed at which write operations progress")
|
||||
.def_property(
|
||||
- "concurrency_limit", &simgrid::s4u::Disk::get_concurrency_limit, &simgrid::s4u::Disk::set_concurrency_limit,
|
||||
- py::call_guard<py::gil_scoped_release>(),
|
||||
+ "write_bandwidth",
|
||||
+ py::cpp_function{&simgrid::s4u::Disk::get_write_bandwidth, py::call_guard<py::gil_scoped_release>()},
|
||||
+ py::cpp_function{&simgrid::s4u::Disk::set_write_bandwidth, py::call_guard<py::gil_scoped_release>()},
|
||||
+ "The write bandwidth of this disk is the max speed at which write operations progress")
|
||||
+ .def_property(
|
||||
+ "concurrency_limit",
|
||||
+ py::cpp_function{&simgrid::s4u::Disk::get_concurrency_limit, py::call_guard<py::gil_scoped_release>()},
|
||||
+ py::cpp_function{&simgrid::s4u::Disk::set_concurrency_limit, py::call_guard<py::gil_scoped_release>()},
|
||||
"The concurrency limit of this disk is the max amound of concurrent accesses (extra ones are queued)")
|
||||
.def("set_sharing_policy", &simgrid::s4u::Disk::set_sharing_policy, py::call_guard<py::gil_scoped_release>(),
|
||||
"Set sharing policy for this disk", py::arg("op"), py::arg("policy"),
|
||||
@@ -738,7 +742,8 @@ PYBIND11_MODULE(simgrid, m)
|
||||
.def("turn_on", &Disk::turn_on, py::call_guard<py::gil_scoped_release>(), "Turns the disk on.")
|
||||
.def("turn_off", &Disk::turn_off, py::call_guard<py::gil_scoped_release>(), "Turns the disk off.")
|
||||
.def_property_readonly("name", &simgrid::s4u::Disk::get_name, "The name of this disk (read-only property).")
|
||||
- .def_property_readonly("host", &simgrid::s4u::Disk::get_host, "The Host to which this disk is attached (read-only property)")
|
||||
+ .def_property_readonly("host", &simgrid::s4u::Disk::get_host,
|
||||
+ "The Host to which this disk is attached (read-only property)")
|
||||
.def(
|
||||
"__repr__", [](const Disk* d) { return "Disk(" + d->get_name() + ")"; },
|
||||
"Textual representation of the Disk");
|
||||
@@ -940,20 +945,26 @@ PYBIND11_MODULE(simgrid, m)
|
||||
|
||||
/* Class Comm */
|
||||
py::class_<Comm, CommPtr, Activity>(m, "Comm", "Communication. See the C++ documentation for details.")
|
||||
- .def_property_readonly("dst_data_size", &Comm::get_dst_data_size, py::call_guard<py::gil_scoped_release>(),
|
||||
+ .def_property_readonly("dst_data_size",
|
||||
+ py::cpp_function{&Comm::get_dst_data_size, py::call_guard<py::gil_scoped_release>()},
|
||||
"Retrieve the size of the received data.")
|
||||
- .def_property_readonly("mailbox", &Comm::get_mailbox, py::call_guard<py::gil_scoped_release>(),
|
||||
+ .def_property_readonly("mailbox", py::cpp_function{&Comm::get_mailbox, py::call_guard<py::gil_scoped_release>()},
|
||||
"Retrieve the mailbox on which this comm acts.")
|
||||
- .def_property_readonly("sender", &Comm::get_sender, py::call_guard<py::gil_scoped_release>())
|
||||
- .def_property_readonly("state_str", &Comm::get_state_str, py::call_guard<py::gil_scoped_release>(),
|
||||
+ .def_property_readonly("sender", py::cpp_function{&Comm::get_sender, py::call_guard<py::gil_scoped_release>()})
|
||||
+ .def_property_readonly("state_str",
|
||||
+ py::cpp_function{&Comm::get_state_str, py::call_guard<py::gil_scoped_release>()},
|
||||
"Retrieve the Comm state as string")
|
||||
- .def_property_readonly("remaining", &Comm::get_remaining, py::call_guard<py::gil_scoped_release>(),
|
||||
+ .def_property_readonly("remaining",
|
||||
+ py::cpp_function{&Comm::get_remaining, py::call_guard<py::gil_scoped_release>()},
|
||||
"Remaining amount of work that this Comm entails")
|
||||
- .def_property_readonly("start_time", &Comm::get_start_time, py::call_guard<py::gil_scoped_release>(),
|
||||
+ .def_property_readonly("start_time",
|
||||
+ py::cpp_function{&Comm::get_start_time, py::call_guard<py::gil_scoped_release>()},
|
||||
"Time at which this Comm started")
|
||||
- .def_property_readonly("finish_time", &Comm::get_finish_time, py::call_guard<py::gil_scoped_release>(),
|
||||
+ .def_property_readonly("finish_time",
|
||||
+ py::cpp_function{&Comm::get_finish_time, py::call_guard<py::gil_scoped_release>()},
|
||||
"Time at which this Comm finished")
|
||||
- .def_property_readonly("is_suspended", &Comm::is_suspended, py::call_guard<py::gil_scoped_release>(),
|
||||
+ .def_property_readonly("is_suspended",
|
||||
+ py::cpp_function{&Comm::is_suspended, py::call_guard<py::gil_scoped_release>()},
|
||||
"Whether this Comm is suspended")
|
||||
.def("set_tracing_category", &Comm::set_tracing_category, py::call_guard<py::gil_scoped_release>(),
|
||||
py::arg("category"), "Set a user-defined tracing category.")
|
||||
@@ -1010,17 +1021,20 @@ PYBIND11_MODULE(simgrid, m)
|
||||
/* Class Exec */
|
||||
py::class_<simgrid::s4u::Exec, simgrid::s4u::ExecPtr, Activity>(m, "Exec",
|
||||
"Execution. See the C++ documentation for details.")
|
||||
- .def_property_readonly("remaining", &simgrid::s4u::Exec::get_remaining, py::call_guard<py::gil_scoped_release>(),
|
||||
- "Amount of flops that remain to be computed until completion (read-only property).")
|
||||
- .def_property_readonly("remaining_ratio", &simgrid::s4u::Exec::get_remaining_ratio,
|
||||
- py::call_guard<py::gil_scoped_release>(),
|
||||
- "Amount of work remaining until completion from 0 (completely done) to 1 (nothing done "
|
||||
- "yet) (read-only property).")
|
||||
+ .def_property_readonly(
|
||||
+ "remaining", py::cpp_function{&simgrid::s4u::Exec::get_remaining, py::call_guard<py::gil_scoped_release>()},
|
||||
+ "Amount of flops that remain to be computed until completion (read-only property).")
|
||||
+ .def_property_readonly(
|
||||
+ "remaining_ratio",
|
||||
+ py::cpp_function{&simgrid::s4u::Exec::get_remaining_ratio, py::call_guard<py::gil_scoped_release>()},
|
||||
+ "Amount of work remaining until completion from 0 (completely done) to 1 (nothing done "
|
||||
+ "yet) (read-only property).")
|
||||
.def_property("host", &simgrid::s4u::Exec::get_host, &simgrid::s4u::Exec::set_host,
|
||||
"Host on which this execution runs. Only the first host is returned for parallel executions. "
|
||||
"Changing this value migrates the execution.")
|
||||
- .def_property_readonly("is_suspended", &simgrid::s4u::Exec::is_suspended,
|
||||
- py::call_guard<py::gil_scoped_release>(), "Whether this Exec is suspended")
|
||||
+ .def_property_readonly(
|
||||
+ "is_suspended", py::cpp_function{&simgrid::s4u::Exec::is_suspended, py::call_guard<py::gil_scoped_release>()},
|
||||
+ "Whether this Exec is suspended")
|
||||
.def("set_tracing_category", &simgrid::s4u::Exec::set_tracing_category, py::call_guard<py::gil_scoped_release>(),
|
||||
py::arg("category"), "Set a user-defined tracing category.")
|
||||
.def("test", &simgrid::s4u::Exec::test, py::call_guard<py::gil_scoped_release>(),
|
||||
@@ -1046,9 +1060,11 @@ PYBIND11_MODULE(simgrid, m)
|
||||
"Acquire on the semaphore object with no timeout. Blocks until the semaphore is acquired or return "
|
||||
"true if it has not been acquired after the specified timeout.")
|
||||
.def("release", &Semaphore::release, py::call_guard<py::gil_scoped_release>(), "Release the semaphore.")
|
||||
- .def_property_readonly("capacity", &Semaphore::get_capacity, py::call_guard<py::gil_scoped_release>(),
|
||||
+ .def_property_readonly("capacity",
|
||||
+ py::cpp_function{&Semaphore::get_capacity, py::call_guard<py::gil_scoped_release>()},
|
||||
"Get the semaphore capacity.")
|
||||
- .def_property_readonly("would_block", &Semaphore::would_block, py::call_guard<py::gil_scoped_release>(),
|
||||
+ .def_property_readonly("would_block",
|
||||
+ py::cpp_function{&Semaphore::would_block, py::call_guard<py::gil_scoped_release>()},
|
||||
"Check whether trying to acquire the semaphore would block (in other word, checks whether "
|
||||
"this semaphore has capacity).")
|
||||
// Allow semaphores to be automatically acquired/released with a context manager: `with semaphore: ...`
|
||||
|
||||
@@ -16,31 +16,23 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "sqld";
|
||||
version = "0.24.32";
|
||||
version = "0.24.33";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tursodatabase";
|
||||
repo = "libsql";
|
||||
tag = "libsql-server-v${finalAttrs.version}";
|
||||
hash = "sha256-CiTJ9jLANBrncz/O/0k2/UI/qGCTGWLZuLQdncunlX8";
|
||||
hash = "sha256-ufpYZdw/96QIQ43ex4FTA/aulouZPDkbmSt7X4YnEzo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/tursodatabase/libsql/pull/1981
|
||||
# A CMakeLists.txt broke builds by forcing the '-msse4.2' and '-maes' x86-specific compile flags,
|
||||
# when compiling with Clang, regardless of the host platform's architecture.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/tursodatabase/libsql/commit/5ce88e8cf9476ea64453bf1532d75c8faf037aad.patch";
|
||||
hash = "sha256-5M6XNp0EpCZMZb7NC7TBGBVdZLkC74vwqEnVTCZ7n5U=";
|
||||
})
|
||||
];
|
||||
patches = [ ];
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--bin"
|
||||
"sqld"
|
||||
];
|
||||
|
||||
cargoHash = "sha256-4Ma/17t+EmmjiYICBLhJifQez0dnwtjhlkmoQrAIG+s";
|
||||
cargoHash = "sha256-n2STJfX1sEeSbr3v9xst3S7UgLrUIdqfokqlHLWCVzY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
fetchzip,
|
||||
fetchurl,
|
||||
pkg-config,
|
||||
versionCheckHook,
|
||||
openssl,
|
||||
@@ -10,49 +10,26 @@
|
||||
|
||||
let
|
||||
studioUiVersion = "v0.1.0";
|
||||
studioUi = fetchzip {
|
||||
studioUi = fetchurl {
|
||||
url = "https://github.com/solana-foundation/surfpool-web-ui/releases/download/${studioUiVersion}/studio-dist.zip";
|
||||
hash = "sha256-uZZpaAIg7f+ji5yonwNbAxbxi+4x7g5V4xKWUXNn1UI=";
|
||||
stripRoot = false;
|
||||
hash = "sha256-DeWm2FzZbdaHXaEFA8W/YIIcJx4Z+uFkrxuajTM9n1M=";
|
||||
};
|
||||
in
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "surfpool-cli";
|
||||
version = "1.2.1";
|
||||
version = "1.3.0";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "solana-foundation";
|
||||
repo = "surfpool";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-oO6K8OJXj2HQOExhT/6auCjfCOpUrSkHJJncztCjRWU=";
|
||||
hash = "sha256-Yy30n/dZgDkXmWZM5KmoK+CJNCPvNcKvk5N+fusELJ4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoHash = "sha256-MLWXYVVmJXxUY6LRsi8LiVJbVAAvcA3wbT8eiz4pAaE=";
|
||||
|
||||
postPatch = ''
|
||||
# instead of downloading the surfpool-web-ui at build time, we fetch it beforehand and use it
|
||||
# https://github.com/solana-foundation/surfpool/pull/628
|
||||
substituteInPlace crates/studio/build.rs \
|
||||
--replace-fail \
|
||||
'let url = match env::var("STUDIO_UI_VERSION") {' \
|
||||
'if let Ok(dist_path) = env::var("STUDIO_UI_DIST") {
|
||||
let src = std::path::Path::new(&dist_path);
|
||||
fn copy_dir(s: &std::path::Path, d: &std::path::Path) {
|
||||
std::fs::create_dir_all(d).unwrap();
|
||||
for e in std::fs::read_dir(s).unwrap() {
|
||||
let e = e.unwrap();
|
||||
if e.file_type().unwrap().is_dir() { copy_dir(&e.path(), &d.join(e.file_name())); }
|
||||
else { std::fs::copy(e.path(), d.join(e.file_name())).unwrap(); }
|
||||
}
|
||||
}
|
||||
copy_dir(src, &asset_dir);
|
||||
return;
|
||||
}
|
||||
let url = match env::var("STUDIO_UI_VERSION") {'
|
||||
'';
|
||||
cargoHash = "sha256-GGuonsdJU/E6A5BM6qcx+f6yZEzvbrmTLBe2lNBdfDI=";
|
||||
|
||||
env = {
|
||||
RUSTFLAGS = "-Aunused";
|
||||
|
||||
@@ -14,13 +14,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "svelte-language-server";
|
||||
version = "0.17.31";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sveltejs";
|
||||
repo = "language-tools";
|
||||
tag = "svelte-language-server@${finalAttrs.version}";
|
||||
hash = "sha256-qcY8ikS7spfbMk1zJ1pu+yyBsFYIFCWB/YqANyCZrVc=";
|
||||
hash = "sha256-YKWH0LCZuNrOJFxQLDzY0pMDNFmwPML86KzbuFozrZA=";
|
||||
};
|
||||
|
||||
pnpmWorkspaces = [ "svelte-language-server..." ];
|
||||
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
;
|
||||
inherit pnpm;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-x0yIANla1KURJ4fgxAe9WUJl/sPAsUcARubTJQ5uEpQ=";
|
||||
hash = "sha256-PLbmxjqfS5HHU8EKFdZwSNzN4Yl1ShTilqvpwap5noI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -73,7 +73,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests.version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage.tfenv;
|
||||
package = finalAttrs.finalPackage;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "turso";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -15,10 +15,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "tursodatabase";
|
||||
repo = "turso";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-uOrvQZ16TlgRFt7kiKIPMT84S07PArVdw6OWzDt7rD8=";
|
||||
hash = "sha256-32bYI3pWKlQTWZr/AS5aULZt4sgBHMswMBViGlRiwjk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Go+KAU4xz4DO585afx7tKpyWY/Glz6ZAETd0p3uOGiE=";
|
||||
cargoHash = "sha256-bmyMjjjmKeDySDzyOJCtDHF9HD/u/A4Jt2qxpZgHVqY=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--bin"
|
||||
|
||||
@@ -0,0 +1,69 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
makeWrapper,
|
||||
nix-update-script,
|
||||
pkg-config,
|
||||
pam,
|
||||
wayland,
|
||||
libxkbcommon,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "veila";
|
||||
version = "0.4.0";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "naurissteins";
|
||||
repo = "Veila";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-SrYG5rvywiPEfIjTbZfXOlXqnmdn0fZcOR16fxHJ0Ns=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-jcZ33dJwvK94YqMFpXb9QXURjtOGrY4QdZh0I9LTwUU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
pam
|
||||
wayland
|
||||
libxkbcommon
|
||||
];
|
||||
|
||||
cargoBuildFlags = [ "--workspace" ];
|
||||
|
||||
postInstall = ''
|
||||
pushd assets
|
||||
for assetDir in fonts icons systemd themes; do
|
||||
find "$assetDir" -type d -exec install -d "$out/share/veila/{}" ';'
|
||||
find "$assetDir" -type f -exec install -Dm644 "{}" "$out/share/veila/{}" ';'
|
||||
done
|
||||
popd
|
||||
|
||||
wrapProgram "$out/bin/veila" \
|
||||
--set VEILA_ASSET_DIR "$out/share/veila"
|
||||
|
||||
wrapProgram "$out/bin/veila-curtain" \
|
||||
--set VEILA_ASSET_DIR "$out/share/veila"
|
||||
|
||||
wrapProgram "$out/bin/veilad" \
|
||||
--set VEILA_ASSET_DIR "$out/share/veila" \
|
||||
--set VEILA_CURTAIN_BIN "$out/bin/veila-curtain"
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Screen locker for Wayland compositors";
|
||||
homepage = "https://naurissteins.com/veila";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ naurissteins ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "veila";
|
||||
};
|
||||
})
|
||||
@@ -2,20 +2,21 @@
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "weaviate";
|
||||
version = "1.35.2";
|
||||
version = "1.37.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaviate";
|
||||
repo = "weaviate";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-FDDwC9CnnMhwI9iqEEGwklE7lr9vOOCYCJ8X389gw7U=";
|
||||
hash = "sha256-mjjDya02L9q/pi7337v5CEnKpugIK2YJt3kRLtwQSmk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xcsVJ1H1S/cszR/t6cHUrW0Wtn/c/PV2RQ04qGdMmD0=";
|
||||
vendorHash = "sha256-rxdln7k0VKFaEehrej4KOyqWugsrz63jdLxwD/ywGug=";
|
||||
|
||||
subPackages = [ "cmd/weaviate-server" ];
|
||||
|
||||
@@ -29,6 +30,8 @@ buildGoModule (finalAttrs: {
|
||||
ln -s $out/bin/weaviate-server $out/bin/weaviate
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "ML-first vector search engine";
|
||||
homepage = "https://github.com/weaviate/weaviate";
|
||||
|
||||
@@ -36,13 +36,13 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zipline";
|
||||
version = "4.6.0";
|
||||
version = "4.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "diced";
|
||||
repo = "zipline";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8Uay/+GRuVhu3MHg6gunHfWmKWBWDRy7zWAQkxKqh0k=";
|
||||
hash = "sha256-uLGa6ZIMJE2IWz5wF9H6yOICTeFvZerrpecLEja+PU4=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C $out rev-parse --short HEAD > $out/.git_head
|
||||
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm';
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-AaXlkn6Fz9EMlxIpRhI0GH73DuK00qbgr19nlmd4ZOo=";
|
||||
hash = "sha256-3O8PVmcy0+pdn4nFRBS7xuRTNi9JmN/5G75U6rusho4=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "zvm";
|
||||
version = "0.8.14";
|
||||
version = "0.8.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tristanisham";
|
||||
repo = "zvm";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-MAE7zs60DFIicYRtMhstzsOiS2flVv+dyPJVmcyAEio=";
|
||||
hash = "sha256-uKn4ysaNuvWpV4fhrpm7pdS61pQJTYr6WfIhBzTfNT8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-29hFuQnLPdLkAG4x5QWqXqBIGtppi/rj3OuTfMBgTAI=";
|
||||
vendorHash = "sha256-kJrCUxzbpyxEUF9UQeAI28tWKA+T7zT1DBI1wf3pjjM=";
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
@@ -255,8 +255,10 @@ let
|
||||
++ lib.optional systemdSupport systemdLibs
|
||||
++ lib.optional valgrindSupport valgrind;
|
||||
|
||||
CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";
|
||||
SKIP_PERF_SENSITIVE = 1;
|
||||
env = {
|
||||
CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";
|
||||
SKIP_PERF_SENSITIVE = 1;
|
||||
};
|
||||
|
||||
configureFlags =
|
||||
# Disable all extensions
|
||||
|
||||
@@ -1807,6 +1807,43 @@ final: prev: {
|
||||
}
|
||||
) { };
|
||||
|
||||
lrexlib-pcre2 = callPackage (
|
||||
{
|
||||
buildLuarocksPackage,
|
||||
fetchFromGitHub,
|
||||
fetchurl,
|
||||
luaOlder,
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "lrexlib-pcre2";
|
||||
version = "2.9.2-1";
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "mirror://luarocks/lrexlib-pcre2-2.9.2-1.rockspec";
|
||||
sha256 = "181878m8gq9wl7c4h9rsq1iig70n9rmyfbj86swz1v4vi7s7ks9p";
|
||||
}).outPath;
|
||||
src = fetchFromGitHub {
|
||||
owner = "rrthomas";
|
||||
repo = "lrexlib";
|
||||
rev = "rel-2-9-2";
|
||||
hash = "sha256-DzNDve+xeKb+kAcW+o7GK/RsoDhaDAVAWAhgjISCyZc=";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/rrthomas/lrexlib";
|
||||
maintainers = with lib.maintainers; [ wishstudio ];
|
||||
license.fullName = "MIT/X11";
|
||||
description = "Regular expression library binding (PCRE2 flavour).";
|
||||
longDescription = ''
|
||||
Lrexlib is a regular expression library for Lua 5.1-5.4, which
|
||||
provides bindings for several regular expression libraries.
|
||||
This rock provides the PCRE2 bindings.'';
|
||||
};
|
||||
}
|
||||
) { };
|
||||
|
||||
lrexlib-posix = callPackage (
|
||||
{
|
||||
buildLuarocksPackage,
|
||||
|
||||
@@ -0,0 +1,146 @@
|
||||
At time of writing this is equivalent to https://github.com/lgi-devs/lgi/pull/361.patch?full_index=1
|
||||
The only difference is that this diff does not include the *tests/progress.lua* changes since that file does not exist in the source used by *nixpkgs*.
|
||||
|
||||
--- a/lgi/ffi.lua
|
||||
+++ b/lgi/ffi.lua
|
||||
@@ -74,19 +74,39 @@
|
||||
end
|
||||
|
||||
-- Creates new enum/flags table with all values from specified gtype.
|
||||
+--
|
||||
+-- Fixes https://github.com/lgi-devs/lgi/issues/358
|
||||
+--
|
||||
+-- Implementation for the fix was mirrored from the LGI fork:
|
||||
+-- https://github.com/vtrlx/LuaGObject/blob/0.10.5/LuaGObject/ffi.lua#L74-L104
|
||||
function ffi.load_enum(gtype, name)
|
||||
- local GObject = core.repo.GObject
|
||||
+ local GLib, GObject = core.repo.GLib, core.repo.GObject
|
||||
local is_flags = GObject.Type.is_a(gtype, GObject.Type.FLAGS)
|
||||
local enum_component = component.create(
|
||||
gtype, is_flags and enum.bitflags_mt or enum.enum_mt, name)
|
||||
- local type_class = GObject.TypeClass.ref(gtype)
|
||||
+ local type_class
|
||||
+ -- GLib >= 2.86 deprecates GObject.TypeClass.ref() in favour of .get()
|
||||
+ if GLib.check_version(2, 86, 0) then
|
||||
+ type_class = GObject.TypeClass.ref(gtype)
|
||||
+ else
|
||||
+ type_class = GObject.TypeClass.get(gtype)
|
||||
+ end
|
||||
local enum_class = core.record.cast(
|
||||
type_class, is_flags and GObject.FlagsClass or GObject.EnumClass)
|
||||
- for i = 0, enum_class.n_values - 1 do
|
||||
- local val = core.record.fromarray(enum_class.values, i)
|
||||
- enum_component[core.upcase(val.value_nick):gsub('%-', '_')] = val.value
|
||||
+ if GLib.check_version(2, 87, 0) then
|
||||
+ for i = 0, enum_class.n_values - 1 do
|
||||
+ local val = core.record.fromarray(enum_class.values, i)
|
||||
+ enum_component[core.upcase(val.value_nick):gsub('%-', '_')] = val.value
|
||||
+ end
|
||||
+ else
|
||||
+ for _, val in ipairs(enum_class.values) do
|
||||
+ enum_component[core.upcase(val.value_nick):gsub('%-', '_')] = val.value
|
||||
+ end
|
||||
+ end
|
||||
+ -- For GLib versions below 2.86, type_class was ref'd and needs to be unref'd
|
||||
+ if GLib.check_version(2, 86, 0) then
|
||||
+ type_class:unref()
|
||||
end
|
||||
- type_class:unref()
|
||||
return enum_component
|
||||
end
|
||||
|
||||
--- a/lgi/ffi.lua
|
||||
+++ b/lgi/ffi.lua
|
||||
@@ -74,18 +74,12 @@
|
||||
end
|
||||
|
||||
-- Creates new enum/flags table with all values from specified gtype.
|
||||
---
|
||||
--- Fixes https://github.com/lgi-devs/lgi/issues/358
|
||||
---
|
||||
--- Implementation for the fix was mirrored from the LGI fork:
|
||||
--- https://github.com/vtrlx/LuaGObject/blob/0.10.5/LuaGObject/ffi.lua#L74-L104
|
||||
function ffi.load_enum(gtype, name)
|
||||
local GLib, GObject = core.repo.GLib, core.repo.GObject
|
||||
local is_flags = GObject.Type.is_a(gtype, GObject.Type.FLAGS)
|
||||
local enum_component = component.create(
|
||||
gtype, is_flags and enum.bitflags_mt or enum.enum_mt, name)
|
||||
local type_class
|
||||
- -- GLib >= 2.86 deprecates GObject.TypeClass.ref() in favour of .get()
|
||||
if GLib.check_version(2, 86, 0) then
|
||||
type_class = GObject.TypeClass.ref(gtype)
|
||||
else
|
||||
@@ -103,7 +97,6 @@
|
||||
enum_component[core.upcase(val.value_nick):gsub('%-', '_')] = val.value
|
||||
end
|
||||
end
|
||||
- -- For GLib versions below 2.86, type_class was ref'd and needs to be unref'd
|
||||
if GLib.check_version(2, 86, 0) then
|
||||
type_class:unref()
|
||||
end
|
||||
--- a/lgi/ffi.lua
|
||||
+++ b/lgi/ffi.lua
|
||||
@@ -80,6 +80,7 @@
|
||||
local enum_component = component.create(
|
||||
gtype, is_flags and enum.bitflags_mt or enum.enum_mt, name)
|
||||
local type_class
|
||||
+ -- GLib >= 2.86 deprecates GObject.TypeClass.ref() in favour of .get()
|
||||
if GLib.check_version(2, 86, 0) then
|
||||
type_class = GObject.TypeClass.ref(gtype)
|
||||
else
|
||||
@@ -97,6 +98,7 @@
|
||||
enum_component[core.upcase(val.value_nick):gsub('%-', '_')] = val.value
|
||||
end
|
||||
end
|
||||
+ -- For GLib versions below 2.86, type_class was ref'd and needs to be unref'd
|
||||
if GLib.check_version(2, 86, 0) then
|
||||
type_class:unref()
|
||||
end
|
||||
--- a/tests/pango.lua
|
||||
+++ b/tests/pango.lua
|
||||
@@ -35,8 +35,24 @@
|
||||
local offset = items[i].offset
|
||||
local length = items[i].length
|
||||
local analysis = items[i].analysis
|
||||
- local pgs = Pango.GlyphString()
|
||||
- Pango.shape(string.sub(s,1+offset), length, analysis, pgs)
|
||||
+ --
|
||||
+ -- Fixes https://github.com/lgi-devs/lgi/issues/336
|
||||
+ --
|
||||
+ -- Implementation for the fix was a combination
|
||||
+ -- of ideas from:
|
||||
+ --
|
||||
+ -- 1) my own investigation plus trial-error
|
||||
+ -- 2) the comment: https://github.com/lgi-devs/lgi/issues/336#issuecomment-2888361271
|
||||
+ -- 3) the LGI fork: https://github.com/vtrlx/LuaGObject/blob/0.10.5/tests/pango.lua#L38-L39
|
||||
+ --
|
||||
+ local pgs
|
||||
+ if Pango.version_check(1, 56, 2) then
|
||||
+ pgs = Pango.GlyphString()
|
||||
+ Pango.shape(string.sub(s,1+offset), length, analysis, pgs)
|
||||
+ else
|
||||
+ pgs = Pango.shape(string.sub(s,1+offset), length, analysis)
|
||||
+ end
|
||||
+
|
||||
-- Pull out individual glyphs with pgs.glyphs
|
||||
local glyphs = pgs.glyphs
|
||||
check(type(glyphs) == 'table')
|
||||
--- a/tests/pango.lua
|
||||
+++ b/tests/pango.lua
|
||||
@@ -35,16 +35,6 @@
|
||||
local offset = items[i].offset
|
||||
local length = items[i].length
|
||||
local analysis = items[i].analysis
|
||||
- --
|
||||
- -- Fixes https://github.com/lgi-devs/lgi/issues/336
|
||||
- --
|
||||
- -- Implementation for the fix was a combination
|
||||
- -- of ideas from:
|
||||
- --
|
||||
- -- 1) my own investigation plus trial-error
|
||||
- -- 2) the comment: https://github.com/lgi-devs/lgi/issues/336#issuecomment-2888361271
|
||||
- -- 3) the LGI fork: https://github.com/vtrlx/LuaGObject/blob/0.10.5/tests/pango.lua#L38-L39
|
||||
- --
|
||||
local pgs
|
||||
if Pango.version_check(1, 56, 2) then
|
||||
pgs = Pango.GlyphString()
|
||||
@@ -45,6 +45,7 @@
|
||||
openldap,
|
||||
openssl,
|
||||
pcre,
|
||||
pcre2,
|
||||
pkg-config,
|
||||
readline,
|
||||
ripgrep,
|
||||
@@ -303,13 +304,10 @@ in
|
||||
sha256 = "0gfvvbri9kyzhvq3bvdbj2l6mwvlz040dk4mrd5m9gz79f7w109c";
|
||||
})
|
||||
|
||||
# https://github.com/lgi-devs/lgi/issues/346
|
||||
# https://gitlab.archlinux.org/archlinux/packaging/packages/lgi/-/issues/1
|
||||
(fetchpatch {
|
||||
name = "glib-2.86.0.patch";
|
||||
url = "https://gitlab.archlinux.org/archlinux/packaging/packages/lgi/-/raw/05a0c9df75883da235bacd4379b769e7d7713fb9/0001-Use-TypeClass.get-instead-of-.ref.patch";
|
||||
hash = "sha256-Z1rNv0VzVrK41rV73KiPXq9yLaNxbTOFiSd6eLZyrbY=";
|
||||
})
|
||||
# https://github.com/lgi-devs/lgi/issues/362
|
||||
# https://github.com/lgi-devs/lgi/pull/361
|
||||
# https://github.com/NixOS/nixpkgs/issues/523345
|
||||
./lgi/glib-2.88.patch
|
||||
];
|
||||
|
||||
# https://github.com/lgi-devs/lgi/pull/300
|
||||
@@ -438,6 +436,15 @@ in
|
||||
];
|
||||
};
|
||||
|
||||
lrexlib-pcre2 = prev.lrexlib-pcre2.overrideAttrs {
|
||||
externalDeps = [
|
||||
{
|
||||
name = "PCRE2";
|
||||
dep = pcre2;
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
lrexlib-posix = prev.lrexlib-posix.overrideAttrs (old: {
|
||||
buildInputs = old.buildInputs ++ [
|
||||
(lib.getDev libc)
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pytestCheckHook,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aspy-refactor-imports";
|
||||
version = "4.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "asottile";
|
||||
repo = "aspy.refactor_imports";
|
||||
tag = "v${version}";
|
||||
sha256 = "sha256-f5wZfisKz9WGdq6u0rd/zg2CfMwWvQeR8xZQNbD7KfU=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "aspy.refactor_imports" ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
# fails on darwin due to case-insensitive file system
|
||||
disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "test_application_directory_case" ];
|
||||
|
||||
meta = {
|
||||
description = "Utilities for refactoring imports in python-like syntax";
|
||||
homepage = "https://github.com/asottile/aspy.refactor_imports";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ gador ];
|
||||
};
|
||||
}
|
||||
@@ -16,7 +16,7 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "3.2.0";
|
||||
version = "3.2.3";
|
||||
pname = "beancount";
|
||||
pyproject = true;
|
||||
|
||||
@@ -24,21 +24,15 @@ buildPythonPackage rec {
|
||||
owner = "beancount";
|
||||
repo = "beancount";
|
||||
tag = version;
|
||||
hash = "sha256-XWTgaBvB4/SONL44afvprZwJUVrkoda5XLGNxad0kec=";
|
||||
hash = "sha256-WM8SM2ZHphafzXHyVi4Fo9tgsClAnmLsZKZUsf2Twmg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
name = "accept-date-range-error-message-from-py3.14";
|
||||
url = "https://salsa.debian.org/python-team/packages/beancount/-/raw/debian/sid/debian/patches/0003-Accept-date-range-error-message-from-py3.14.patch";
|
||||
hash = "sha256-wqMTGSi4Gn5VADjV4MjZhFNWB3ThUhxvLYK7sentScQ=";
|
||||
})
|
||||
(fetchpatch2 {
|
||||
name = "skip-ref-count-test-with-py3.14";
|
||||
url = "https://salsa.debian.org/python-team/packages/beancount/-/raw/debian/sid/debian/patches/0004-Skip-refcount-test-with-py3.14.patch";
|
||||
hash = "sha256-6P9xe15WBGaWpVYB2HfGfFHLMMmGkfnDwdjdktlSNxk=";
|
||||
})
|
||||
];
|
||||
postPatch = ''
|
||||
# We don't need the python binary wrappers, since we provide them via nativeBuildInputs
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "'flex-bin ; sys_platform == \"linux\" or sys_platform == \"darwin\"'," "" \
|
||||
--replace-fail "'bison-bin ; sys_platform == \"linux\" or sys_platform == \"darwin\"'," ""
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
meson
|
||||
|
||||
@@ -1,25 +1,32 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
pytestCheckHook,
|
||||
subprocess4,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "coq-tools";
|
||||
version = "0.0.42";
|
||||
version = "0.0.44";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "coq_tools";
|
||||
inherit version;
|
||||
hash = "sha256-d+SAGmZKUQo2ZKuC91r/2RHDvi5GCIKGTxcuau1kN0U=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "JasonGross";
|
||||
repo = "coq-tools";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-2WMxJkLGfMtXu4ZpIuS1wIXMvgJbCMy2eY8qz5+v9LI=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ subprocess4 ];
|
||||
|
||||
pythonImportsCheck = [ "coq_tools" ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = {
|
||||
description = "Tools for working with Coq proof assistant";
|
||||
homepage = "https://pypi.org/project/coq-tools/";
|
||||
@@ -27,4 +34,4 @@ buildPythonPackage rec {
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -2,21 +2,25 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
isPyPy,
|
||||
|
||||
# dependencies
|
||||
eth-hash,
|
||||
eth-typing,
|
||||
cytoolz,
|
||||
toolz,
|
||||
pydantic,
|
||||
# nativeCheckInputs
|
||||
|
||||
# tests
|
||||
hypothesis,
|
||||
mypy,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "eth-utils";
|
||||
version = "6.0.0";
|
||||
pyproject = true;
|
||||
@@ -24,13 +28,18 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "ethereum";
|
||||
repo = "eth-utils";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-U1RSKaLw/gDg4lMjkTwR/Wfb5wqQctML9CDZBILMBys=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# type inference test output expectation changed slightly (don't ask me when it started...)
|
||||
sed -i 's/builtins\.//g' tests/core/functional-utils/test_type_inference.py
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
eth-hash
|
||||
eth-typing
|
||||
]
|
||||
@@ -47,13 +56,22 @@ buildPythonPackage rec {
|
||||
|
||||
pythonImportsCheck = [ "eth_utils" ];
|
||||
|
||||
disabledTests = [ "test_install_local_wheel" ];
|
||||
disabledTests = [
|
||||
# Exception: Expected one wheel. Instead found: [] in project /build/source
|
||||
"test_install_local_wheel"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Typing tests fail like:
|
||||
# Revealed type is "builtins.tuple[builtins.int, ...]"
|
||||
"tests/core/functional-utils/test_type_inference.py"
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/ethereum/eth-utils/blob/${src.rev}/docs/release_notes.rst";
|
||||
changelog = "https://github.com/ethereum/eth-utils/blob/${finalAttrs.src.tag}/docs/release_notes.rst";
|
||||
description = "Common utility functions for codebases which interact with ethereum";
|
||||
homepage = "https://github.com/ethereum/eth-utils";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ siraben ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -25,17 +25,17 @@
|
||||
let
|
||||
src = buildNpmPackage (finalAttrs: {
|
||||
pname = "fava-frontend";
|
||||
version = "1.30.12";
|
||||
version = "1.30.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "beancount";
|
||||
repo = "fava";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-krRkcahikP0ChTCXeS/3MBq4v+VmBLViqaYSSGYt6Mc=";
|
||||
hash = "sha256-h4mjZIINR6RLYycGl2RFIEGuPPbJYYSg1TBGlZupCMw=";
|
||||
};
|
||||
sourceRoot = "${finalAttrs.src.name}/frontend";
|
||||
|
||||
npmDepsHash = "sha256-kZAwvyjPZUFJffYsr5917zX+0tMyydcOzfr/TDnoJKw=";
|
||||
npmDepsHash = "sha256-DQQISV615wZjNbvZwmF/AGJyJJIIs3iBS1tJCNPpT/o=";
|
||||
makeCacheWritable = true;
|
||||
|
||||
preBuild = ''
|
||||
@@ -108,6 +108,7 @@ buildPythonPackage {
|
||||
maintainers = with lib.maintainers; [
|
||||
prince213
|
||||
sigmanificient
|
||||
cbrxyz
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
orjson,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fvs";
|
||||
version = "0.3.4";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "FVS";
|
||||
extension = "tar.gz";
|
||||
hash = "sha256-yYd0HzdwbqB9kexJjBRRYmdsoWtZtcjCNRz0ZJVM5CI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ orjson ];
|
||||
|
||||
# no tests in src
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "fvs" ];
|
||||
|
||||
meta = {
|
||||
description = "File Versioning System with hash comparison and data storage to create unlinked states that can be deleted";
|
||||
mainProgram = "fvs";
|
||||
homepage = "https://github.com/mirkobrombin/FVS";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "inkbird-ble";
|
||||
version = "1.1.1";
|
||||
version = "1.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bluetooth-Devices";
|
||||
repo = "inkbird-ble";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Brib9OMI6LRS3GopiOsJijY/gpvv7j47OTQN8tTcqLo=";
|
||||
hash = "sha256-e5bRq4XIcHaAAUXxdBeaZMNPDRWlS1QeD/9v7W0QeB4=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
|
||||
# dependencies
|
||||
requests,
|
||||
|
||||
# tests
|
||||
pytest-cov-stub,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pybuildkite";
|
||||
version = "1.3.0";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pyasi";
|
||||
repo = "pybuildkite";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-yMUZUkERfxMUkVVYNkPiFf9wrZR6d5+gqW/P6ri2Q1I=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
requests
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pybuildkite" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-cov-stub
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Python library for the Buildkite API";
|
||||
homepage = "https://github.com/pyasi/pybuildkite";
|
||||
changelog = "https://github.com/pyasi/pybuildkite/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
};
|
||||
})
|
||||
@@ -35,7 +35,8 @@ buildPythonPackage (finalAttrs: {
|
||||
postPatch = ''
|
||||
substituteInPlace \
|
||||
requirements.txt PKG-INFO pyproject.toml \
|
||||
--replace-fail "sphinx-tabs<3.4.7,>=1.2.1" "sphinx-tabs<=3.4.7,>=1.2.1"
|
||||
--replace-fail "sphinx-tabs<3.4.7,>=1.2.1" "sphinx-tabs<=3.5.0,>=1.2.1" \
|
||||
--replace-fail "ruamel.yaml<=0.18.16,>=0.16.12" "ruamel.yaml<=0.19.1,>=0.16.12"
|
||||
'';
|
||||
|
||||
build-system = [ whey ];
|
||||
|
||||
@@ -6,12 +6,11 @@
|
||||
flask,
|
||||
flask-login,
|
||||
flask-sqlalchemy,
|
||||
packaging,
|
||||
psycopg2,
|
||||
pymysql,
|
||||
pytestCheckHook,
|
||||
sqlalchemy,
|
||||
sqlalchemy-i18n,
|
||||
sqlalchemy-utils,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -29,17 +28,16 @@ buildPythonPackage rec {
|
||||
|
||||
dependencies = [
|
||||
sqlalchemy
|
||||
sqlalchemy-utils
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
flask = [ flask ];
|
||||
flask-login = [ flask-login ];
|
||||
flask-sqlalchemy = [ flask-sqlalchemy ];
|
||||
i18n = [ sqlalchemy-i18n ];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
packaging
|
||||
psycopg2
|
||||
pymysql
|
||||
pytestCheckHook
|
||||
@@ -48,11 +46,6 @@ buildPythonPackage rec {
|
||||
++ optional-dependencies.flask-login
|
||||
++ optional-dependencies.flask-sqlalchemy;
|
||||
|
||||
disabledTestPaths = [
|
||||
# requires sqlalchemy-i18n, which is incompatible with sqlalchemy>=2
|
||||
"tests/test_i18n.py"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
# Indicate tests that we don't have a database server at hand
|
||||
export DB=sqlite
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user