Merge master into staging-next

This commit is contained in:
github-actions[bot] 2024-09-06 06:04:31 +00:00 committed by GitHub
commit 6802206bcc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
35 changed files with 2098 additions and 304 deletions

View File

@ -20672,6 +20672,13 @@
githubId = 3512122;
keys = [ { fingerprint = "5F29 132D EFA8 5DA0 B598 5BF2 5941 754C 1CDE 33BB"; } ];
};
TheColorman = {
name = "colorman";
email = "nixpkgs@colorman.me";
github = "TheColorman";
githubId = 18369995;
keys = [ { fingerprint = "3D8C A43C FBA2 5D28 0196 19F0 AB11 0475 B417 291D"; } ];
};
thedavidmeister = {
email = "thedavidmeister@gmail.com";
github = "thedavidmeister";

View File

@ -73,8 +73,14 @@ in {
resolver.public-suffix = lib.mkDefault [
"file://${pkgs.publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"
];
config.resource = {
config.resource = let
hasHttpListener = builtins.any (listener: listener.protocol == "http") (lib.attrValues cfg.settings.server.listener);
in {
spam-filter = lib.mkDefault "file://${cfg.package}/etc/stalwart/spamfilter.toml";
} // lib.optionalAttrs (
(builtins.hasAttr "listener" cfg.settings.server) && hasHttpListener
) {
webadmin = lib.mkDefault "file://${cfg.package.webadmin}/webadmin.zip";
};
};

View File

@ -13,7 +13,7 @@ in
};
config = lib.mkIf cfg.enable {
meta.maintainers = with lib.maintainers; [ tomfitzhenry ];
meta.maintainers = [];
assertions = [
{
assertion = cfg.enable -> config.boot.initrd.systemd.enable;

View File

@ -2,8 +2,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: let
passphrase = "secret";
in {
name = "systemd-initrd-luks-unl0kr";
meta = with pkgs.lib.maintainers; {
maintainers = [ tomfitzhenry ];
meta = {
maintainers = [];
};
enableOCR = true;

View File

@ -1,45 +0,0 @@
{ lib, stdenv, fetchFromGitHub, addDriverRunpath, cudatoolkit }:
stdenv.mkDerivation {
pname = "gpu-burn";
version = "unstable-2023-11-10";
src = fetchFromGitHub {
owner = "wilicc";
repo = "gpu-burn";
rev = "b99aedce3e020d2ca419832ee27b7f29dfa6373e";
sha256 = "sha256-cLO0GXvujZ+g64j+OY31n43MsVER3ljo8Qrt+EzSKjc=";
};
postPatch = ''
substituteInPlace gpu_burn-drv.cpp \
--replace "#define COMPARE_KERNEL \"compare.ptx\"" \
"#define COMPARE_KERNEL \"$out/share/compare.ptx\""
'';
buildInputs = [ cudatoolkit ];
nativeBuildInputs = [ addDriverRunpath ];
makeFlags = [ "CUDAPATH=${cudatoolkit}" ];
LDFLAGS = "-L${cudatoolkit}/lib/stubs";
installPhase = ''
mkdir -p $out/{bin,share}
cp gpu_burn $out/bin/
cp compare.ptx $out/share/
'';
postFixup = ''
addDriverRunpath $out/bin/gpu_burn
'';
meta = with lib; {
homepage = "http://wili.cc/blog/gpu-burn.html";
description = "Multi-GPU CUDA stress test";
platforms = platforms.linux;
license = licenses.bsd2;
mainProgram = "gpu_burn";
};
}

View File

@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
offlineCache = fetchYarnDeps {
yarnLock = "${finalAttrs.src}/backstage/yarn.lock";
hash = "sha256-Z/Pkk/qCWwr99g11DjEgnisPfxOhfD8+OCn6otxJtfI=";
hash = "sha256-7Br2FBhLZf7Cuul5n55EHfqyW8GbujB+yZ/RK6f7I4M=";
};
nativeBuildInputs = [

View File

@ -6,13 +6,13 @@
}:
let
version = "0.13.16";
version = "0.14.1";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "Klasse-Methode";
repo = "eintopf";
rev = "v${version}";
hash = "sha256-ex5bpO60ousJcgZGdviqWrCyihycW+JT+EYFvdooUDw=";
hash = "sha256-+QEAUyAqFLcc3bhGI3v4FxhDt+3P6vBnxWsFPp56lfg=";
};
frontend = callPackage ./frontend.nix { inherit src version; };
in
@ -21,7 +21,7 @@ buildGoModule rec {
pname = "eintopf";
inherit version src;
vendorHash = "sha256-dBxI6cUGc16lg89x8b+hSLcv5y/MLf6vDIvqdMBUz3I=";
vendorHash = "sha256-ODVCZWxkPWW8ZlONiVXwVQalsLIUl9x512JimLAUm6U=";
ldflags = [
"-s"
@ -47,9 +47,7 @@ buildGoModule rec {
meta = with lib; {
description = "A calendar for Stuttgart, showing events, groups and places";
homepage = "https://codeberg.org/Klasse-Methode/eintopf";
# License is going to change back to AGPL in the next release
# https://codeberg.org/Klasse-Methode/eintopf/issues/351#issuecomment-2076870
license = licenses.gpl3Plus;
license = licenses.agpl3Only;
maintainers = with maintainers; [ onny ];
platforms = platforms.unix;
};

View File

@ -46,14 +46,14 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "gamescope";
version = "3.15.2";
version = "3.15.5";
src = fetchFromGitHub {
owner = "ValveSoftware";
repo = "gamescope";
rev = "refs/tags/${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-g6H68dYMmpQYlwhZ6b84yY/qbAP18iNrmYOWf9rL5gc=";
hash = "sha256-H6o0UdJ+wpfy0YY6LDzncWWzUGAMwQC7sHPu5TxHC8I=";
};
patches = [

View File

@ -318,7 +318,7 @@ buildDotnetModule rec {
description = "Self-hosted runner for GitHub Actions";
homepage = "https://github.com/actions/runner";
license = licenses.mit;
maintainers = with maintainers; [ veehaitch newam kfollesdal aanderse zimbatm ];
maintainers = with maintainers; [ veehaitch kfollesdal aanderse zimbatm ];
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
};

View File

@ -0,0 +1,81 @@
{
autoAddDriverRunpath,
config,
cudaPackages,
fetchFromGitHub,
lib,
}:
let
inherit (lib.attrsets) getBin;
inherit (lib.lists) last map optionals;
inherit (lib.trivial) boolToString;
inherit (config) cudaSupport;
inherit (cudaPackages)
backendStdenv
cuda_cccl
cuda_cudart
cuda_nvcc
libcublas
;
inherit (cudaPackages.cudaFlags) cudaCapabilities dropDot isJetsonBuild;
in
backendStdenv.mkDerivation {
pname = "gpu-burn";
version = "unstable-2024-04-09";
strictDeps = true;
src = fetchFromGitHub {
owner = "wilicc";
repo = "gpu-burn";
rev = "9aefd7c0cc603bbc8c3c102f5338c6af26f8127c";
hash = "sha256-Nz0yaoHGfodaYl2HJ7p+1nasqRmxwPJ9aL9oxitXDpM=";
};
postPatch = ''
substituteInPlace gpu_burn-drv.cpp \
--replace-fail \
'#define COMPARE_KERNEL "compare.ptx"' \
"#define COMPARE_KERNEL \"$out/share/compare.ptx\""
'';
nativeBuildInputs = [
autoAddDriverRunpath
cuda_nvcc
];
buildInputs = [
cuda_cccl # <nv/target>
cuda_cudart # driver_types.h
cuda_nvcc # crt/host_defines.h
libcublas # cublas_v2.h
];
makeFlags = [
"CUDAPATH=${getBin cuda_nvcc}"
"COMPUTE=${last (map dropDot cudaCapabilities)}"
"IS_JETSON=${boolToString isJetsonBuild}"
];
installPhase = ''
runHook preInstall
mkdir -p $out/{bin,share}
install -Dm755 gpu_burn $out/bin/
install -Dm644 compare.ptx $out/share/
runHook postInstall
'';
# NOTE: Certain packages may be missing from cudaPackages on non-Linux platforms. To avoid evaluation failure,
# we only include the platforms where we know the package is available -- thus the conditionals setting the
# platforms and badPlatforms fields.
meta = {
badPlatforms = optionals (!cudaSupport) lib.platforms.all;
broken = !cudaSupport;
description = "Multi-GPU CUDA stress test";
homepage = "http://wili.cc/blog/gpu-burn.html";
license = lib.licenses.bsd2;
mainProgram = "gpu_burn";
maintainers = with lib.maintainers; [ connorbaker ];
platforms = optionals cudaSupport lib.platforms.linux;
};
}

1431
pkgs/by-name/hd/hdr10plus_tool/Cargo.lock generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,46 @@
{
lib,
fetchFromGitHub,
rustPlatform,
pkg-config,
fontconfig,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
pname = "hdr10plus_tool";
version = "1.6.0";
src = fetchFromGitHub {
owner = "quietvoid";
repo = "hdr10plus_tool";
rev = "refs/tags/${version}";
hash = "sha256-EyKCdrilb6Ha9avEe5L4Snbufq8pEiTvr8tcdj0M6Zs=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"plotters-0.3.5" = "sha256-cz8/chdq8C/h1q5yFcQp0Rzg89XHnQhIN1Va52p6Z2Y=";
};
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ fontconfig ];
passthru = {
updateScript = nix-update-script { };
};
doCheck = false;
meta = with lib; {
description = "CLI utility to work with HDR10+ in HEVC files.";
homepage = "https://github.com/quietvoid/hdr10plus_tool";
changelog = "https://github.com/quietvoid/hdr10plus_tool/releases";
license = licenses.mit;
maintainers = with maintainers; [ johnrtitor ];
mainProgram = "hdr10plus_tool";
};
}

View File

@ -0,0 +1,33 @@
{
lib,
fetchFromGitHub,
rustPlatform,
}:
rustPlatform.buildRustPackage rec {
pname = "heliocron";
version = "0.8.1";
src = fetchFromGitHub {
owner = "mfreeborn";
repo = "heliocron";
rev = "v${version}";
hash = "sha256-5rzFz29Bpy2GR6bEt2DdCq9RtpdcY3SK/KnZrBrHUvk=";
};
cargoHash = "sha256-RjYE2TBvHnBgiwJi/Ys+wAmJoMHJuimcD07FOqwkcis=";
meta = {
description = "Execute tasks relative to sunset, sunrise and other solar events";
longDescription = "A simple command line application that integrates with `cron` to execute tasks relative to sunset, sunrise and other such solar events.";
homepage = "https://github.com/mfreeborn/heliocron";
changelog = "https://github.com/mfreeborn/heliocron/releases/tag/v${version}";
license = with lib.licenses; [
mit
asl20
];
maintainers = with lib.maintainers; [ TheColorman ];
mainProgram = "heliocron";
platforms = lib.platforms.linux;
};
}

View File

@ -1,23 +1,25 @@
{ resholve, lib, coreutils, direnv, nix, fetchFromGitHub }:
{
resholve,
lib,
coreutils,
nix,
fetchFromGitHub,
writeText,
}:
# resholve does not yet support `finalAttrs` call pattern hence `rec`
# https://github.com/abathur/resholve/issues/107
resholve.mkDerivation rec {
pname = "nix-direnv";
version = "3.0.5";
version = "3.0.6";
src = fetchFromGitHub {
owner = "nix-community";
repo = "nix-direnv";
rev = version;
hash = "sha256-imUlc5v/Ow7dgjCjTyEeet+4lNHLeEwfqGQcB4dKcao=";
hash = "sha256-oNqhPqgQT92yxbKmcgX4F3e2yTUPyXYG7b2xQm3TvQw=";
};
# skip min version checks which are redundant when built with nix
postPatch = ''
sed -i 1iNIX_DIRENV_SKIP_VERSION_CHECK=1 direnvrc
'';
installPhase = ''
runHook preInstall
install -m400 -D direnvrc $out/share/nix-direnv/direnvrc
@ -28,7 +30,7 @@ resholve.mkDerivation rec {
default = {
scripts = [ "share/nix-direnv/direnvrc" ];
interpreter = "none";
inputs = [ coreutils nix ];
inputs = [ coreutils ];
fake = {
builtin = [
"PATH_add"
@ -43,23 +45,36 @@ resholve.mkDerivation rec {
# cannot be reached when built with nix
"shasum"
];
external = [
# We want to reference the ambient Nix when possible, and have custom logic
# for the fallback
"nix"
];
};
keep = {
"$cmd" = true;
"$direnv" = true;
# Nix fallback implementation
"$_nix_direnv_nix" = true;
"$ambient_nix" = true;
"$NIX_DIRENV_FALLBACK_NIX" = true;
};
execer = [
"cannot:${direnv}/bin/direnv"
"cannot:${nix}/bin/nix"
];
prologue =
(writeText "prologue.sh" ''
NIX_DIRENV_FALLBACK_NIX=''${NIX_DIRENV_FALLBACK_NIX:-${lib.getExe nix}}
'').outPath;
};
};
meta = {
description = "Fast, persistent use_nix implementation for direnv";
homepage = "https://github.com/nix-community/nix-direnv";
license = lib.licenses.mit;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ mic92 bbenne10 ];
homepage = "https://github.com/nix-community/nix-direnv";
license = lib.licenses.mit;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [
mic92
bbenne10
];
};
}

View File

@ -148,5 +148,6 @@ python3Packages.buildPythonApplication rec {
homepage = "http://www.davisr.me/projects/rcu/";
license = licenses.agpl3Plus;
maintainers = with maintainers; [ OPNA2608 ];
hydraPlatforms = [ ]; # requireFile used as src
};
}

View File

@ -0,0 +1,63 @@
{
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
wrapGAppsHook4,
cairo,
gdk-pixbuf,
glib,
gtk4,
pango,
polkit,
}:
let
version = "0.1.0";
in
rustPlatform.buildRustPackage {
pname = "soteria";
inherit version;
src = fetchFromGitHub {
owner = "imvaskel";
repo = "soteria";
rev = "refs/tags/v${version}";
hash = "sha256-lhS+37DqSgZrgrYgKGUpKMC22Qjdq9LPNS5k/dqvkRY=";
};
cargoHash = "sha256-NMSGSqdCu/kW6vv8+C7UC6oitZqlTklO1sRKDcc1T9o=";
nativeBuildInputs = [
pkg-config
wrapGAppsHook4
];
buildInputs = [
cairo
gdk-pixbuf
glib
gtk4
pango
];
# From upstream packaging:
# Takes advantage of nixpkgs manually editing PACKAGE_PREFIX by grabbing it from
# the binary itself.
# https://github.com/NixOS/nixpkgs/blob/9b5328b7f761a7bbdc0e332ac4cf076a3eedb89b/pkgs/development/libraries/polkit/default.nix#L142
# https://github.com/polkit-org/polkit/blob/d89c3604e2a86f4904566896c89e1e6b037a6f50/src/polkitagent/polkitagentsession.c#L599
preBuild = ''
export POLKIT_AGENT_HELPER_PATH="$(strings ${polkit.out}/lib/libpolkit-agent-1.so | grep "polkit-agent-helper-1")"
'';
meta = {
description = "Polkit authentication agent written in GTK designed to be used with any desktop environment";
homepage = "https://github.com/ImVaskel/soteria";
license = lib.licenses.asl20;
mainProgram = "soteria";
maintainers = with lib.maintainers; [
NotAShelf
lychee
];
inherit (polkit.meta) platforms;
};
}

View File

@ -15,6 +15,7 @@
nix-update-script,
nixosTests,
rocksdb_8_11,
callPackage,
}:
let
@ -144,6 +145,7 @@ rustPlatform.buildRustPackage {
doCheck = !(stdenv.isLinux && stdenv.isAarch64);
passthru = {
webadmin = callPackage ./webadmin.nix { };
update-script = nix-update-script { };
tests.stalwart-mail = nixosTests.stalwart-mail;
};

View File

@ -0,0 +1,70 @@
{
lib,
rustPlatform,
fetchFromGitHub,
trunk-ng,
tailwindcss,
fetchNpmDeps,
nodejs,
npmHooks,
llvmPackages,
wasm-bindgen-cli,
binaryen,
zip,
}:
rustPlatform.buildRustPackage rec {
pname = "webadmin";
version = "0.1.13";
src = fetchFromGitHub {
owner = "stalwartlabs";
repo = "webadmin";
rev = "refs/tags/v${version}";
hash = "sha256-QtQAcbyTSAj56QZky7eyNS15pnetLVN1Z4cN5pxlJFc=";
};
npmDeps = fetchNpmDeps {
inherit src;
name = "${pname}-npm-deps";
hash = "sha256-na1HEueX8w7kuDp8LEtJ0nD1Yv39cyk6sEMpS1zix2s=";
};
cargoHash = "sha256-CWDwVVea+cdsoIbQdQ3HDiVwYuMSplWZSUXTweibu9s=";
postPatch = ''
# Using local tailwindcss for compilation
substituteInPlace Trunk.toml --replace-fail "npx tailwindcss" "tailwindcss"
'';
nativeBuildInputs = [
binaryen
llvmPackages.bintools-unwrapped
nodejs
npmHooks.npmConfigHook
tailwindcss
trunk-ng
wasm-bindgen-cli
zip
];
NODE_PATH = "$npmDeps";
buildPhase = ''
trunk-ng build --offline --verbose --release
'';
installPhase = ''
cd dist
mkdir -p $out
zip -r $out/webadmin.zip *
'';
meta = with lib; {
description = "Secure & modern all-in-one mail server Stalwart (webadmin module)";
homepage = "https://github.com/stalwartlabs/webadmin";
changelog = "https://github.com/stalwartlabs/mail-server/blob/${version}/CHANGELOG";
license = licenses.agpl3Only;
maintainers = with maintainers; [ onny ];
};
}

View File

@ -0,0 +1,148 @@
diff --git a/Cargo.lock b/Cargo.lock
index 55f480a8..a69f9ed9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1839,6 +1839,22 @@ dependencies = [
"tower-service",
]
+[[package]]
+name = "hyper-tls"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
+dependencies = [
+ "bytes",
+ "http-body-util",
+ "hyper",
+ "hyper-util",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+]
+
[[package]]
name = "hyper-util"
version = "0.1.3"
@@ -2302,6 +2318,23 @@ dependencies = [
"windows-sys 0.52.0",
]
+[[package]]
+name = "native-tls"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
+dependencies = [
+ "libc",
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework",
+ "security-framework-sys",
+ "tempfile",
+]
+
[[package]]
name = "ndk"
version = "0.7.0"
@@ -2511,6 +2544,12 @@ dependencies = [
"syn 2.0.50",
]
+[[package]]
+name = "openssl-probe"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+
[[package]]
name = "openssl-src"
version = "300.2.3+3.2.1"
@@ -3416,6 +3455,15 @@ dependencies = [
"winapi-util",
]
+[[package]]
+name = "schannel"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
[[package]]
name = "schemars"
version = "0.8.19"
@@ -3460,6 +3508,29 @@ version = "4.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
+[[package]]
+name = "security-framework"
+version = "2.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
[[package]]
name = "selectors"
version = "0.22.0"
@@ -3847,6 +3918,7 @@ name = "surrealist"
version = "0.0.0"
dependencies = [
"dirs",
+ "hyper-tls",
"log",
"openssl",
"portpicker",
@@ -4563,6 +4635,16 @@ dependencies = [
"windows-sys 0.48.0",
]
+[[package]]
+name = "tokio-native-tls"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
+dependencies = [
+ "native-tls",
+ "tokio",
+]
+
[[package]]
name = "tokio-rustls"
version = "0.25.0"
diff --git a/Cargo.toml b/Cargo.toml
index 3e3ab7ee..b6612f95 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -28,6 +28,8 @@ time = { version = "0.3", default-features = false}
log = "^0.4"
url = "2"
+hyper-tls = "0.6.0"
+
[target.'cfg(target_os = "linux")'.dependencies]
openssl = { version = "0.10.64", features = ["vendored"] }

View File

@ -5,9 +5,10 @@
, esbuild
, fetchFromGitHub
, gdk-pixbuf
, glib-networking
, gobject-introspection
, lib
, libsoup
, libsoup_3
, makeBinaryWrapper
, nodejs
, openssl
@ -18,12 +19,30 @@
, rustPlatform
, stdenv
, stdenvNoCC
, webkitgtk
, webkitgtk_4_1
}:
let
esbuild-20-2 = let version = "0.20.2";
cargo-tauri_2 = let
version = "2.0.0-rc.3";
src = fetchFromGitHub {
owner = "tauri-apps";
repo = "tauri";
rev = "tauri-v${version}";
hash = "sha256-PV8m/MzYgbY4Hv71dZrqVbrxmxrwFfOAraLJIaQk6FQ=";
};
in cargo-tauri.overrideAttrs (drv: {
inherit src version;
cargoDeps = drv.cargoDeps.overrideAttrs (lib.const {
inherit src;
name = "tauri-${version}-vendor.tar.gz";
outputHash = "sha256-BrIH0JkGMp68O+4B+0g7X3lSdNSPXo+otlBgslCzPZE=";
});
});
esbuild_21-5 = let
version = "0.21.5";
in esbuild.override {
buildGoModule = args:
buildGoModule (args // {
@ -32,7 +51,7 @@ let
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
hash = "sha256-h/Vqwax4B4nehRP9TaYbdixAZdb1hx373dNxNHvDrtY=";
hash = "sha256-FpvXWIlt67G8w3pBKZo/mcp57LunxDmRUaCU/Ne89B8=";
};
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
});
@ -40,34 +59,44 @@ let
in stdenv.mkDerivation (finalAttrs: {
pname = "surrealist";
version = "2.0.6";
version = "2.1.6";
src = fetchFromGitHub {
owner = "surrealdb";
repo = "surrealist";
rev = "surrealist-v${finalAttrs.version}";
hash = "sha256-5OiVqn+ujssxXZXC6pnGiG1Nw8cAhoDU5IIl9skywBw=";
hash = "sha256-jOjOdrVOcGPenFW5mkkXKA64C6c+/f9KzlvtUmw6vXc=";
};
sourceRoot = "${finalAttrs.src.name}/src-tauri";
# HACK: A dependency (surrealist -> tauri -> **reqwest**) contains hyper-tls
# as an actually optional dependency. It ends up in the `Cargo.lock` file of
# tauri, but not in the one of surrealist. We apply a patch to `Cargo.toml`
# and `Cargo.lock` to ensure that we have it in our vendor archive. This may
# be a result of the following bug:
# https://github.com/rust-lang/cargo/issues/10801
patches = [
./0001-Cargo.patch
];
ui = stdenvNoCC.mkDerivation {
inherit (finalAttrs) src version;
pname = "${finalAttrs.pname}-ui";
pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-apvU7nanzueaF7PEQL7EKjVT5z1M6I7PZpEIJxfKuCQ=";
hash = "sha256-zGs1MWJ8TEFuHOoekCNIKQo2PBnp95xLz+R8mzeJXh8=";
};
ESBUILD_BINARY_PATH = "${lib.getExe esbuild-20-2}";
ESBUILD_BINARY_PATH = lib.getExe esbuild_21-5;
nativeBuildInputs = [ nodejs pnpm.configHook ];
buildPhase = ''
runHook preBuild
pnpm build
pnpm build:desktop
runHook postBuild
'';
@ -82,22 +111,29 @@ in stdenv.mkDerivation (finalAttrs: {
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit (finalAttrs) src sourceRoot version;
inherit (finalAttrs) patches src sourceRoot version;
name = "${finalAttrs.pname}-${finalAttrs.version}";
hash = "sha256-uE4r0smgSbl4l77/MsHtn1Ar5fqspsYcLC/u8TUrcu8=";
hash = "sha256-LtQS0kH+2P4odV7BJYiH6T51+iZHAM9W9mV96rNfNWs=";
};
nativeBuildInputs = [
cargo
cargo-tauri
cargo-tauri_2
gobject-introspection
makeBinaryWrapper
pkg-config
rustc
rustPlatform.cargoSetupHook
];
buildInputs =
[ cairo gdk-pixbuf gobject-introspection libsoup openssl pango webkitgtk ];
buildInputs = [
cairo
gdk-pixbuf
libsoup_3
openssl
pango
webkitgtk_4_1
];
env = {
OPENSSL_NO_VENDOR = 1;
@ -105,8 +141,8 @@ in stdenv.mkDerivation (finalAttrs: {
postPatch = ''
substituteInPlace ./tauri.conf.json \
--replace-fail '"distDir": "../dist",' '"distDir": "${finalAttrs.ui}",' \
--replace-fail '"beforeBuildCommand": "pnpm build",' '"beforeBuildCommand": "",'
--replace-fail '"frontendDist": "../dist",' '"frontendDist": "${finalAttrs.ui}",' \
--replace-fail '"beforeBuildCommand": "pnpm build:desktop",' '"beforeBuildCommand": "",'
'';
postBuild = ''
@ -114,12 +150,14 @@ in stdenv.mkDerivation (finalAttrs: {
'';
postInstall = ''
install -Dm555 target/release/bundle/deb/surrealist_${finalAttrs.version}_*/data/usr/bin/surrealist -t $out/bin
cp -r target/release/bundle/deb/surrealist_${finalAttrs.version}_*/data/usr/share $out
install -Dm555 target/release/bundle/deb/Surrealist_${finalAttrs.version}_*/data/usr/bin/surrealist -t $out/bin
cp -r target/release/bundle/deb/Surrealist_${finalAttrs.version}_*/data/usr/share $out
'';
postFixup = ''
wrapProgram "$out/bin/surrealist" --set WEBKIT_DISABLE_COMPOSITING_MODE 1
wrapProgram "$out/bin/surrealist" \
--set GIO_EXTRA_MODULES ${glib-networking}/lib/gio/modules \
--set WEBKIT_DISABLE_COMPOSITING_MODE 1
'';
meta = with lib; {

View File

@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Build vector tilesets from large collections of GeoJSON features";
homepage = "https://github.com/felt/tippecanoe";
license = licenses.bsd2;
maintainers = with maintainers; [ sikmir ];
maintainers = teams.geospatial.members;
platforms = platforms.unix;
mainProgram = "tippecanoe";
};

View File

@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
mainProgram = "unl0kr";
homepage = "https://gitlab.com/cherrypicker/unl0kr";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ tomfitzhenry ];
maintainers = [];
platforms = platforms.linux;
};
})

View File

@ -0,0 +1,49 @@
{
lib,
rustPlatform,
fetchCrate,
nix-update-script,
nodejs_latest,
pkg-config,
openssl,
stdenv,
curl,
darwin,
version ? "0.2.93",
hash ? "sha256-DDdu5mM3gneraM85pAepBXWn3TMofarVR4NbjMdz3r0=",
cargoHash ? "sha256-birrg+XABBHHKJxfTKAMSlmTVYLmnmqMDfRnmG6g/YQ=",
}:
rustPlatform.buildRustPackage rec {
pname = "wasm-bindgen-cli";
inherit version hash cargoHash;
src = fetchCrate { inherit pname version hash; };
nativeBuildInputs = [ pkg-config ];
buildInputs =
[ openssl ]
++ lib.optionals stdenv.isDarwin [
curl
darwin.apple_sdk.frameworks.Security
];
nativeCheckInputs = [ nodejs_latest ];
# tests require it to be ran in the wasm-bindgen monorepo
doCheck = false;
passthru.updateScript = nix-update-script { };
meta = {
homepage = "https://rustwasm.github.io/docs/wasm-bindgen/";
license = with lib.licenses; [
asl20 # or
mit
];
description = "Facilitating high-level interactions between wasm modules and JavaScript";
maintainers = with lib.maintainers; [ rizary ];
mainProgram = "wasm-bindgen";
};
}

View File

@ -47,11 +47,11 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "go";
version = "1.23.0";
version = "1.23.1";
src = fetchurl {
url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
hash = "sha256-Qreo6A2AXaoDAi7T/eQyHUw78smQoUQWXQHu7Nb2mcY=";
hash = "sha256-buROKYN50Ual5aprHFtdX10KM2XqvdcHQebiE0DsOw0=";
};
strictDeps = true;

View File

@ -5,17 +5,17 @@
, boost
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "quantlib";
version = "1.34";
version = "1.35";
outputs = [ "out" "dev" ];
src = fetchFromGitHub {
owner = "lballabio";
repo = "QuantLib";
rev = "v${version}";
sha256 = "sha256-qrMaIBiDg7bFtWTDAQgAMtekb/7VrI7Ix+G59mU4WHI=";
rev = "v${finalAttrs.version}";
hash = "sha256-L0cdfrVZTwyRcDnYhbmRbH53+mBt6AnrKm+in++du2M=";
};
nativeBuildInputs = [ cmake ];
@ -36,4 +36,4 @@ stdenv.mkDerivation rec {
license = licenses.bsd3;
maintainers = [ maintainers.kupac ];
};
}
})

View File

@ -79,6 +79,9 @@ stdenv.mkDerivation rec {
"-DEXPORT_C_API=OFF"
] ++ lib.optionals stdenv.hostPlatform.isPower [
"-DENABLE_ALTIVEC=OFF" # https://bitbucket.org/multicoreware/x265_git/issues/320/fail-to-build-on-power8-le
] ++ lib.optionals isCross [
(mkFlag stdenv.hostPlatform.isAarch32 "CROSS_COMPILE_ARM")
(mkFlag stdenv.hostPlatform.isAarch64 "CROSS_COMPILE_ARM64")
];
preConfigure = lib.optionalString multibitdepthSupport ''
@ -99,11 +102,6 @@ stdenv.mkDerivation rec {
${mkFlag cliSupport "ENABLE_CLI"}
${mkFlag unittestsSupport "ENABLE_TESTS"}
)
'' + lib.optionalString isCross ''
cmakeFlagsArray+=(
${mkFlag (stdenv.hostPlatform.isAarch32) "CROSS_COMPILE_ARM"}
${mkFlag (stdenv.hostPlatform.isAarch64) "CROSS_COMPILE_ARM64"}
)
'';
# Builds 10bits and 12bits static libs on the side if multi bit-depth is wanted

View File

@ -1,5 +1,6 @@
{
lib,
black,
buildPythonPackage,
fetchPypi,
hypothesis,
@ -7,59 +8,45 @@
libcst,
parso,
pytestCheckHook,
pytest-cov-stub,
pytest-xdist,
pythonOlder,
setuptools,
}:
buildPythonPackage rec {
pname = "hypothesmith";
version = "0.3.3";
format = "setuptools";
pyproject = true;
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.9";
src = fetchPypi {
inherit pname version;
hash = "sha256-lsFIAtbI6F2JdSZBdoeNtUso0u2SH9v+3C5rjOPIFxY=";
};
patches = [ ./remove-black.patch ];
build-system = [ setuptools ];
postPatch = ''
substituteInPlace setup.py \
--replace "lark-parser" "lark"
substituteInPlace tox.ini \
--replace "--cov=hypothesmith" "" \
--replace "--cov-branch" "" \
--replace "--cov-report=term-missing:skip-covered" "" \
--replace "--cov-fail-under=100" ""
'';
propagatedBuildInputs = [
dependencies = [
hypothesis
lark
libcst
];
nativeCheckInputs = [
black
parso
pytestCheckHook
pytest-cov-stub
pytest-xdist
];
pytestFlagsArray = [ "-v" ];
disabledTests = [
# https://github.com/Zac-HD/hypothesmith/issues/21
# super slow
"test_source_code_from_libcst_node_type"
];
disabledTestPaths = [
# missing blib2to3
"tests/test_syntactic.py"
];
pythonImportsCheck = [ "hypothesmith" ];
meta = with lib; {

View File

@ -1,87 +0,0 @@
diff --git a/tests/test_cst.py b/tests/test_cst.py
index 8532240..bdba2d7 100644
--- a/tests/test_cst.py
+++ b/tests/test_cst.py
@@ -3,7 +3,6 @@ import ast
from inspect import isabstract
from operator import attrgetter
-import black
import libcst
import parso
import pytest
@@ -51,27 +50,6 @@ def test_ast_unparse_from_nodes(source_code):
assert ast.dump(first) == ast.dump(second)
-@pytest.mark.xfail
-@example("A\u2592", black.Mode())
-@given(
- source_code=hypothesmith.from_node(),
- mode=st.builds(
- black.Mode,
- line_length=st.just(88) | st.integers(0, 200),
- string_normalization=st.booleans(),
- is_pyi=st.booleans(),
- ),
-)
-def test_black_autoformatter_from_nodes(source_code, mode):
- try:
- result = black.format_file_contents(source_code, fast=False, mode=mode)
- except black.NothingChanged:
- pass
- else:
- with pytest.raises(black.NothingChanged):
- black.format_file_contents(result, fast=False, mode=mode)
-
-
@given(source_code=hypothesmith.from_node())
def test_from_node_always_compilable(source_code):
compile(source_code, "<string>", "exec")
diff --git a/tests/test_syntactic.py b/tests/test_syntactic.py
index 7fe9835..17c4f7c 100644
--- a/tests/test_syntactic.py
+++ b/tests/test_syntactic.py
@@ -3,7 +3,6 @@ import ast
import io
import tokenize
-import black
import blib2to3
import parso
import pytest
@@ -58,34 +57,6 @@ def test_ast_unparse_from_grammar(source_code):
assert ast.dump(first) == ast.dump(second)
-@example("\\", black.Mode())
-@example("A#\r#", black.Mode())
-@given(
- source_code=hypothesmith.from_grammar(),
- mode=st.builds(
- black.Mode,
- line_length=st.just(88) | st.integers(0, 200),
- string_normalization=st.booleans(),
- is_pyi=st.booleans(),
- ),
-)
-def test_black_autoformatter_from_grammar(source_code, mode):
- try:
- result = black.format_file_contents(source_code, fast=False, mode=mode)
- except black.NothingChanged:
- pass
- except blib2to3.pgen2.tokenize.TokenError:
- # Fails to tokenise e.g. "\\", though compile("\\", "<string>", "exec") works.
- # See https://github.com/psf/black/issues/1012
- reject()
- except black.InvalidInput:
- # e.g. "A#\r#", see https://github.com/psf/black/issues/970
- reject()
- else:
- with pytest.raises(black.NothingChanged):
- black.format_file_contents(result, fast=False, mode=mode)
-
-
@given(source_code=hypothesmith.from_grammar("eval_input"))
def test_eval_input_generation(source_code):
compile(source_code, filename="<string>", mode="eval")

View File

@ -3,8 +3,10 @@
stdenv,
buildPythonPackage,
fetchFromGitHub,
callPackage,
cargo,
hypothesis,
hypothesmith,
libcst,
libiconv,
pytestCheckHook,
python,
@ -16,14 +18,15 @@
setuptools-scm,
typing-extensions,
typing-inspect,
ufmt,
}:
buildPythonPackage rec {
pname = "libcst";
version = "1.4.0";
format = "pyproject";
pyproject = true;
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "instagram";
@ -41,15 +44,12 @@ buildPythonPackage rec {
cargoRoot = "native";
postPatch = ''
# avoid infinite recursion by not formatting the release files
substituteInPlace libcst/codegen/generate.py \
--replace '"ufmt"' '"true"'
'';
nativeBuildInputs = [
build-system = [
setuptools-rust
setuptools-scm
];
nativeBuildInputs = [
rustPlatform.cargoSetupHook
cargo
rustc
@ -57,44 +57,48 @@ buildPythonPackage rec {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
propagatedBuildInputs = [
dependencies = [
typing-extensions
typing-inspect
pyyaml
];
nativeCheckInputs = [
hypothesis
hypothesmith
pytestCheckHook
ufmt
];
preCheck = ''
# otherwise import libcst.native fails
cp build/lib.*/libcst/native.* libcst/
${python.interpreter} -m libcst.codegen.generate visitors
${python.interpreter} -m libcst.codegen.generate return_types
# Can't run all tests due to circular dependency on hypothesmith -> libcst
rm -r {libcst/tests,libcst/codegen/tests,libcst/m*/tests}
# import from $out instead
rm libcst/__init__.py
'';
disabledTests = [
# No files are generated
"test_codemod_formatter_error_input"
# FIXME package pyre-test
"TypeInferenceProviderTest"
# we'd need to run `python -m libcst.codegen.generate all` but shouldn't modify $out
"test_codegen_clean_visitor_functions"
];
# circular dependency on hypothesmith and ufmt
doCheck = false;
passthru.tests = {
pytest = libcst.overridePythonAttrs { doCheck = true; };
};
pythonImportsCheck = [ "libcst" ];
meta = with lib; {
meta = {
description = "Concrete Syntax Tree (CST) parser and serializer library for Python";
homepage = "https://github.com/Instagram/libcst";
changelog = "https://github.com/Instagram/LibCST/blob/v${version}/CHANGELOG.md";
license = with licenses; [
license = with lib.licenses; [
mit
asl20
psfl
];
maintainers = [ ];
maintainers = with lib.maintainers; [ dotlambda ];
};
}

View File

@ -66,7 +66,7 @@ buildPythonPackage rec {
# Set the correct driver path with the help of a patch in patches
substituteInPlace playwright/_impl/_driver.py \
--replace-fail "@node@" "${lib.getExe nodejs}" \
--replace-fail "@driver@" "${driver}/package/cli.js"
--replace-fail "@driver@" "${driver}/cli.js"
'';
nativeBuildInputs = [

View File

@ -318,6 +318,7 @@ let
svaNUMT = [ jbedo ];
svaRetro = [ jbedo ];
StructuralVariantAnnotation = [ jbedo ];
RQuantLib = [ kupac ];
};
packagesWithRDepends = {

View File

@ -5,16 +5,17 @@
rustPlatform.buildRustPackage rec {
pname = "leptosfmt";
version = "0.1.18";
version = "0.1.30";
src = fetchFromGitHub {
owner = "bram209";
repo = "leptosfmt";
rev = version;
hash = "sha256-bNfTZgcru7PJR/9AcaOmW0E8QwdiXcuP7MWXcDPXGso=";
rev = "85b06b9a8bb0616b6a03ba43517245c79e1dd4cf";
hash = "sha256-PiVPnni7W8SIhO6L9698RSMTD4VVTB+klLrqMzEtWWo=";
fetchSubmodules = true;
};
cargoHash = "sha256-NQYIq9Wc2mtUGeS3Iv2e0nfQkvcX6hOxZ6FHVcHD5cs=";
cargoHash = "sha256-zj81fXjDM648Y8mIb6QMmAh/ck9GGEypzuJIBWZ32r8=";
meta = with lib; {
description = "Formatter for the leptos view! macro";

View File

@ -1,42 +0,0 @@
{ lib
, rustPlatform
, fetchCrate
, nix-update-script
, nodejs
, pkg-config
, openssl
, stdenv
, curl
, Security
, version ? "0.2.93"
, hash ? "sha256-DDdu5mM3gneraM85pAepBXWn3TMofarVR4NbjMdz3r0="
, cargoHash ? "sha256-birrg+XABBHHKJxfTKAMSlmTVYLmnmqMDfRnmG6g/YQ="
}:
rustPlatform.buildRustPackage rec {
pname = "wasm-bindgen-cli";
inherit version hash cargoHash;
src = fetchCrate {
inherit pname version hash;
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl Security ];
nativeCheckInputs = [ nodejs ];
# tests require it to be ran in the wasm-bindgen monorepo
doCheck = false;
meta = with lib; {
homepage = "https://rustwasm.github.io/docs/wasm-bindgen/";
license = with licenses; [ asl20 /* or */ mit ];
description = "Facilitating high-level interactions between wasm modules and JavaScript";
maintainers = with maintainers; [ rizary ];
mainProgram = "wasm-bindgen";
};
passthru.updateScript = nix-update-script { };
}

View File

@ -6,12 +6,12 @@
, stdenv
}:
let
version = "24.2.3";
version = "24.2.4";
src = fetchFromGitHub {
owner = "redpanda-data";
repo = "redpanda";
rev = "v${version}";
sha256 = "sha256-X9RvMjmI6IMFsBvutXH8Bb8TTLRgaFGGXLxrIlmMEaU=";
sha256 = "sha256-DSwD9oN5hrDjUL0Ey8ARvojr54abBXUNvj/06lLvURk=";
};
in
buildGoModule rec {

View File

@ -5272,12 +5272,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
gpu-burn = callPackage ../applications/misc/gpu-burn {
# gpu-burn doesn't build on gcc11. CUDA 11.3 is the last version to use
# pre-gcc11, in particular gcc9.
stdenv = gcc9Stdenv;
};
gpu-viewer = callPackage ../applications/misc/gpu-viewer { };
greg = callPackage ../applications/audio/greg {
@ -13779,11 +13773,6 @@ with pkgs;
wasm-text-gen = nodePackages."@webassemblyjs/wasm-text-gen-1.11.1";
wast-refmt = nodePackages."@webassemblyjs/wast-refmt-1.11.1";
wasm-bindgen-cli = callPackage ../development/tools/wasm-bindgen-cli {
inherit (darwin.apple_sdk.frameworks) Security;
nodejs = nodejs_latest;
};
wasm-tools = callPackage ../tools/misc/wasm-tools { };
wasmedge = callPackage ../development/tools/wasmedge {