mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 08:23:09 +00:00
Merge staging-next into staging
This commit is contained in:
commit
65f010f6b9
@ -8401,6 +8401,13 @@
|
|||||||
githubId = 33969028;
|
githubId = 33969028;
|
||||||
name = "Sebastian Hasler";
|
name = "Sebastian Hasler";
|
||||||
};
|
};
|
||||||
|
hasnep = {
|
||||||
|
name = "Hannes";
|
||||||
|
email = "h@nnes.dev";
|
||||||
|
matrix = "@hasnep:matrix.org";
|
||||||
|
github = "Hasnep";
|
||||||
|
githubId = 25184102;
|
||||||
|
};
|
||||||
hausken = {
|
hausken = {
|
||||||
name = "Hausken";
|
name = "Hausken";
|
||||||
email = "hauskens-git@disp.lease>";
|
email = "hauskens-git@disp.lease>";
|
||||||
|
@ -114,6 +114,15 @@ in
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
subscriberFiles = lib.mkOption {
|
||||||
|
type = lib.types.listOf lib.types.path;
|
||||||
|
default = [];
|
||||||
|
description = ''
|
||||||
|
Files written by resolvconf updates
|
||||||
|
'';
|
||||||
|
internal = true;
|
||||||
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
@ -134,6 +143,8 @@ in
|
|||||||
(lib.mkIf cfg.enable {
|
(lib.mkIf cfg.enable {
|
||||||
users.groups.resolvconf = {};
|
users.groups.resolvconf = {};
|
||||||
|
|
||||||
|
networking.resolvconf.subscriberFiles = [ "/etc/resolv.conf" ];
|
||||||
|
|
||||||
networking.resolvconf.package = pkgs.openresolv;
|
networking.resolvconf.package = pkgs.openresolv;
|
||||||
|
|
||||||
environment.systemPackages = [ cfg.package ];
|
environment.systemPackages = [ cfg.package ];
|
||||||
@ -150,8 +161,9 @@ in
|
|||||||
|
|
||||||
script = ''
|
script = ''
|
||||||
${lib.getExe cfg.package} -u
|
${lib.getExe cfg.package} -u
|
||||||
chgrp -R resolvconf /etc/resolv.conf /run/resolvconf
|
files=(/run/resolvconf ${lib.escapeShellArgs cfg.subscriberFiles})
|
||||||
chmod -R g=u /etc/resolv.conf /run/resolvconf
|
chgrp -R resolvconf "''${files[@]}"
|
||||||
|
chmod -R g=u "''${files[@]}"
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -250,7 +250,7 @@ in
|
|||||||
Restart = "always";
|
Restart = "always";
|
||||||
AmbientCapabilities = [ "CAP_NET_ADMIN" "CAP_NET_RAW" "CAP_NET_BIND_SERVICE" ];
|
AmbientCapabilities = [ "CAP_NET_ADMIN" "CAP_NET_RAW" "CAP_NET_BIND_SERVICE" ];
|
||||||
ReadWritePaths = [ "/proc/sys/net/ipv6" ]
|
ReadWritePaths = [ "/proc/sys/net/ipv6" ]
|
||||||
++ lib.optionals useResolvConf [ "/etc/resolv.conf" "/run/resolvconf" ];
|
++ lib.optionals useResolvConf ([ "/run/resolvconf" ] ++ config.networking.resolvconf.subscriberFiles);
|
||||||
DeviceAllow = "";
|
DeviceAllow = "";
|
||||||
LockPersonality = true;
|
LockPersonality = true;
|
||||||
MemoryDenyWriteExecute = true;
|
MemoryDenyWriteExecute = true;
|
||||||
|
@ -133,6 +133,11 @@ in
|
|||||||
dnsmasq_conf=/etc/dnsmasq-conf.conf
|
dnsmasq_conf=/etc/dnsmasq-conf.conf
|
||||||
dnsmasq_resolv=/etc/dnsmasq-resolv.conf
|
dnsmasq_resolv=/etc/dnsmasq-resolv.conf
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
subscriberFiles = [
|
||||||
|
"/etc/dnsmasq-conf.conf"
|
||||||
|
"/etc/dnsmasq-resolv.conf"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.services.dnsmasq = {
|
systemd.services.dnsmasq = {
|
||||||
|
@ -349,13 +349,7 @@ let
|
|||||||
{ object = "${modulesClosure}/lib";
|
{ object = "${modulesClosure}/lib";
|
||||||
symlink = "/lib";
|
symlink = "/lib";
|
||||||
}
|
}
|
||||||
{ object = pkgs.runCommand "initrd-kmod-blacklist-ubuntu" {
|
{ object = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf";
|
||||||
src = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf";
|
|
||||||
preferLocalBuild = true;
|
|
||||||
} ''
|
|
||||||
target=$out
|
|
||||||
${pkgs.buildPackages.perl}/bin/perl -0pe 's/## file: iwlwifi.conf(.+?)##/##/s;' $src > $out
|
|
||||||
'';
|
|
||||||
symlink = "/etc/modprobe.d/ubuntu.conf";
|
symlink = "/etc/modprobe.d/ubuntu.conf";
|
||||||
}
|
}
|
||||||
{ object = config.environment.etc."modprobe.d/nixos.conf".source;
|
{ object = config.environment.etc."modprobe.d/nixos.conf".source;
|
||||||
|
@ -437,9 +437,7 @@ in {
|
|||||||
|
|
||||||
"/etc/sysctl.d/nixos.conf".text = "kernel.modprobe = /sbin/modprobe";
|
"/etc/sysctl.d/nixos.conf".text = "kernel.modprobe = /sbin/modprobe";
|
||||||
"/etc/modprobe.d/systemd.conf".source = "${cfg.package}/lib/modprobe.d/systemd.conf";
|
"/etc/modprobe.d/systemd.conf".source = "${cfg.package}/lib/modprobe.d/systemd.conf";
|
||||||
"/etc/modprobe.d/ubuntu.conf".source = pkgs.runCommand "initrd-kmod-blacklist-ubuntu" { } ''
|
"/etc/modprobe.d/ubuntu.conf".source = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf";
|
||||||
${pkgs.buildPackages.perl}/bin/perl -0pe 's/## file: iwlwifi.conf(.+?)##/##/s;' $src > $out
|
|
||||||
'';
|
|
||||||
"/etc/modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases;
|
"/etc/modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases;
|
||||||
|
|
||||||
"/etc/os-release".source = config.boot.initrd.osRelease;
|
"/etc/os-release".source = config.boot.initrd.osRelease;
|
||||||
|
@ -17,16 +17,16 @@
|
|||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "librespot";
|
pname = "librespot";
|
||||||
version = "0.4.2";
|
version = "0.5.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "librespot-org";
|
owner = "librespot-org";
|
||||||
repo = "librespot";
|
repo = "librespot";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-DtF6asSlLdC2m/0JTBo4YUx9HgsojpfiqVdqaIwniKA=";
|
sha256 = "sha256-/YMICsrUMYqiL5jMlb5BbZPlHfL9btbWiv/Kt2xhRW4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-tbDlWP0sUIa0W9HhdYNOvo9cGeqFemclhA7quh7f/Rw=";
|
cargoHash = "sha256-UOvGvseWaEqqjuvTewDfkBeR730cKMQCq55weYmu15Y=";
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config makeWrapper ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
nativeBuildInputs = [ pkg-config makeWrapper ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||||
rustPlatform.bindgenHook
|
rustPlatform.bindgenHook
|
||||||
|
@ -1,79 +0,0 @@
|
|||||||
{ stdenv
|
|
||||||
, lib
|
|
||||||
, fetchFromGitHub
|
|
||||||
, rustPlatform
|
|
||||||
, pkg-config
|
|
||||||
, ncurses
|
|
||||||
, openssl
|
|
||||||
, Cocoa
|
|
||||||
, withALSA ? false, alsa-lib
|
|
||||||
, withClipboard ? true, libxcb, python3
|
|
||||||
, withCover ? false, ueberzug
|
|
||||||
, withPulseAudio ? true, libpulseaudio
|
|
||||||
, withPortAudio ? false, portaudio
|
|
||||||
, withMPRIS ? true, withNotify ? true, dbus
|
|
||||||
, withCrossterm ? true
|
|
||||||
, nix-update-script
|
|
||||||
, testers
|
|
||||||
, ncspot
|
|
||||||
}:
|
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
|
||||||
pname = "ncspot";
|
|
||||||
version = "1.1.2";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "hrkfdn";
|
|
||||||
repo = "ncspot";
|
|
||||||
rev = "v${version}";
|
|
||||||
hash = "sha256-Lt2IuoiXYgSVPi4u8y16u9m5ya4HdpQme6snvNJrwso=";
|
|
||||||
};
|
|
||||||
|
|
||||||
cargoHash = "sha256-JJTnaq0JLWHQxAbDpzDRPi5B+ePlQNlDOAsugPah7j4=";
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ]
|
|
||||||
++ lib.optional withClipboard python3;
|
|
||||||
|
|
||||||
buildInputs = [ ncurses ]
|
|
||||||
++ lib.optional stdenv.hostPlatform.isLinux openssl
|
|
||||||
++ lib.optional withALSA alsa-lib
|
|
||||||
++ lib.optional withClipboard libxcb
|
|
||||||
++ lib.optional withCover ueberzug
|
|
||||||
++ lib.optional withPulseAudio libpulseaudio
|
|
||||||
++ lib.optional withPortAudio portaudio
|
|
||||||
++ lib.optional (withMPRIS || withNotify) dbus
|
|
||||||
++ lib.optional stdenv.hostPlatform.isDarwin Cocoa;
|
|
||||||
|
|
||||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-DNCURSES_UNCTRL_H_incl";
|
|
||||||
|
|
||||||
buildNoDefaultFeatures = true;
|
|
||||||
|
|
||||||
buildFeatures = [ "cursive/pancurses-backend" ]
|
|
||||||
++ lib.optional withALSA "alsa_backend"
|
|
||||||
++ lib.optional withClipboard "share_clipboard"
|
|
||||||
++ lib.optional withCover "cover"
|
|
||||||
++ lib.optional withPulseAudio "pulseaudio_backend"
|
|
||||||
++ lib.optional withPortAudio "portaudio_backend"
|
|
||||||
++ lib.optional withMPRIS "mpris"
|
|
||||||
++ lib.optional withCrossterm "crossterm_backend"
|
|
||||||
++ lib.optional withNotify "notify";
|
|
||||||
|
|
||||||
postInstall = ''
|
|
||||||
install -D --mode=444 $src/misc/ncspot.desktop $out/share/applications/${pname}.desktop
|
|
||||||
install -D --mode=444 $src/images/logo.svg $out/share/icons/hicolor/scalable/apps/${pname}.png
|
|
||||||
'';
|
|
||||||
|
|
||||||
passthru = {
|
|
||||||
updateScript = nix-update-script { };
|
|
||||||
tests.version = testers.testVersion { package = ncspot; };
|
|
||||||
};
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Cross-platform ncurses Spotify client written in Rust, inspired by ncmpc and the likes";
|
|
||||||
homepage = "https://github.com/hrkfdn/ncspot";
|
|
||||||
changelog = "https://github.com/hrkfdn/ncspot/releases/tag/v${version}";
|
|
||||||
license = licenses.bsd2;
|
|
||||||
maintainers = with maintainers; [ liff ];
|
|
||||||
mainProgram = "ncspot";
|
|
||||||
};
|
|
||||||
}
|
|
@ -2091,6 +2091,14 @@ in
|
|||||||
src = "${taskwarrior2.src}/scripts/vim";
|
src = "${taskwarrior2.src}/scripts/vim";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
telekasten-nvim = super.telekasten-nvim.overrideAttrs {
|
||||||
|
dependencies = with self; [
|
||||||
|
plenary-nvim
|
||||||
|
telescope-nvim
|
||||||
|
];
|
||||||
|
nvimRequireCheck = "telekasten";
|
||||||
|
};
|
||||||
|
|
||||||
telescope-cheat-nvim = super.telescope-cheat-nvim.overrideAttrs {
|
telescope-cheat-nvim = super.telescope-cheat-nvim.overrideAttrs {
|
||||||
dependencies = with self; [
|
dependencies = with self; [
|
||||||
sqlite-lua
|
sqlite-lua
|
||||||
|
@ -51,11 +51,11 @@ let
|
|||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "opera";
|
pname = "opera";
|
||||||
version = "113.0.5230.47";
|
version = "114.0.5282.102";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
|
url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
|
||||||
hash = "sha256-0RQTcROUv85yE6ceLkyF09/++WrvK828h5hoN1QYpCE=";
|
hash = "sha256-PBbozIdA+cfEzGIyL1P+25FZtrnd7ldctOtZYomKd/8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
unpackPhase = "dpkg-deb -x $src .";
|
unpackPhase = "dpkg-deb -x $src .";
|
||||||
|
@ -6,16 +6,16 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "kubecfg";
|
pname = "kubecfg";
|
||||||
version = "0.34.3";
|
version = "0.35.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "kubecfg";
|
owner = "kubecfg";
|
||||||
repo = "kubecfg";
|
repo = "kubecfg";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-zy7SuJ5ChR09CvZ362z6ZDRd/eIyqg06fpv+JP7C4T0=";
|
hash = "sha256-/xfZcykOGYOnCkKQDUJ9k4xh+bwrDmy2iSNFPVLkjew=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-TDXZy2I1sxMmtHiE5l9wgW1kJolFYsV5Otv3xfoErWM=";
|
vendorHash = "sha256-K2IyljE5QS/SZ6EXV42q/a5ru+0UXZ69oLNi94XKxw4=";
|
||||||
|
|
||||||
ldflags = [
|
ldflags = [
|
||||||
"-s"
|
"-s"
|
||||||
|
@ -44,8 +44,7 @@
|
|||||||
, buildFeatures ? [ ]
|
, buildFeatures ? [ ]
|
||||||
, checkFeatures ? buildFeatures
|
, checkFeatures ? buildFeatures
|
||||||
, useNextest ? false
|
, useNextest ? false
|
||||||
# Enable except on aarch64 pkgsStatic, where we use lld for reasons
|
, auditable ? !cargo-auditable.meta.broken
|
||||||
, auditable ? !cargo-auditable.meta.broken && !(stdenv.hostPlatform.isStatic && stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isDarwin)
|
|
||||||
|
|
||||||
, depsExtraArgs ? {}
|
, depsExtraArgs ? {}
|
||||||
|
|
||||||
|
@ -66,10 +66,10 @@
|
|||||||
|
|
||||||
cargoConfig = ''
|
cargoConfig = ''
|
||||||
[target."${stdenv.buildPlatform.rust.rustcTarget}"]
|
[target."${stdenv.buildPlatform.rust.rustcTarget}"]
|
||||||
"linker" = "${rust.envVars.linkerForBuild}"
|
"linker" = "${rust.envVars.ccForBuild}"
|
||||||
${lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) ''
|
${lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) ''
|
||||||
[target."${stdenv.hostPlatform.rust.rustcTarget}"]
|
[target."${stdenv.hostPlatform.rust.rustcTarget}"]
|
||||||
"linker" = "${rust.envVars.linkerForHost}"
|
"linker" = "${rust.envVars.ccForHost}"
|
||||||
''}
|
''}
|
||||||
"rustflags" = [ "-C", "target-feature=${if stdenv.hostPlatform.isStatic then "+" else "-"}crt-static" ]
|
"rustflags" = [ "-C", "target-feature=${if stdenv.hostPlatform.isStatic then "+" else "-"}crt-static" ]
|
||||||
'';
|
'';
|
||||||
|
@ -14,19 +14,11 @@ rec {
|
|||||||
# passed on a build=x86_64/host=aarch64 compilation.
|
# passed on a build=x86_64/host=aarch64 compilation.
|
||||||
envVars = let
|
envVars = let
|
||||||
|
|
||||||
# As a workaround for https://github.com/rust-lang/rust/issues/89626 use lld on pkgsStatic aarch64
|
|
||||||
shouldUseLLD = platform: platform.isAarch64 && platform.isStatic && !stdenv.hostPlatform.isDarwin;
|
|
||||||
|
|
||||||
ccForBuild = "${pkgsBuildHost.stdenv.cc}/bin/${pkgsBuildHost.stdenv.cc.targetPrefix}cc";
|
ccForBuild = "${pkgsBuildHost.stdenv.cc}/bin/${pkgsBuildHost.stdenv.cc.targetPrefix}cc";
|
||||||
cxxForBuild = "${pkgsBuildHost.stdenv.cc}/bin/${pkgsBuildHost.stdenv.cc.targetPrefix}c++";
|
cxxForBuild = "${pkgsBuildHost.stdenv.cc}/bin/${pkgsBuildHost.stdenv.cc.targetPrefix}c++";
|
||||||
linkerForBuild = ccForBuild;
|
|
||||||
|
|
||||||
ccForHost = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc";
|
ccForHost = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc";
|
||||||
cxxForHost = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++";
|
cxxForHost = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++";
|
||||||
linkerForHost = if shouldUseLLD stdenv.targetPlatform
|
|
||||||
&& !stdenv.cc.bintools.isLLVM
|
|
||||||
then "${pkgsBuildHost.llvmPackages.bintools}/bin/${stdenv.cc.targetPrefix}ld.lld"
|
|
||||||
else ccForHost;
|
|
||||||
|
|
||||||
# Unfortunately we must use the dangerous `pkgsTargetTarget` here
|
# Unfortunately we must use the dangerous `pkgsTargetTarget` here
|
||||||
# because hooks are artificially phase-shifted one slot earlier
|
# because hooks are artificially phase-shifted one slot earlier
|
||||||
@ -34,10 +26,6 @@ rec {
|
|||||||
# a targetPlatform to them).
|
# a targetPlatform to them).
|
||||||
ccForTarget = "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc";
|
ccForTarget = "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc";
|
||||||
cxxForTarget = "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++";
|
cxxForTarget = "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++";
|
||||||
linkerForTarget = if shouldUseLLD pkgsTargetTarget.stdenv.targetPlatform
|
|
||||||
&& !pkgsTargetTarget.stdenv.cc.bintools.isLLVM # whether stdenv's linker is lld already
|
|
||||||
then "${pkgsBuildTarget.llvmPackages.bintools}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}ld.lld"
|
|
||||||
else ccForTarget;
|
|
||||||
|
|
||||||
rustBuildPlatform = stdenv.buildPlatform.rust.rustcTarget;
|
rustBuildPlatform = stdenv.buildPlatform.rust.rustcTarget;
|
||||||
rustBuildPlatformSpec = stdenv.buildPlatform.rust.rustcTargetSpec;
|
rustBuildPlatformSpec = stdenv.buildPlatform.rust.rustcTargetSpec;
|
||||||
@ -47,9 +35,9 @@ rec {
|
|||||||
rustTargetPlatformSpec = stdenv.targetPlatform.rust.rustcTargetSpec;
|
rustTargetPlatformSpec = stdenv.targetPlatform.rust.rustcTargetSpec;
|
||||||
in {
|
in {
|
||||||
inherit
|
inherit
|
||||||
ccForBuild cxxForBuild linkerForBuild rustBuildPlatform rustBuildPlatformSpec
|
ccForBuild cxxForBuild rustBuildPlatform rustBuildPlatformSpec
|
||||||
ccForHost cxxForHost linkerForHost rustHostPlatform rustHostPlatformSpec
|
ccForHost cxxForHost rustHostPlatform rustHostPlatformSpec
|
||||||
ccForTarget cxxForTarget linkerForTarget rustTargetPlatform rustTargetPlatformSpec;
|
ccForTarget cxxForTarget rustTargetPlatform rustTargetPlatformSpec;
|
||||||
|
|
||||||
# Prefix this onto a command invocation in order to set the
|
# Prefix this onto a command invocation in order to set the
|
||||||
# variables needed by cargo.
|
# variables needed by cargo.
|
||||||
@ -65,15 +53,15 @@ rec {
|
|||||||
+ lib.optionalString (rustTargetPlatform != rustHostPlatform) ''
|
+ lib.optionalString (rustTargetPlatform != rustHostPlatform) ''
|
||||||
"CC_${stdenv.targetPlatform.rust.cargoEnvVarTarget}=${ccForTarget}" \
|
"CC_${stdenv.targetPlatform.rust.cargoEnvVarTarget}=${ccForTarget}" \
|
||||||
"CXX_${stdenv.targetPlatform.rust.cargoEnvVarTarget}=${cxxForTarget}" \
|
"CXX_${stdenv.targetPlatform.rust.cargoEnvVarTarget}=${cxxForTarget}" \
|
||||||
"CARGO_TARGET_${stdenv.targetPlatform.rust.cargoEnvVarTarget}_LINKER=${linkerForTarget}" \
|
"CARGO_TARGET_${stdenv.targetPlatform.rust.cargoEnvVarTarget}_LINKER=${ccForTarget}" \
|
||||||
'' + ''
|
'' + ''
|
||||||
"CC_${stdenv.hostPlatform.rust.cargoEnvVarTarget}=${ccForHost}" \
|
"CC_${stdenv.hostPlatform.rust.cargoEnvVarTarget}=${ccForHost}" \
|
||||||
"CXX_${stdenv.hostPlatform.rust.cargoEnvVarTarget}=${cxxForHost}" \
|
"CXX_${stdenv.hostPlatform.rust.cargoEnvVarTarget}=${cxxForHost}" \
|
||||||
"CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER=${linkerForHost}" \
|
"CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER=${ccForHost}" \
|
||||||
'' + ''
|
'' + ''
|
||||||
"CC_${stdenv.buildPlatform.rust.cargoEnvVarTarget}=${ccForBuild}" \
|
"CC_${stdenv.buildPlatform.rust.cargoEnvVarTarget}=${ccForBuild}" \
|
||||||
"CXX_${stdenv.buildPlatform.rust.cargoEnvVarTarget}=${cxxForBuild}" \
|
"CXX_${stdenv.buildPlatform.rust.cargoEnvVarTarget}=${cxxForBuild}" \
|
||||||
"CARGO_TARGET_${stdenv.buildPlatform.rust.cargoEnvVarTarget}_LINKER=${linkerForBuild}" \
|
"CARGO_TARGET_${stdenv.buildPlatform.rust.cargoEnvVarTarget}_LINKER=${ccForBuild}" \
|
||||||
"CARGO_BUILD_TARGET=${rustBuildPlatform}" \
|
"CARGO_BUILD_TARGET=${rustBuildPlatform}" \
|
||||||
"HOST_CC=${pkgsBuildHost.stdenv.cc}/bin/cc" \
|
"HOST_CC=${pkgsBuildHost.stdenv.cc}/bin/cc" \
|
||||||
"HOST_CXX=${pkgsBuildHost.stdenv.cc}/bin/c++" \
|
"HOST_CXX=${pkgsBuildHost.stdenv.cc}/bin/c++" \
|
||||||
|
@ -12,16 +12,16 @@
|
|||||||
}:
|
}:
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "biome";
|
pname = "biome";
|
||||||
version = "1.9.2";
|
version = "1.9.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "biomejs";
|
owner = "biomejs";
|
||||||
repo = "biome";
|
repo = "biome";
|
||||||
rev = "cli/v${version}";
|
rev = "cli/v${version}";
|
||||||
hash = "sha256-erwGLcE5w/UnjZ1aVF3ZYD2OQGI8xt7lVBvpWkJ56tc=";
|
hash = "sha256-GZV8M/yUDMom6xvSvSfDRjcMGm+thiaTR3fggkBLmRE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-m9r0fcnkDPT2J1DjjbLCzdAxqh8DCFAWA3jikuaVVGQ=";
|
cargoHash = "sha256-5VZGyOQAz/p4r4v8CHOTcdgolw44HtZM0NuhTw4Wx3A=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkg-config
|
pkg-config
|
||||||
|
@ -12,13 +12,13 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "coroot";
|
pname = "coroot";
|
||||||
version = "1.5.8";
|
version = "1.5.9";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "coroot";
|
owner = "coroot";
|
||||||
repo = "coroot";
|
repo = "coroot";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-c8i+JtmUzq8lsRU8NpR4p1EXtIljYs1uZAq3O5fMqa4=";
|
hash = "sha256-z6eD+qAdwu7DoyKTlAQqucdWRtT+h4qCPt0eTQceYXw=";
|
||||||
};
|
};
|
||||||
# github.com/grafana/pyroscope-go/godeltaprof 0.1.6 is broken on go 1.23
|
# github.com/grafana/pyroscope-go/godeltaprof 0.1.6 is broken on go 1.23
|
||||||
# use patch from https://github.com/coroot/coroot/pull/357 until it gets fixed
|
# use patch from https://github.com/coroot/coroot/pull/357 until it gets fixed
|
||||||
|
@ -26,7 +26,7 @@ let
|
|||||||
doInstallCheck = false;
|
doInstallCheck = false;
|
||||||
});
|
});
|
||||||
|
|
||||||
version = "1.3";
|
version = "1.3.1";
|
||||||
in rustPlatform.buildRustPackage {
|
in rustPlatform.buildRustPackage {
|
||||||
pname = "devenv";
|
pname = "devenv";
|
||||||
inherit version;
|
inherit version;
|
||||||
@ -35,10 +35,10 @@ in rustPlatform.buildRustPackage {
|
|||||||
owner = "cachix";
|
owner = "cachix";
|
||||||
repo = "devenv";
|
repo = "devenv";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-14hqEeVy72nYDOFn7HK6Mff7L49kUI5K6wMLVHG3A90=";
|
hash = "sha256-FhlknassIb3rKEucqnfFAzgny1ANmenJcTyRaXYwbA0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-E4pU/tZHxMrKSheqWF5qeOfS/NZ/Uw5jY+AbSUHmoaI=";
|
cargoHash = "sha256-dJ8A2kVXkpJcRvMLE/IawFUZNJqok/IRixTRGtLsE3w=";
|
||||||
|
|
||||||
buildAndTestSubdir = "devenv";
|
buildAndTestSubdir = "devenv";
|
||||||
|
|
||||||
|
@ -13,11 +13,11 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "magic-vlsi";
|
pname = "magic-vlsi";
|
||||||
version = "8.3.486";
|
version = "8.3.497";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz";
|
url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz";
|
||||||
sha256 = "sha256-RLAA97roY41imjxehEFzF+peLmrS+rTQkVua+8dxKDY=";
|
sha256 = "sha256-toLywrRtaoA8m2YCgwsKRGif4c5nLOt5eFRDp+ZX8/M=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ python3 ];
|
nativeBuildInputs = [ python3 ];
|
||||||
|
103
pkgs/by-name/nc/ncspot/package.nix
Normal file
103
pkgs/by-name/nc/ncspot/package.nix
Normal file
@ -0,0 +1,103 @@
|
|||||||
|
{
|
||||||
|
lib,
|
||||||
|
stdenv,
|
||||||
|
alsa-lib,
|
||||||
|
config,
|
||||||
|
darwin,
|
||||||
|
dbus,
|
||||||
|
fetchFromGitHub,
|
||||||
|
libpulseaudio,
|
||||||
|
libxcb,
|
||||||
|
ncspot,
|
||||||
|
ncurses,
|
||||||
|
nix-update-script,
|
||||||
|
openssl,
|
||||||
|
pkg-config,
|
||||||
|
portaudio,
|
||||||
|
python3,
|
||||||
|
rustPlatform,
|
||||||
|
testers,
|
||||||
|
ueberzug,
|
||||||
|
withALSA ? stdenv.hostPlatform.isLinux,
|
||||||
|
withClipboard ? true,
|
||||||
|
withCover ? false,
|
||||||
|
withCrossterm ? true,
|
||||||
|
withMPRIS ? stdenv.hostPlatform.isLinux,
|
||||||
|
withNcurses ? false,
|
||||||
|
withNotify ? true,
|
||||||
|
withPancurses ? false,
|
||||||
|
withPortAudio ? stdenv.hostPlatform.isDarwin,
|
||||||
|
withPulseAudio ? config.pulseaudio or stdenv.hostPlatform.isLinux,
|
||||||
|
withRodio ? false,
|
||||||
|
withShareSelection ? false,
|
||||||
|
withTermion ? false,
|
||||||
|
}:
|
||||||
|
|
||||||
|
rustPlatform.buildRustPackage rec {
|
||||||
|
pname = "ncspot";
|
||||||
|
version = "1.2.0";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "hrkfdn";
|
||||||
|
repo = "ncspot";
|
||||||
|
rev = "refs/tags/v${version}";
|
||||||
|
hash = "sha256-FI/MZRxTyYWh+CWq3roO6d48xlPsyL58+euGmCZ8p4Y=";
|
||||||
|
};
|
||||||
|
|
||||||
|
cargoHash = "sha256-Jg/P6aaMlgpunYd30eoBt1leL0vgEBn2wNRGZsP4abc=";
|
||||||
|
|
||||||
|
nativeBuildInputs = [ pkg-config ] ++ lib.optional withClipboard python3;
|
||||||
|
|
||||||
|
buildInputs =
|
||||||
|
[ ncurses ]
|
||||||
|
++ lib.optional stdenv.hostPlatform.isLinux openssl
|
||||||
|
++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Cocoa
|
||||||
|
++ lib.optional (withALSA || withRodio) alsa-lib
|
||||||
|
++ lib.optional withClipboard libxcb
|
||||||
|
++ lib.optional withCover ueberzug
|
||||||
|
++ lib.optional (withMPRIS || withNotify) dbus
|
||||||
|
++ lib.optional withNcurses ncurses
|
||||||
|
++ lib.optional withPortAudio portaudio
|
||||||
|
++ lib.optional withPulseAudio libpulseaudio;
|
||||||
|
|
||||||
|
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-DNCURSES_UNCTRL_H_incl";
|
||||||
|
|
||||||
|
buildNoDefaultFeatures = true;
|
||||||
|
|
||||||
|
buildFeatures =
|
||||||
|
lib.optional withALSA "alsa_backend"
|
||||||
|
++ lib.optional withClipboard "share_clipboard"
|
||||||
|
++ lib.optional withCover "cover"
|
||||||
|
++ lib.optional withCrossterm "crossterm_backend"
|
||||||
|
++ lib.optional withMPRIS "mpris"
|
||||||
|
++ lib.optional withNcurses "ncurses_backend"
|
||||||
|
++ lib.optional withNotify "notify"
|
||||||
|
++ lib.optional withPancurses "pancurses_backend"
|
||||||
|
++ lib.optional withPortAudio "portaudio_backend"
|
||||||
|
++ lib.optional withPulseAudio "pulseaudio_backend"
|
||||||
|
++ lib.optional withRodio "rodio_backend"
|
||||||
|
++ lib.optional withShareSelection "share_selection"
|
||||||
|
++ lib.optional withTermion "termion_backend";
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
install -D --mode=444 $src/misc/ncspot.desktop $out/share/applications/nscpot.desktop
|
||||||
|
install -D --mode=444 $src/images/logo.svg $out/share/icons/hicolor/scalable/apps/nscpot.png
|
||||||
|
'';
|
||||||
|
|
||||||
|
passthru = {
|
||||||
|
tests.version = testers.testVersion { package = ncspot; };
|
||||||
|
updateScript = nix-update-script { };
|
||||||
|
};
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Cross-platform ncurses Spotify client written in Rust, inspired by ncmpc and the likes";
|
||||||
|
homepage = "https://github.com/hrkfdn/ncspot";
|
||||||
|
changelog = "https://github.com/hrkfdn/ncspot/releases/tag/v${version}";
|
||||||
|
license = lib.licenses.bsd2;
|
||||||
|
maintainers = with lib.maintainers; [
|
||||||
|
liff
|
||||||
|
getchoo
|
||||||
|
];
|
||||||
|
mainProgram = "ncspot";
|
||||||
|
};
|
||||||
|
}
|
@ -5,16 +5,16 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "pgroll";
|
pname = "pgroll";
|
||||||
version = "0.6.0";
|
version = "0.7.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "xataio";
|
owner = "xataio";
|
||||||
repo = "pgroll";
|
repo = "pgroll";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-XZrgJZR6CWdQWgGMXlEyZ5De6bu/u7+YvYvq6id9YzM=";
|
hash = "sha256-7hIdm/qdcwlXC+vrEbjmBunORfEyItsr+Hia5u4ZBZk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-+6HpxqQxGpIAyfn+38UeW2ksv5WyX67AT5e9JgQBI+k=";
|
vendorHash = "sha256-jP4tTV/4kgT86d46L47Jcr/7ZtP2rL8boZiwqLvYo40=";
|
||||||
|
|
||||||
# Tests require a running docker daemon
|
# Tests require a running docker daemon
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
@ -1,28 +1,28 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
stdenv,
|
python3Packages,
|
||||||
python3,
|
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
|
|
||||||
# nativeCheckInputs
|
# nativeCheckInputs
|
||||||
ruff,
|
ruff,
|
||||||
|
|
||||||
|
# tests
|
||||||
|
versionCheckHook,
|
||||||
|
|
||||||
# passthru
|
# passthru
|
||||||
nix-update-script,
|
nix-update-script,
|
||||||
testers,
|
|
||||||
ruff-lsp,
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
python3.pkgs.buildPythonApplication rec {
|
python3Packages.buildPythonApplication rec {
|
||||||
pname = "ruff-lsp";
|
pname = "ruff-lsp";
|
||||||
version = "0.0.57";
|
version = "0.0.58";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "astral-sh";
|
owner = "astral-sh";
|
||||||
repo = "ruff-lsp";
|
repo = "ruff-lsp";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-w9NNdsDD+YLrCw8DHDhVx62MdwLhcN8QSmb/2rqlb5g=";
|
hash = "sha256-TB4OcKkaUGYAmiGNJRnfRmiXTyTQL4sFoBrzxT6DWec=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
@ -30,24 +30,23 @@ python3.pkgs.buildPythonApplication rec {
|
|||||||
sed -i '/"ruff>=/d' pyproject.toml
|
sed -i '/"ruff>=/d' pyproject.toml
|
||||||
'';
|
'';
|
||||||
|
|
||||||
build-system = with python3.pkgs; [ hatchling ];
|
build-system = with python3Packages; [ hatchling ];
|
||||||
|
|
||||||
dependencies = with python3.pkgs; [
|
dependencies = with python3Packages; [
|
||||||
packaging
|
packaging
|
||||||
pygls
|
pygls
|
||||||
lsprotocol
|
lsprotocol
|
||||||
typing-extensions
|
typing-extensions
|
||||||
];
|
];
|
||||||
|
|
||||||
# fails in linux sandbox
|
nativeCheckInputs = with python3Packages; [
|
||||||
doCheck = stdenv.hostPlatform.isDarwin;
|
|
||||||
|
|
||||||
nativeCheckInputs = with python3.pkgs; [
|
|
||||||
pytestCheckHook
|
pytestCheckHook
|
||||||
pytest-asyncio
|
pytest-asyncio
|
||||||
python-lsp-jsonrpc
|
python-lsp-jsonrpc
|
||||||
ruff
|
ruff
|
||||||
|
versionCheckHook
|
||||||
];
|
];
|
||||||
|
versionCheckProgramArg = [ "--version" ];
|
||||||
|
|
||||||
makeWrapperArgs = [
|
makeWrapperArgs = [
|
||||||
# prefer ruff from user's PATH, that's usually desired behavior
|
# prefer ruff from user's PATH, that's usually desired behavior
|
||||||
@ -61,7 +60,6 @@ python3.pkgs.buildPythonApplication rec {
|
|||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
updateScript = nix-update-script { };
|
updateScript = nix-update-script { };
|
||||||
tests.version = testers.testVersion { package = ruff-lsp; };
|
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
200
pkgs/by-name/ru/ruff/Cargo.lock
generated
200
pkgs/by-name/ru/ruff/Cargo.lock
generated
@ -36,12 +36,6 @@ dependencies = [
|
|||||||
"memchr",
|
"memchr",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "allocator-api2"
|
|
||||||
version = "0.2.16"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "android-tzdata"
|
name = "android-tzdata"
|
||||||
version = "0.1.1"
|
version = "0.1.1"
|
||||||
@ -353,9 +347,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "clap"
|
name = "clap"
|
||||||
version = "4.5.18"
|
version = "4.5.20"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3"
|
checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"clap_builder",
|
"clap_builder",
|
||||||
"clap_derive",
|
"clap_derive",
|
||||||
@ -363,9 +357,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "clap_builder"
|
name = "clap_builder"
|
||||||
version = "4.5.18"
|
version = "4.5.20"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b"
|
checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anstream",
|
"anstream",
|
||||||
"anstyle",
|
"anstyle",
|
||||||
@ -714,7 +708,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
|
checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"hashbrown",
|
"hashbrown 0.14.5",
|
||||||
"lock_api",
|
"lock_api",
|
||||||
"once_cell",
|
"once_cell",
|
||||||
"parking_lot_core",
|
"parking_lot_core",
|
||||||
@ -728,7 +722,7 @@ checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"crossbeam-utils",
|
"crossbeam-utils",
|
||||||
"hashbrown",
|
"hashbrown 0.14.5",
|
||||||
"lock_api",
|
"lock_api",
|
||||||
"once_cell",
|
"once_cell",
|
||||||
"parking_lot_core",
|
"parking_lot_core",
|
||||||
@ -1026,16 +1020,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
|
checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ahash",
|
"ahash",
|
||||||
"allocator-api2",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "hashbrown"
|
||||||
|
version = "0.15.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "hashlink"
|
name = "hashlink"
|
||||||
version = "0.9.1"
|
version = "0.9.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af"
|
checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"hashbrown",
|
"hashbrown 0.14.5",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -1127,7 +1126,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "fc9da1a252bd44cd341657203722352efc9bc0c847d06ea6d2dc1cd1135e0a01"
|
checksum = "fc9da1a252bd44cd341657203722352efc9bc0c847d06ea6d2dc1cd1135e0a01"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ahash",
|
"ahash",
|
||||||
"hashbrown",
|
"hashbrown 0.14.5",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -1147,7 +1146,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
|
checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"equivalent",
|
"equivalent",
|
||||||
"hashbrown",
|
"hashbrown 0.14.5",
|
||||||
"serde",
|
"serde",
|
||||||
]
|
]
|
||||||
|
|
||||||
@ -1312,9 +1311,9 @@ checksum = "8b23360e99b8717f20aaa4598f5a6541efbe30630039fbc7706cf954a87947ae"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "js-sys"
|
name = "js-sys"
|
||||||
version = "0.3.70"
|
version = "0.3.72"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
|
checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"wasm-bindgen",
|
"wasm-bindgen",
|
||||||
]
|
]
|
||||||
@ -1353,9 +1352,9 @@ checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "libcst"
|
name = "libcst"
|
||||||
version = "1.4.0"
|
version = "1.5.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "10293a04a48e8b0cb2cc825a93b83090e527bffd3c897a0255ad7bc96079e920"
|
checksum = "1586dd7a857d8a61a577afde1a24cc9573ff549eff092d5ce968b1ec93cc61b6"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"chic",
|
"chic",
|
||||||
"libcst_derive",
|
"libcst_derive",
|
||||||
@ -1626,9 +1625,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "once_cell"
|
name = "once_cell"
|
||||||
version = "1.19.0"
|
version = "1.20.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
|
checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "oorandom"
|
name = "oorandom"
|
||||||
@ -1691,9 +1690,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "paste"
|
name = "paste"
|
||||||
version = "1.0.14"
|
version = "1.0.15"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
|
checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "path-absolutize"
|
name = "path-absolutize"
|
||||||
@ -1721,15 +1720,15 @@ checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pathdiff"
|
name = "pathdiff"
|
||||||
version = "0.2.1"
|
version = "0.2.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
|
checksum = "d61c5ce1153ab5b689d0c074c4e7fc613e942dfb7dd9eea5ab202d2ad91fe361"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "peg"
|
name = "peg"
|
||||||
version = "0.8.2"
|
version = "0.8.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "400bcab7d219c38abf8bd7cc2054eb9bbbd4312d66f6a5557d572a203f646f61"
|
checksum = "295283b02df346d1ef66052a757869b2876ac29a6bb0ac3f5f7cd44aebe40e8f"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"peg-macros",
|
"peg-macros",
|
||||||
"peg-runtime",
|
"peg-runtime",
|
||||||
@ -1737,9 +1736,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "peg-macros"
|
name = "peg-macros"
|
||||||
version = "0.8.2"
|
version = "0.8.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "46e61cce859b76d19090f62da50a9fe92bab7c2a5f09e183763559a2ac392c90"
|
checksum = "bdad6a1d9cf116a059582ce415d5f5566aabcd4008646779dab7fdc2a9a9d426"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"peg-runtime",
|
"peg-runtime",
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
@ -1748,9 +1747,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "peg-runtime"
|
name = "peg-runtime"
|
||||||
version = "0.8.2"
|
version = "0.8.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "36bae92c60fa2398ce4678b98b2c4b5a7c61099961ca1fa305aec04a9ad28922"
|
checksum = "e3aeb8f54c078314c2065ee649a7241f46b9d8e418e1a9581ba0546657d7aa3a"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pep440_rs"
|
name = "pep440_rs"
|
||||||
@ -1944,9 +1943,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "proc-macro2"
|
name = "proc-macro2"
|
||||||
version = "1.0.86"
|
version = "1.0.87"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
|
checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"unicode-ident",
|
"unicode-ident",
|
||||||
]
|
]
|
||||||
@ -2081,10 +2080,14 @@ dependencies = [
|
|||||||
"camino",
|
"camino",
|
||||||
"compact_str",
|
"compact_str",
|
||||||
"countme",
|
"countme",
|
||||||
"hashbrown",
|
"hashbrown 0.15.0",
|
||||||
"insta",
|
"insta",
|
||||||
|
"itertools 0.13.0",
|
||||||
|
"memchr",
|
||||||
"ordermap",
|
"ordermap",
|
||||||
|
"red_knot_test",
|
||||||
"red_knot_vendored",
|
"red_knot_vendored",
|
||||||
|
"rstest",
|
||||||
"ruff_db",
|
"ruff_db",
|
||||||
"ruff_index",
|
"ruff_index",
|
||||||
"ruff_python_ast",
|
"ruff_python_ast",
|
||||||
@ -2127,6 +2130,26 @@ dependencies = [
|
|||||||
"tracing-subscriber",
|
"tracing-subscriber",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "red_knot_test"
|
||||||
|
version = "0.0.0"
|
||||||
|
dependencies = [
|
||||||
|
"anyhow",
|
||||||
|
"colored",
|
||||||
|
"once_cell",
|
||||||
|
"red_knot_python_semantic",
|
||||||
|
"red_knot_vendored",
|
||||||
|
"regex",
|
||||||
|
"ruff_db",
|
||||||
|
"ruff_index",
|
||||||
|
"ruff_python_trivia",
|
||||||
|
"ruff_source_file",
|
||||||
|
"ruff_text_size",
|
||||||
|
"rustc-hash 2.0.0",
|
||||||
|
"salsa",
|
||||||
|
"smallvec",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "red_knot_vendored"
|
name = "red_knot_vendored"
|
||||||
version = "0.0.0"
|
version = "0.0.0"
|
||||||
@ -2247,6 +2270,12 @@ version = "0.8.5"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
|
checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "relative-path"
|
||||||
|
version = "1.9.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ring"
|
name = "ring"
|
||||||
version = "0.17.8"
|
version = "0.17.8"
|
||||||
@ -2262,9 +2291,36 @@ dependencies = [
|
|||||||
"windows-sys 0.52.0",
|
"windows-sys 0.52.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rstest"
|
||||||
|
version = "0.22.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "7b423f0e62bdd61734b67cd21ff50871dfaeb9cc74f869dcd6af974fbcb19936"
|
||||||
|
dependencies = [
|
||||||
|
"rstest_macros",
|
||||||
|
"rustc_version",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rstest_macros"
|
||||||
|
version = "0.22.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "c5e1711e7d14f74b12a58411c542185ef7fb7f2e7f8ee6e2940a883628522b42"
|
||||||
|
dependencies = [
|
||||||
|
"cfg-if",
|
||||||
|
"glob",
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
"regex",
|
||||||
|
"relative-path",
|
||||||
|
"rustc_version",
|
||||||
|
"syn",
|
||||||
|
"unicode-ident",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ruff"
|
name = "ruff"
|
||||||
version = "0.6.9"
|
version = "0.7.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"argfile",
|
"argfile",
|
||||||
@ -2412,7 +2468,6 @@ dependencies = [
|
|||||||
"ruff_python_codegen",
|
"ruff_python_codegen",
|
||||||
"ruff_python_formatter",
|
"ruff_python_formatter",
|
||||||
"ruff_python_parser",
|
"ruff_python_parser",
|
||||||
"ruff_python_stdlib",
|
|
||||||
"ruff_python_trivia",
|
"ruff_python_trivia",
|
||||||
"ruff_workspace",
|
"ruff_workspace",
|
||||||
"schemars",
|
"schemars",
|
||||||
@ -2484,7 +2539,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ruff_linter"
|
name = "ruff_linter"
|
||||||
version = "0.6.9"
|
version = "0.7.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"aho-corasick",
|
"aho-corasick",
|
||||||
"annotate-snippets 0.9.2",
|
"annotate-snippets 0.9.2",
|
||||||
@ -2804,7 +2859,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ruff_wasm"
|
name = "ruff_wasm"
|
||||||
version = "0.6.9"
|
version = "0.7.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"console_error_panic_hook",
|
"console_error_panic_hook",
|
||||||
"console_log",
|
"console_log",
|
||||||
@ -2885,6 +2940,15 @@ version = "2.0.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
|
checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rustc_version"
|
||||||
|
version = "0.4.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
|
||||||
|
dependencies = [
|
||||||
|
"semver",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rustix"
|
name = "rustix"
|
||||||
version = "0.38.37"
|
version = "0.38.37"
|
||||||
@ -2945,7 +3009,7 @@ checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "salsa"
|
name = "salsa"
|
||||||
version = "0.18.0"
|
version = "0.18.0"
|
||||||
source = "git+https://github.com/salsa-rs/salsa.git?rev=4a7c955255e707e64e43f3ce5eabb771ae067768#4a7c955255e707e64e43f3ce5eabb771ae067768"
|
source = "git+https://github.com/salsa-rs/salsa.git?rev=b14be5c0392f4c55eca60b92e457a35549372382#b14be5c0392f4c55eca60b92e457a35549372382"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"append-only-vec",
|
"append-only-vec",
|
||||||
"arc-swap",
|
"arc-swap",
|
||||||
@ -2965,12 +3029,12 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "salsa-macro-rules"
|
name = "salsa-macro-rules"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/salsa-rs/salsa.git?rev=4a7c955255e707e64e43f3ce5eabb771ae067768#4a7c955255e707e64e43f3ce5eabb771ae067768"
|
source = "git+https://github.com/salsa-rs/salsa.git?rev=b14be5c0392f4c55eca60b92e457a35549372382#b14be5c0392f4c55eca60b92e457a35549372382"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "salsa-macros"
|
name = "salsa-macros"
|
||||||
version = "0.18.0"
|
version = "0.18.0"
|
||||||
source = "git+https://github.com/salsa-rs/salsa.git?rev=4a7c955255e707e64e43f3ce5eabb771ae067768#4a7c955255e707e64e43f3ce5eabb771ae067768"
|
source = "git+https://github.com/salsa-rs/salsa.git?rev=b14be5c0392f4c55eca60b92e457a35549372382#b14be5c0392f4c55eca60b92e457a35549372382"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"heck",
|
"heck",
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
@ -3030,6 +3094,12 @@ version = "4.1.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
|
checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "semver"
|
||||||
|
version = "1.0.23"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde"
|
name = "serde"
|
||||||
version = "1.0.210"
|
version = "1.0.210"
|
||||||
@ -3115,9 +3185,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde_with"
|
name = "serde_with"
|
||||||
version = "3.9.0"
|
version = "3.11.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
|
checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"serde",
|
"serde",
|
||||||
"serde_derive",
|
"serde_derive",
|
||||||
@ -3126,9 +3196,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde_with_macros"
|
name = "serde_with_macros"
|
||||||
version = "3.9.0"
|
version = "3.11.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
|
checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"darling",
|
"darling",
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
@ -3281,12 +3351,12 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "terminal_size"
|
name = "terminal_size"
|
||||||
version = "0.3.0"
|
version = "0.4.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
|
checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"rustix",
|
"rustix",
|
||||||
"windows-sys 0.48.0",
|
"windows-sys 0.59.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -3788,9 +3858,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wasm-bindgen"
|
name = "wasm-bindgen"
|
||||||
version = "0.2.93"
|
version = "0.2.95"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
|
checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"once_cell",
|
"once_cell",
|
||||||
@ -3799,9 +3869,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wasm-bindgen-backend"
|
name = "wasm-bindgen-backend"
|
||||||
version = "0.2.93"
|
version = "0.2.95"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
|
checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bumpalo",
|
"bumpalo",
|
||||||
"log",
|
"log",
|
||||||
@ -3814,9 +3884,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wasm-bindgen-futures"
|
name = "wasm-bindgen-futures"
|
||||||
version = "0.4.43"
|
version = "0.4.45"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
|
checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"js-sys",
|
"js-sys",
|
||||||
@ -3826,9 +3896,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wasm-bindgen-macro"
|
name = "wasm-bindgen-macro"
|
||||||
version = "0.2.93"
|
version = "0.2.95"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
|
checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"quote",
|
"quote",
|
||||||
"wasm-bindgen-macro-support",
|
"wasm-bindgen-macro-support",
|
||||||
@ -3836,9 +3906,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wasm-bindgen-macro-support"
|
name = "wasm-bindgen-macro-support"
|
||||||
version = "0.2.93"
|
version = "0.2.95"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
|
checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
@ -3849,15 +3919,15 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wasm-bindgen-shared"
|
name = "wasm-bindgen-shared"
|
||||||
version = "0.2.93"
|
version = "0.2.95"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
|
checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wasm-bindgen-test"
|
name = "wasm-bindgen-test"
|
||||||
version = "0.3.43"
|
version = "0.3.45"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "68497a05fb21143a08a7d24fc81763384a3072ee43c44e86aad1744d6adef9d9"
|
checksum = "d381749acb0943d357dcbd8f0b100640679883fcdeeef04def49daf8d33a5426"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"console_error_panic_hook",
|
"console_error_panic_hook",
|
||||||
"js-sys",
|
"js-sys",
|
||||||
@ -3870,9 +3940,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wasm-bindgen-test-macro"
|
name = "wasm-bindgen-test-macro"
|
||||||
version = "0.3.43"
|
version = "0.3.45"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "4b8220be1fa9e4c889b30fd207d4906657e7e90b12e0e6b0c8b8d8709f5de021"
|
checksum = "c97b2ef2c8d627381e51c071c2ab328eac606d3f69dd82bcbca20a9e389d95f0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
|
@ -13,20 +13,20 @@
|
|||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "ruff";
|
pname = "ruff";
|
||||||
version = "0.6.9";
|
version = "0.7.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "astral-sh";
|
owner = "astral-sh";
|
||||||
repo = "ruff";
|
repo = "ruff";
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-O8iRCVxHrchBSf9kLdkdT0+oMi+5fLCAF9CMEsPrHqw=";
|
hash = "sha256-//ayB5ayYM5FqiSXDDns2tIL+PJ0Osvkp8+MEEL0L+8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoLock = {
|
cargoLock = {
|
||||||
lockFile = ./Cargo.lock;
|
lockFile = ./Cargo.lock;
|
||||||
outputHashes = {
|
outputHashes = {
|
||||||
"lsp-types-0.95.1" = "sha256-8Oh299exWXVi6A39pALOISNfp8XBya8z+KT/Z7suRxQ=";
|
"lsp-types-0.95.1" = "sha256-8Oh299exWXVi6A39pALOISNfp8XBya8z+KT/Z7suRxQ=";
|
||||||
"salsa-0.18.0" = "sha256-zHXLNK6SCiJ3MmT0PMIauA1eolyJ4wfVWxN6wcvmhts=";
|
"salsa-0.18.0" = "sha256-vuLgeaqIL8U+5PUHJaGdovHFapAMGGQ9nPAMJJnxz/o=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
58
pkgs/by-name/sq/sqruff/package.nix
Normal file
58
pkgs/by-name/sq/sqruff/package.nix
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
{
|
||||||
|
lib,
|
||||||
|
rustPlatform,
|
||||||
|
fetchFromGitHub,
|
||||||
|
installShellFiles,
|
||||||
|
stdenv,
|
||||||
|
darwin,
|
||||||
|
rust-jemalloc-sys,
|
||||||
|
nix-update-script,
|
||||||
|
versionCheckHook,
|
||||||
|
}:
|
||||||
|
rustPlatform.buildRustPackage rec {
|
||||||
|
pname = "sqruff";
|
||||||
|
version = "0.17.0";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "quarylabs";
|
||||||
|
repo = "sqruff";
|
||||||
|
rev = "refs/tags/v${version}";
|
||||||
|
hash = "sha256-uUtbVf4U59jne5uORXpyzpqhFQoviKi2O9KQ5s1CfhU=";
|
||||||
|
};
|
||||||
|
|
||||||
|
cargoHash = "sha256-kIBjPh+rL4vzIAqGNYMpw39A0vADbHxi/PkhoG+QL6c=";
|
||||||
|
|
||||||
|
# Requires nightly features (feature(let_chains) and feature(trait_upcasting))
|
||||||
|
RUSTC_BOOTSTRAP = true;
|
||||||
|
|
||||||
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
rust-jemalloc-sys
|
||||||
|
] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ];
|
||||||
|
|
||||||
|
# Patch the tests to find the binary
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace crates/cli/tests/ui.rs \
|
||||||
|
--replace-fail \
|
||||||
|
'config.program.program = format!("../../target/{profile}/sqruff").into();' \
|
||||||
|
'config.program.program = "../../target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/sqruff".into();'
|
||||||
|
'';
|
||||||
|
|
||||||
|
nativeCheckInputs = [ versionCheckHook ];
|
||||||
|
versionCheckProgramArg = [ "--version" ];
|
||||||
|
doInstallCheck = true;
|
||||||
|
|
||||||
|
passthru = {
|
||||||
|
updateScript = nix-update-script { };
|
||||||
|
};
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Fast SQL formatter/linter";
|
||||||
|
homepage = "https://github.com/quarylabs/sqruff";
|
||||||
|
changelog = "https://github.com/quarylabs/sqruff/releases/tag/${version}";
|
||||||
|
license = lib.licenses.asl20;
|
||||||
|
mainProgram = "sqruff";
|
||||||
|
maintainers = with lib.maintainers; [ hasnep ];
|
||||||
|
};
|
||||||
|
}
|
40
pkgs/by-name/vu/vuls/package.nix
Normal file
40
pkgs/by-name/vu/vuls/package.nix
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
{
|
||||||
|
lib,
|
||||||
|
buildGoModule,
|
||||||
|
fetchFromGitHub,
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildGoModule rec {
|
||||||
|
pname = "vuls";
|
||||||
|
version = "0.27.0";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "future-architect";
|
||||||
|
repo = "vuls";
|
||||||
|
rev = "refs/tags/v${version}";
|
||||||
|
hash = "sha256-+KEcK9GLx1QErRQlSVGeFnvYoWY3lVFr7S4Zb34Djzo=";
|
||||||
|
fetchSubmodules = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
vendorHash = "sha256-XTKPsXCOzrji3qq+L4NR8FLBnXcafLj8w3K+UwowLQU=";
|
||||||
|
|
||||||
|
ldflags = [
|
||||||
|
"-s"
|
||||||
|
"-w"
|
||||||
|
"-X=github.com/future-architect/vuls/config.Version=${version}"
|
||||||
|
"-X=github.com/future-architect/vuls/config.Revision=${src.rev}-1970-01-01T00:00:00Z"
|
||||||
|
];
|
||||||
|
|
||||||
|
postFixup = ''
|
||||||
|
mv $out/bin/cmd $out/bin/trivy-to-vuls
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Agent-less vulnerability scanner";
|
||||||
|
homepage = "https://github.com/future-architect/vuls";
|
||||||
|
changelog = "https://github.com/future-architect/vuls/blob/${src.rev}/CHANGELOG.md";
|
||||||
|
license = lib.licenses.gpl3Only;
|
||||||
|
maintainers = with lib.maintainers; [ fab ];
|
||||||
|
mainProgram = "vuls";
|
||||||
|
};
|
||||||
|
}
|
@ -0,0 +1,26 @@
|
|||||||
|
From 08d719e96214f648ae95043acc308deca36e1f7a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
|
||||||
|
Date: Tue, 15 Oct 2024 13:52:39 -0400
|
||||||
|
Subject: [PATCH] Define HAVE_DB_185_H
|
||||||
|
|
||||||
|
---
|
||||||
|
cf/db.m4 | 3 +++
|
||||||
|
1 file changed, 3 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/cf/db.m4 b/cf/db.m4
|
||||||
|
index c0b4510b6..c95a9dee9 100644
|
||||||
|
--- a/cf/db.m4
|
||||||
|
+++ b/cf/db.m4
|
||||||
|
@@ -57,6 +57,9 @@ AS_IF([test "x$with_berkeley_db" != xno],
|
||||||
|
db.h \
|
||||||
|
])])
|
||||||
|
|
||||||
|
+dnl detect if compat db_185.h is present
|
||||||
|
+AC_CHECK_HEADERS([db_185.h])
|
||||||
|
+
|
||||||
|
dnl db_create is used by db3 and db4 and db5 and db6
|
||||||
|
|
||||||
|
AC_FIND_FUNC_NO_LIBS(db_create, [$dbheader] db-6 db-5 db4 db3 db, [
|
||||||
|
--
|
||||||
|
2.46.0
|
||||||
|
|
@ -0,0 +1,25 @@
|
|||||||
|
From 749d9451293f9d9f8a3f506401cae369003aeebf Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
|
||||||
|
Date: Sun, 13 Oct 2024 17:16:13 -0400
|
||||||
|
Subject: [PATCH] Include db.h for nbdb compat mode
|
||||||
|
|
||||||
|
---
|
||||||
|
lib/otp/otp_db.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/lib/otp/otp_db.c b/lib/otp/otp_db.c
|
||||||
|
index 036359c1d..32c04bc8c 100644
|
||||||
|
--- a/lib/otp/otp_db.c
|
||||||
|
+++ b/lib/otp/otp_db.c
|
||||||
|
@@ -39,7 +39,7 @@ RCSID("$Id$");
|
||||||
|
#include "otp_locl.h"
|
||||||
|
|
||||||
|
#if defined(HAVE_DB_NDBM)
|
||||||
|
-# include <ndbm.h>
|
||||||
|
+# include <db.h>
|
||||||
|
#elif !defined(HAVE_NDBM)
|
||||||
|
# include "ndbm_wrap.h"
|
||||||
|
#endif
|
||||||
|
--
|
||||||
|
2.46.0
|
||||||
|
|
@ -0,0 +1,51 @@
|
|||||||
|
From 862900febaec4a2c70257a39374b81138ee9f168 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
|
||||||
|
Date: Tue, 15 Oct 2024 16:06:33 -0400
|
||||||
|
Subject: [PATCH] Link tests with libresolv
|
||||||
|
|
||||||
|
---
|
||||||
|
lib/gssapi/Makefile.am | 1 +
|
||||||
|
lib/krb5/Makefile.am | 2 ++
|
||||||
|
lib/roken/Makefile.am | 1 +
|
||||||
|
3 files changed, 4 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/lib/gssapi/Makefile.am b/lib/gssapi/Makefile.am
|
||||||
|
index 3254866dc..db967e586 100644
|
||||||
|
--- a/lib/gssapi/Makefile.am
|
||||||
|
+++ b/lib/gssapi/Makefile.am
|
||||||
|
@@ -403,6 +403,7 @@ LDADD = libgssapi.la \
|
||||||
|
$(top_builddir)/lib/krb5/libkrb5.la \
|
||||||
|
$(LIB_roken)
|
||||||
|
|
||||||
|
+test_names_LDFLAGS = -lresolv
|
||||||
|
test_names_LDADD = $(LDADD) $(top_builddir)/lib/asn1/libasn1.la
|
||||||
|
test_context_LDADD = $(LDADD) $(top_builddir)/lib/asn1/libasn1.la $(top_builddir)/lib/wind/libwind.la
|
||||||
|
|
||||||
|
diff --git a/lib/krb5/Makefile.am b/lib/krb5/Makefile.am
|
||||||
|
index ecce461dd..e22cfe87c 100644
|
||||||
|
--- a/lib/krb5/Makefile.am
|
||||||
|
+++ b/lib/krb5/Makefile.am
|
||||||
|
@@ -330,6 +330,8 @@ test_rfc3961_LDADD = \
|
||||||
|
$(LIB_hcrypto) \
|
||||||
|
$(LIB_roken)
|
||||||
|
|
||||||
|
+test_plugin_LDFLAGS = -lresolv
|
||||||
|
+
|
||||||
|
if DEVELOPER_MODE
|
||||||
|
headerdeps = $(dist_libkrb5_la_SOURCES)
|
||||||
|
endif
|
||||||
|
diff --git a/lib/roken/Makefile.am b/lib/roken/Makefile.am
|
||||||
|
index 1f530c7ae..8350d7034 100644
|
||||||
|
--- a/lib/roken/Makefile.am
|
||||||
|
+++ b/lib/roken/Makefile.am
|
||||||
|
@@ -54,6 +54,7 @@ libtest_la_CFLAGS = -DTEST_SNPRINTF -DTEST_STRPFTIME
|
||||||
|
|
||||||
|
parse_reply_test_SOURCES = parse_reply-test.c resolve.c
|
||||||
|
parse_reply_test_CFLAGS = -DTEST_RESOLVE
|
||||||
|
+parse_reply_test_LDFLAGS = -lresolv
|
||||||
|
|
||||||
|
test_readenv_SOURCES = test-readenv.c test-mem.c
|
||||||
|
test_auxval_SOURCES = test-auxval.c
|
||||||
|
--
|
||||||
|
2.46.0
|
||||||
|
|
@ -66,9 +66,9 @@ stdenv.mkDerivation {
|
|||||||
perl
|
perl
|
||||||
bison
|
bison
|
||||||
flex
|
flex
|
||||||
|
perlPackages.JSON
|
||||||
texinfo
|
texinfo
|
||||||
]
|
];
|
||||||
++ (with perlPackages; [ JSON ]);
|
|
||||||
|
|
||||||
buildInputs = [ db libedit pam ]
|
buildInputs = [ db libedit pam ]
|
||||||
++ lib.optionals (stdenv.hostPlatform.isDarwin) [ CoreFoundation Security SystemConfiguration ]
|
++ lib.optionals (stdenv.hostPlatform.isDarwin) [ CoreFoundation Security SystemConfiguration ]
|
||||||
@ -109,6 +109,15 @@ stdenv.mkDerivation {
|
|||||||
"--with-sqlite3=${sqlite.dev}"
|
"--with-sqlite3=${sqlite.dev}"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Proposed @ https://github.com/heimdal/heimdal/pull/1262
|
||||||
|
./0001-Include-db.h-for-nbdb-compat-mode.patch
|
||||||
|
# Proposed @ https://github.com/heimdal/heimdal/pull/1264
|
||||||
|
./0001-Define-HAVE_DB_185_H.patch
|
||||||
|
# Proposed @ https://github.com/heimdal/heimdal/pull/1265
|
||||||
|
./0001-Link-tests-with-libresolv.patch
|
||||||
|
];
|
||||||
|
|
||||||
# (check-ldap) slapd resides within ${openldap}/libexec,
|
# (check-ldap) slapd resides within ${openldap}/libexec,
|
||||||
# which is not part of $PATH by default.
|
# which is not part of $PATH by default.
|
||||||
# (check-ldap) prepending ${openldap}/bin to the path to avoid
|
# (check-ldap) prepending ${openldap}/bin to the path to avoid
|
||||||
|
@ -13,15 +13,15 @@
|
|||||||
, withCryptodev ? false
|
, withCryptodev ? false
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation rec {
|
||||||
pname = "quictls";
|
pname = "quictls";
|
||||||
version = "3.1.5-quic1";
|
version = "3.3.0-quic1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "quictls";
|
owner = "quictls";
|
||||||
repo = "openssl";
|
repo = "openssl";
|
||||||
rev = "cb6841b741544bfd8868c1641ce96a934985509e";
|
rev = "openssl-${version}";
|
||||||
hash = "sha256-oR46jefarUGmBYjjpEvtKFzIOgSXSy58cLdX+P5ocA8=";
|
hash = "sha256-kBPwldTJbJSuvBVylJNcLSJvF/Hbqh0mfT4Ub5Xc6dk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
@ -32,8 +32,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
../openssl/3.0/openssl-disable-kernel-detection.patch
|
../openssl/3.0/openssl-disable-kernel-detection.patch
|
||||||
|
|
||||||
(if stdenv.hostPlatform.isDarwin
|
(if stdenv.hostPlatform.isDarwin
|
||||||
then ../openssl/use-etc-ssl-certs-darwin.patch
|
then ../openssl/3.3/use-etc-ssl-certs-darwin.patch
|
||||||
else ../openssl/use-etc-ssl-certs.patch)
|
else ../openssl/3.3/use-etc-ssl-certs.patch)
|
||||||
];
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
@ -119,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
++ lib.optional enableSSL3 "enable-ssl3"
|
++ lib.optional enableSSL3 "enable-ssl3"
|
||||||
# We select KTLS here instead of the configure-time detection (which we patch out).
|
# We select KTLS here instead of the configure-time detection (which we patch out).
|
||||||
# KTLS should work on FreeBSD 13+ as well, so we could enable it if someone tests it.
|
# KTLS should work on FreeBSD 13+ as well, so we could enable it if someone tests it.
|
||||||
++ lib.optional (stdenv.hostPlatform.isLinux && lib.versionAtLeast finalAttrs.version "3.0.0") "enable-ktls"
|
++ lib.optional (stdenv.hostPlatform.isLinux && lib.versionAtLeast version "3.0.0") "enable-ktls"
|
||||||
++ lib.optional stdenv.hostPlatform.isAarch64 "no-afalgeng"
|
++ lib.optional stdenv.hostPlatform.isAarch64 "no-afalgeng"
|
||||||
# OpenSSL needs a specific `no-shared` configure flag.
|
# OpenSSL needs a specific `no-shared` configure flag.
|
||||||
# See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options
|
# See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options
|
||||||
@ -176,11 +176,11 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
changelog = "https://github.com/quictls/openssl/blob/${finalAttrs.src.rev}/CHANGES.md";
|
changelog = "https://github.com/quictls/openssl/blob/openssl-${version}/CHANGES.md";
|
||||||
description = "TLS/SSL and crypto library with QUIC APIs";
|
description = "TLS/SSL and crypto library with QUIC APIs";
|
||||||
homepage = "https://quictls.github.io";
|
homepage = "https://quictls.github.io";
|
||||||
license = lib.licenses.openssl;
|
license = lib.licenses.openssl;
|
||||||
maintainers = with lib.maintainers; [ izorkin ];
|
maintainers = with lib.maintainers; [ izorkin ];
|
||||||
platforms = lib.platforms.all;
|
platforms = lib.platforms.all;
|
||||||
};
|
};
|
||||||
})
|
}
|
||||||
|
@ -50,13 +50,13 @@ let
|
|||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "wxwidgets";
|
pname = "wxwidgets";
|
||||||
version = "3.2.5";
|
version = "3.2.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "wxWidgets";
|
owner = "wxWidgets";
|
||||||
repo = "wxWidgets";
|
repo = "wxWidgets";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-ibkXs693xO+z3JuMvlG4b/+A8f4Lf5TYqdDa67fb9ck=";
|
hash = "sha256-7dc7NGiKSonFFaWp3UxLYqDc1Cc6no1Eba0QmtzX5mM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
buildPythonPackage,
|
buildPythonPackage,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
pytest-asyncio,
|
pytest-asyncio,
|
||||||
|
pytest-cov-stub,
|
||||||
pytestCheckHook,
|
pytestCheckHook,
|
||||||
pythonOlder,
|
pythonOlder,
|
||||||
setuptools,
|
setuptools,
|
||||||
@ -14,7 +15,7 @@ buildPythonPackage rec {
|
|||||||
version = "0.6.3";
|
version = "0.6.3";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.9";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "vxgmichel";
|
owner = "vxgmichel";
|
||||||
@ -23,17 +24,13 @@ buildPythonPackage rec {
|
|||||||
hash = "sha256-MssA4gDo79mlHjVwQAxhX6DZPHB4Quo6V05Nye91oJg=";
|
hash = "sha256-MssA4gDo79mlHjVwQAxhX6DZPHB4Quo6V05Nye91oJg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
substituteInPlace pyproject.toml \
|
|
||||||
--replace-fail " --cov aiostream" ""
|
|
||||||
'';
|
|
||||||
|
|
||||||
build-system = [ setuptools ];
|
build-system = [ setuptools ];
|
||||||
|
|
||||||
dependencies = [ typing-extensions ];
|
dependencies = [ typing-extensions ];
|
||||||
|
|
||||||
nativeCheckInputs = [
|
nativeCheckInputs = [
|
||||||
pytest-asyncio
|
pytest-asyncio
|
||||||
|
pytest-cov-stub
|
||||||
pytestCheckHook
|
pytestCheckHook
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -4,20 +4,21 @@
|
|||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
fetchpatch,
|
fetchpatch,
|
||||||
pythonOlder,
|
pythonOlder,
|
||||||
|
setuptools,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "asynccmd";
|
pname = "asynccmd";
|
||||||
version = "0.2.4";
|
version = "0.2.4";
|
||||||
format = "setuptools";
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "valentinmk";
|
owner = "valentinmk";
|
||||||
repo = pname;
|
repo = "asynccmd";
|
||||||
rev = version;
|
rev = "refs/tags/${version}";
|
||||||
sha256 = "02sa0k0zgwv0y8k00pd1yh4x7k7xqhdikk2c0avpih1204lcw26h";
|
hash = "sha256-0AjOKAEiwHi3AkzMGRvE/czTCfShXQAm8mDz98EESgs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
@ -25,10 +26,12 @@ buildPythonPackage rec {
|
|||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
name = "deprecation-python-38.patch";
|
name = "deprecation-python-38.patch";
|
||||||
url = "https://github.com/valentinmk/asynccmd/commit/12afa60ac07db17e96755e266061f2c88cb545ff.patch";
|
url = "https://github.com/valentinmk/asynccmd/commit/12afa60ac07db17e96755e266061f2c88cb545ff.patch";
|
||||||
sha256 = "0l6sk93gj51qqrpw01a8iiyz14k6dd2z68vr9l9w9vx76l8725yf";
|
hash = "sha256-zhdxEDWn78QTTXkj80VrZpLwfYxIBcBvxjgU+Uaa2lA=";
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
|
build-system = [ setuptools ];
|
||||||
|
|
||||||
# Tests are outdated
|
# Tests are outdated
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
@ -37,7 +40,8 @@ buildPythonPackage rec {
|
|||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Asyncio implementation of Cmd Python library";
|
description = "Asyncio implementation of Cmd Python library";
|
||||||
homepage = "https://github.com/valentinmk/asynccmd";
|
homepage = "https://github.com/valentinmk/asynccmd";
|
||||||
license = with licenses; [ asl20 ];
|
changelog = "https://github.com/valentinmk/asynccmd/releases/tag/${version}";
|
||||||
|
license = licenses.asl20;
|
||||||
maintainers = with maintainers; [ fab ];
|
maintainers = with maintainers; [ fab ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -7,7 +7,6 @@
|
|||||||
atpublic,
|
atpublic,
|
||||||
black,
|
black,
|
||||||
clickhouse-connect,
|
clickhouse-connect,
|
||||||
dask,
|
|
||||||
datafusion,
|
datafusion,
|
||||||
db-dtypes,
|
db-dtypes,
|
||||||
duckdb,
|
duckdb,
|
||||||
|
@ -26,13 +26,13 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "jupyter-collaboration";
|
pname = "jupyter-collaboration";
|
||||||
version = "2.1.3";
|
version = "2.1.4";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
pname = "jupyter_collaboration";
|
pname = "jupyter_collaboration";
|
||||||
inherit version;
|
inherit version;
|
||||||
hash = "sha256-OjX7C7+eRerggQwKEcqF1CmUH5wGtF8ZavtuvTYTNTk=";
|
hash = "sha256-YT3wrTQ8imuTK8zeJbwscHtawtqspf1oItGzMMfg5io=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
@ -2,35 +2,37 @@
|
|||||||
lib,
|
lib,
|
||||||
buildPythonPackage,
|
buildPythonPackage,
|
||||||
fetchPypi,
|
fetchPypi,
|
||||||
pythonOlder,
|
|
||||||
|
# build-system
|
||||||
hatch-nodejs-version,
|
hatch-nodejs-version,
|
||||||
hatchling,
|
hatchling,
|
||||||
importlib-metadata,
|
|
||||||
|
# dependencies
|
||||||
pycrdt,
|
pycrdt,
|
||||||
pytestCheckHook,
|
pytestCheckHook,
|
||||||
|
|
||||||
|
# tests
|
||||||
websockets,
|
websockets,
|
||||||
ypy-websocket,
|
ypy-websocket,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "jupyter-ydoc";
|
pname = "jupyter-ydoc";
|
||||||
version = "2.1.1";
|
version = "2.1.2";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
pname = "jupyter_ydoc";
|
pname = "jupyter_ydoc";
|
||||||
inherit version;
|
inherit version;
|
||||||
hash = "sha256-HcvxOGGzZ4AA1pr07zi0njoS+AgbqFHGgDk8Lhi8S4Q=";
|
hash = "sha256-yYnIm0s9ljtYQJVzKJcimNTVSDTtjzz3Zo3WE9OfKsw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
build-system = [
|
||||||
hatch-nodejs-version
|
hatch-nodejs-version
|
||||||
hatchling
|
hatchling
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [ pycrdt ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
|
dependencies = [ pycrdt ];
|
||||||
|
|
||||||
pythonImportsCheck = [ "jupyter_ydoc" ];
|
pythonImportsCheck = [ "jupyter_ydoc" ];
|
||||||
|
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
buildPythonPackage,
|
buildPythonPackage,
|
||||||
pythonOlder,
|
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
|
|
||||||
# build-system
|
# build-system
|
||||||
@ -27,16 +26,14 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pycrdt-websocket";
|
pname = "pycrdt-websocket";
|
||||||
version = "0.14.2";
|
version = "0.15.1";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jupyter-server";
|
owner = "jupyter-server";
|
||||||
repo = "pycrdt-websocket";
|
repo = "pycrdt-websocket";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-YsAeEUFxCwu7KA2d83J/rb1IlZTQZZecHJAewh+TqWs=";
|
hash = "sha256-O0GRk81at8bgv+/4au8A55dZK2A28+ghy3sitAAZQBI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [ hatchling ];
|
build-system = [ hatchling ];
|
||||||
|
61
pkgs/development/python-modules/pycrdt/Cargo.lock
generated
61
pkgs/development/python-modules/pycrdt/Cargo.lock
generated
@ -152,9 +152,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "js-sys"
|
name = "js-sys"
|
||||||
version = "0.3.70"
|
version = "0.3.72"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
|
checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"wasm-bindgen",
|
"wasm-bindgen",
|
||||||
]
|
]
|
||||||
@ -198,12 +198,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "once_cell"
|
name = "once_cell"
|
||||||
version = "1.20.1"
|
version = "1.20.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1"
|
checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
|
||||||
dependencies = [
|
|
||||||
"portable-atomic",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "parking"
|
name = "parking"
|
||||||
@ -238,16 +235,16 @@ checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "proc-macro2"
|
name = "proc-macro2"
|
||||||
version = "1.0.86"
|
version = "1.0.87"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
|
checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"unicode-ident",
|
"unicode-ident",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pycrdt"
|
name = "pycrdt"
|
||||||
version = "0.9.16"
|
version = "0.10.3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"pyo3",
|
"pyo3",
|
||||||
"yrs",
|
"yrs",
|
||||||
@ -255,9 +252,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pyo3"
|
name = "pyo3"
|
||||||
version = "0.22.3"
|
version = "0.22.5"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "15ee168e30649f7f234c3d49ef5a7a6cbf5134289bc46c29ff3155fa3221c225"
|
checksum = "3d922163ba1f79c04bc49073ba7b32fd5a8d3b76a87c955921234b8e77333c51"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"indoc",
|
"indoc",
|
||||||
@ -273,9 +270,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pyo3-build-config"
|
name = "pyo3-build-config"
|
||||||
version = "0.22.3"
|
version = "0.22.5"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e61cef80755fe9e46bb8a0b8f20752ca7676dcc07a5277d8b7768c6172e529b3"
|
checksum = "bc38c5feeb496c8321091edf3d63e9a6829eab4b863b4a6a65f26f3e9cc6b179"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"once_cell",
|
"once_cell",
|
||||||
"target-lexicon",
|
"target-lexicon",
|
||||||
@ -283,9 +280,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pyo3-ffi"
|
name = "pyo3-ffi"
|
||||||
version = "0.22.3"
|
version = "0.22.5"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "67ce096073ec5405f5ee2b8b31f03a68e02aa10d5d4f565eca04acc41931fa1c"
|
checksum = "94845622d88ae274d2729fcefc850e63d7a3ddff5e3ce11bd88486db9f1d357d"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"libc",
|
"libc",
|
||||||
"pyo3-build-config",
|
"pyo3-build-config",
|
||||||
@ -293,9 +290,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pyo3-macros"
|
name = "pyo3-macros"
|
||||||
version = "0.22.3"
|
version = "0.22.5"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "2440c6d12bc8f3ae39f1e775266fa5122fd0c8891ce7520fa6048e683ad3de28"
|
checksum = "e655aad15e09b94ffdb3ce3d217acf652e26bbc37697ef012f5e5e348c716e5e"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"pyo3-macros-backend",
|
"pyo3-macros-backend",
|
||||||
@ -305,9 +302,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pyo3-macros-backend"
|
name = "pyo3-macros-backend"
|
||||||
version = "0.22.3"
|
version = "0.22.5"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "1be962f0e06da8f8465729ea2cb71a416d2257dff56cbe40a70d3e62a93ae5d1"
|
checksum = "ae1e3f09eecd94618f60a455a23def79f79eba4dc561a97324bf9ac8c6df30ce"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"heck",
|
"heck",
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
@ -450,9 +447,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wasm-bindgen"
|
name = "wasm-bindgen"
|
||||||
version = "0.2.93"
|
version = "0.2.95"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
|
checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"once_cell",
|
"once_cell",
|
||||||
@ -461,9 +458,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wasm-bindgen-backend"
|
name = "wasm-bindgen-backend"
|
||||||
version = "0.2.93"
|
version = "0.2.95"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
|
checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bumpalo",
|
"bumpalo",
|
||||||
"log",
|
"log",
|
||||||
@ -476,9 +473,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wasm-bindgen-macro"
|
name = "wasm-bindgen-macro"
|
||||||
version = "0.2.93"
|
version = "0.2.95"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
|
checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"quote",
|
"quote",
|
||||||
"wasm-bindgen-macro-support",
|
"wasm-bindgen-macro-support",
|
||||||
@ -486,9 +483,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wasm-bindgen-macro-support"
|
name = "wasm-bindgen-macro-support"
|
||||||
version = "0.2.93"
|
version = "0.2.95"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
|
checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
@ -499,9 +496,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wasm-bindgen-shared"
|
name = "wasm-bindgen-shared"
|
||||||
version = "0.2.93"
|
version = "0.2.95"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
|
checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows-targets"
|
name = "windows-targets"
|
||||||
@ -569,9 +566,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "yrs"
|
name = "yrs"
|
||||||
version = "0.21.1"
|
version = "0.21.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "7a6eac182a01ef4cbf4edb5e71e2c560a34144ae82680aab66a62c172b7ae2a2"
|
checksum = "7744baf8d4f74beba8f47ca3a611c512766c82023f271167b14d21216559b014"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"arc-swap",
|
"arc-swap",
|
||||||
"async-lock",
|
"async-lock",
|
||||||
|
@ -23,14 +23,14 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pycrdt";
|
pname = "pycrdt";
|
||||||
version = "0.9.16";
|
version = "0.10.3";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jupyter-server";
|
owner = "jupyter-server";
|
||||||
repo = "pycrdt";
|
repo = "pycrdt";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-AO5KGBG4I+D5q/VSifzmg0ImAujR1ol9zGU4Y61fImc=";
|
hash = "sha256-Z7u0ix9IjXaq0OKgH3Yvt5cAmAYSCyHT/ZcPLANuVzU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
@ -29,14 +29,14 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pytensor";
|
pname = "pytensor";
|
||||||
version = "2.25.6";
|
version = "2.25.5";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "pymc-devs";
|
owner = "pymc-devs";
|
||||||
repo = "pytensor";
|
repo = "pytensor";
|
||||||
rev = "refs/tags/rel-${version}";
|
rev = "refs/tags/rel-${version}";
|
||||||
hash = "sha256-6emtX0tNqVqKyKXnwxvAwCyM3TRJ2MNClPNg0tVxBU8=";
|
hash = "sha256-tEIDuMAY+rMBqzHLnhbSqOoWzjIbZKCWWMx/uej2pOU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
pythonRelaxDeps = [
|
pythonRelaxDeps = [
|
||||||
|
@ -12,6 +12,7 @@
|
|||||||
let
|
let
|
||||||
pythonVersionNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
|
pythonVersionNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
|
||||||
systemToPlatform = {
|
systemToPlatform = {
|
||||||
|
"aarch64-linux" = "manylinux_2_17_aarch64.manylinux2014_aarch64";
|
||||||
"x86_64-linux" = "manylinux_2_17_x86_64.manylinux2014_x86_64";
|
"x86_64-linux" = "manylinux_2_17_x86_64.manylinux2014_x86_64";
|
||||||
"aarch64-darwin" = "macosx_11_0_arm64";
|
"aarch64-darwin" = "macosx_11_0_arm64";
|
||||||
};
|
};
|
||||||
@ -19,6 +20,9 @@ let
|
|||||||
"310-x86_64-linux" = "sha256-oB68FjYzmRARWpbajQuLpAzWwg9CCji4tLZRFCsztjk=";
|
"310-x86_64-linux" = "sha256-oB68FjYzmRARWpbajQuLpAzWwg9CCji4tLZRFCsztjk=";
|
||||||
"311-x86_64-linux" = "sha256-kGEecBu7b3TFGUIRirI9q2W3nipiQwsh/1OB92RqDB4=";
|
"311-x86_64-linux" = "sha256-kGEecBu7b3TFGUIRirI9q2W3nipiQwsh/1OB92RqDB4=";
|
||||||
"312-x86_64-linux" = "sha256-Vw8sT5kahSN20BQs3MOYesSUZqk4CuvfZR1z5nAO7g8=";
|
"312-x86_64-linux" = "sha256-Vw8sT5kahSN20BQs3MOYesSUZqk4CuvfZR1z5nAO7g8=";
|
||||||
|
"310-aarch64-linux" = "sha256-Ocfg3VArM/14a06cpMuJDYP/MIo9rCvtFO4Cd3AahA4=";
|
||||||
|
"311-aarch64-linux" = "sha256-hegFeV3m0jpjTXNU6ue/3kGe1Cy+Pfeh4GDe96dvL7o=";
|
||||||
|
"312-aarch64-linux" = "sha256-O0VVtSqSEd4dqjmaXMTRvf/Bcc9YR7zzbz9N/8GVcXk=";
|
||||||
"310-aarch64-darwin" = "sha256-2vuVxmJMx/GeaHgzUS6rRdysQFHreVzZ5IT5YSDUJro=";
|
"310-aarch64-darwin" = "sha256-2vuVxmJMx/GeaHgzUS6rRdysQFHreVzZ5IT5YSDUJro=";
|
||||||
"311-aarch64-darwin" = "sha256-0xRVDSDE9upz2yU7mzpa3Y6l6M5FWOMAPKWBC8eY3Eo=";
|
"311-aarch64-darwin" = "sha256-0xRVDSDE9upz2yU7mzpa3Y6l6M5FWOMAPKWBC8eY3Eo=";
|
||||||
"312-aarch64-darwin" = "sha256-i2TmLOl2aHD5iyzF6YpjbHKFmBGPx5ixPYyNKKQfRNM=";
|
"312-aarch64-darwin" = "sha256-i2TmLOl2aHD5iyzF6YpjbHKFmBGPx5ixPYyNKKQfRNM=";
|
||||||
|
@ -29,15 +29,15 @@
|
|||||||
|
|
||||||
buildPythonPackage {
|
buildPythonPackage {
|
||||||
pname = "triton";
|
pname = "triton";
|
||||||
version = "3.0.0";
|
version = "3.1.0";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "triton-lang";
|
owner = "triton-lang";
|
||||||
repo = "triton";
|
repo = "triton";
|
||||||
# latest branch commit from https://github.com/triton-lang/triton/commits/release/3.0.x/
|
# latest branch commit from https://github.com/triton-lang/triton/commits/release/3.1.x/
|
||||||
rev = "91f24d87e50cb748b121a6c24e65a01187699c22";
|
rev = "cf34004b8a67d290a962da166f5aa2fc66751326";
|
||||||
hash = "sha256-L5KqiR+TgSyKjEBlkE0yOU1pemMHFk2PhEmxLdbbxUU=";
|
hash = "sha256-233fpuR7XXOaSKN+slhJbE/CMFzAqCRCE4V4rIoJZrk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches =
|
patches =
|
||||||
@ -265,12 +265,12 @@ buildPythonPackage {
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = {
|
||||||
description = "Language and compiler for writing highly efficient custom Deep-Learning primitives";
|
description = "Language and compiler for writing highly efficient custom Deep-Learning primitives";
|
||||||
homepage = "https://github.com/triton-lang/triton";
|
homepage = "https://github.com/triton-lang/triton";
|
||||||
platforms = platforms.linux;
|
platforms = lib.platforms.linux;
|
||||||
license = licenses.mit;
|
license = lib.licenses.mit;
|
||||||
maintainers = with maintainers; [
|
maintainers = with lib.maintainers; [
|
||||||
SomeoneSerge
|
SomeoneSerge
|
||||||
Madouura
|
Madouura
|
||||||
derdennisop
|
derdennisop
|
||||||
|
@ -6,14 +6,14 @@
|
|||||||
|
|
||||||
python3.pkgs.buildPythonApplication rec {
|
python3.pkgs.buildPythonApplication rec {
|
||||||
pname = "checkov";
|
pname = "checkov";
|
||||||
version = "3.2.266";
|
version = "3.2.267";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "bridgecrewio";
|
owner = "bridgecrewio";
|
||||||
repo = "checkov";
|
repo = "checkov";
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-VvYUzq4dxCfOL9fjj06v+ZzTZQxamKrbeKjQgk5HdCM=";
|
hash = "sha256-9xAWk5RFpm4sD77exdc3kjXyvW0OR/2gv2Ox+lAONoA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./flake8-compat-5.x.patch ];
|
patches = [ ./flake8-compat-5.x.patch ];
|
||||||
|
@ -2,13 +2,13 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "errcheck";
|
pname = "errcheck";
|
||||||
version = "1.7.0";
|
version = "1.8.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "kisielk";
|
owner = "kisielk";
|
||||||
repo = "errcheck";
|
repo = "errcheck";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-hl1EbAO4okfTahl+1WDsFuVgm6Ba98Ji0hxqVe7jGbk=";
|
hash = "sha256-KEDUXZ720fntrQ8XIpbArU8Q1xEiOw32nYcNhXnQO7Q=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-rO2FoFksN3OdKXwlJBuISs6FmCtepc4FDLdOa5AHvC4=";
|
vendorHash = "sha256-rO2FoFksN3OdKXwlJBuISs6FmCtepc4FDLdOa5AHvC4=";
|
||||||
|
@ -2,13 +2,13 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "qc";
|
pname = "qc";
|
||||||
version = "0.6.0";
|
version = "0.6.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "qownnotes";
|
owner = "qownnotes";
|
||||||
repo = "qc";
|
repo = "qc";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-+Mkg8x9f6oqPqPrk6iCHH69+k0jhQGfjtbJwJPLc7Dw=";
|
hash = "sha256-D45uJk1Hb7k2qOLIbRdo0gQlPovUwcQ3rnYqhouhow0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-Cg1Op/4okIi2UTtqWnR0N3iMWzrYEaYxmXzvWIibftg=";
|
vendorHash = "sha256-Cg1Op/4okIi2UTtqWnR0N3iMWzrYEaYxmXzvWIibftg=";
|
||||||
|
@ -17,20 +17,20 @@ let
|
|||||||
in
|
in
|
||||||
python3.pkgs.buildPythonApplication rec {
|
python3.pkgs.buildPythonApplication rec {
|
||||||
pname = "matrix-synapse";
|
pname = "matrix-synapse";
|
||||||
version = "1.116.0";
|
version = "1.117.0";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "element-hq";
|
owner = "element-hq";
|
||||||
repo = "synapse";
|
repo = "synapse";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-TDVqRdp723zq57rb5ZFIX8lqA5D2p9akqNXvoJXSIKg=";
|
hash = "sha256-fBxvEHkLo736Qp973XeXXG84MuZHOZfBHjKbcJpmtJw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||||
inherit src;
|
inherit src;
|
||||||
name = "${pname}-${version}";
|
name = "${pname}-${version}";
|
||||||
hash = "sha256-GSl4B2EVENspJsQ9jVh+gPJaRlCZwaPStjz5ALSzj/U=";
|
hash = "sha256-Wqpt42dubiECMPfijtb8EcsKDTsVKseZ8f6VP7QBpoo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
@ -2,16 +2,16 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "redis_exporter";
|
pname = "redis_exporter";
|
||||||
version = "1.63.0";
|
version = "1.65.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "oliver006";
|
owner = "oliver006";
|
||||||
repo = "redis_exporter";
|
repo = "redis_exporter";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-OqQjKj2WA5AsXm26HAYhbmhDkFU0el8K831i67WMXlI=";
|
sha256 = "sha256-koUvcWd5AWhkxIfMJc0YOHaurO4evf83xn+bBCbyiPY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-wBViyiYj8Duq5KrXi+YFuAUVSAkCZsnhA3fLWRLcKmU=";
|
vendorHash = "sha256-gTxNuqaGpigtRwYIU69woebze0QoLZE+ArROUsQAUwA=";
|
||||||
|
|
||||||
ldflags = [
|
ldflags = [
|
||||||
"-X main.BuildVersion=${version}"
|
"-X main.BuildVersion=${version}"
|
||||||
|
@ -2,11 +2,11 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "basex";
|
pname = "basex";
|
||||||
version = "11.1";
|
version = "11.4";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://files.basex.org/releases/${version}/BaseX${builtins.replaceStrings ["."] [""] version}.zip";
|
url = "http://files.basex.org/releases/${version}/BaseX${builtins.replaceStrings ["."] [""] version}.zip";
|
||||||
hash = "sha256-Wl6kM3xiWYiQpQZ8/qyotfrs/SvjvnQ0AHOeRms/Io0=";
|
hash = "sha256-gArcTVD4OoXWB6r9I8q2EXuwCRmbLFE1sO2yfo3AWCQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ unzip copyDesktopItems ];
|
nativeBuildInputs = [ unzip copyDesktopItems ];
|
||||||
|
@ -11,16 +11,16 @@
|
|||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "yaydl";
|
pname = "yaydl";
|
||||||
version = "0.14.1";
|
version = "0.15.5";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "dertuxmalwieder";
|
owner = "dertuxmalwieder";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "release-${version}";
|
rev = "release-${version}";
|
||||||
sha256 = "sha256-BH+SRr+RYfKsXrzpqggQDJSs+aWJRSi/5tDX5mjpDkk=";
|
sha256 = "sha256-/GoRMdbTaRDZJaVXdsN+YKpWCgecOhqhRf3iaL0rmE8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-q4gwa4KoWiQWKKI3sp00koiH9Ndj23a8F07e72xSF1M=";
|
cargoHash = "sha256-f81z4ssKyGheuI2WWweFBW8AoafsVgPkX1lYCHDSaaM=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkg-config
|
pkg-config
|
||||||
|
@ -13630,6 +13630,10 @@ with pkgs;
|
|||||||
|
|
||||||
vul = callPackage ../applications/misc/vul { };
|
vul = callPackage ../applications/misc/vul { };
|
||||||
|
|
||||||
|
vuls = callPackage ../by-name/vu/vuls/package.nix {
|
||||||
|
buildGoModule = buildGo123Module;
|
||||||
|
};
|
||||||
|
|
||||||
xarchive = callPackage ../tools/archivers/xarchive { };
|
xarchive = callPackage ../tools/archivers/xarchive { };
|
||||||
|
|
||||||
xarchiver = callPackage ../tools/archivers/xarchiver { };
|
xarchiver = callPackage ../tools/archivers/xarchiver { };
|
||||||
@ -31553,15 +31557,6 @@ with pkgs;
|
|||||||
|
|
||||||
ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { };
|
ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { };
|
||||||
|
|
||||||
ncspot = callPackage ../applications/audio/ncspot {
|
|
||||||
inherit (darwin.apple_sdk.frameworks) Cocoa;
|
|
||||||
|
|
||||||
withALSA = stdenv.hostPlatform.isLinux;
|
|
||||||
withPulseAudio = config.pulseaudio or stdenv.hostPlatform.isLinux;
|
|
||||||
withPortAudio = stdenv.hostPlatform.isDarwin;
|
|
||||||
withMPRIS = stdenv.hostPlatform.isLinux;
|
|
||||||
};
|
|
||||||
|
|
||||||
ncview = callPackage ../tools/X11/ncview { } ;
|
ncview = callPackage ../tools/X11/ncview { } ;
|
||||||
|
|
||||||
ne = callPackage ../applications/editors/ne { };
|
ne = callPackage ../applications/editors/ne { };
|
||||||
|
Loading…
Reference in New Issue
Block a user