Merge master into staging-next
This commit is contained in:
commit
f8cf67790e
|
@ -2346,6 +2346,12 @@
|
|||
githubId = 12202789;
|
||||
name = "CrazedProgrammer";
|
||||
};
|
||||
creator54 = {
|
||||
email = "hi.creator54@gmail.com";
|
||||
github = "creator54";
|
||||
githubId = 34543609;
|
||||
name = "creator54";
|
||||
};
|
||||
cript0nauta = {
|
||||
email = "shareman1204@gmail.com";
|
||||
github = "cript0nauta";
|
||||
|
|
|
@ -15,24 +15,18 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoSha256 = "1sal85gsbnrabxi39298w9njdc08csnwl40akd6k9fsc0fmpn1b0";
|
||||
|
||||
cargoBuildFlags = with lib; [
|
||||
"--no-default-features"
|
||||
"--features"
|
||||
(concatStringsSep "," (filter (x: x != "") [
|
||||
(optionalString withRodio "rodio-backend")
|
||||
(optionalString withALSA "alsa-backend")
|
||||
(optionalString withPulseAudio "pulseaudio-backend")
|
||||
(optionalString withPortAudio "portaudio-backend")
|
||||
|
||||
]))
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ openssl ] ++ lib.optional withALSA alsa-lib
|
||||
++ lib.optional withPulseAudio libpulseaudio
|
||||
++ lib.optional withPortAudio portaudio;
|
||||
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = lib.optional withRodio "rodio-backend"
|
||||
++ lib.optional withALSA "alsa-backend"
|
||||
++ lib.optional withPulseAudio "pulseaudio-backend"
|
||||
++ lib.optional withPortAudio "portaudio-backend";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, ncurses, libvorbis, SDL }:
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, libvorbis, SDL }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mp3blaster";
|
||||
|
@ -11,6 +11,16 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0pzwml3yhysn8vyffw9q9p9rs8gixqkmg4n715vm23ib6wxbliqs";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix pending upstream inclusion for ncurses-6.3 support:
|
||||
# https://github.com/stragulus/mp3blaster/pull/8
|
||||
(fetchpatch {
|
||||
name = "ncurses-6.3.patch";
|
||||
url = "https://github.com/stragulus/mp3blaster/commit/62168cba5eaba6ffe56943552837cf033cfa96ed.patch";
|
||||
sha256 = "088l27kl1l58lwxfnw5x2n64sdjy925ycphni3icwag7zvpj0xz1";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
ncurses
|
||||
libvorbis
|
||||
|
|
|
@ -20,12 +20,6 @@ rustPackages.rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoSha256 = "07dxfc0csrnfl01p9vdrqvca9f574svlf37dk3dz8p6q08ki0n1z";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--no-default-features"
|
||||
"--features"
|
||||
"${lib.optionalString withALSA "alsa_backend,"}${lib.optionalString withPulseAudio "pulseaudio_backend,"}${lib.optionalString withPortAudio "portaudio_backend,"}${lib.optionalString withMpris "dbus_mpris,"}${lib.optionalString withKeyring "dbus_keyring,"}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ openssl ]
|
||||
|
@ -34,6 +28,13 @@ rustPackages.rustPlatform.buildRustPackage rec {
|
|||
++ lib.optional withPortAudio portaudio
|
||||
++ lib.optional (withMpris || withKeyring) dbus;
|
||||
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = lib.optional withALSA "alsa_backend"
|
||||
++ lib.optional withPulseAudio "pulseaudio_backend"
|
||||
++ lib.optional withPortAudio "portaudio_backend"
|
||||
++ lib.optional withMpris "dbus_mpris"
|
||||
++ lib.optional withKeyring "dbus_keyring";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -14,12 +14,6 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoSha256 = "1n7kb1lyghpkgdgd58pw8ldvfps30rnv5niwx35pkdg74h59hqgj";
|
||||
|
||||
cargoBuildFlags = [ "--no-default-features" ]
|
||||
++ lib.optional withGui "--features webgui";
|
||||
|
||||
cargoTestFlags = [ "--no-default-features" ]
|
||||
++ lib.optional withGui "--features webgui";
|
||||
|
||||
checkFlags = [
|
||||
# these want internet access, disable them
|
||||
"--skip=dns::client::tests::test_tcp_client"
|
||||
|
@ -30,6 +24,9 @@ rustPlatform.buildRustPackage rec {
|
|||
buildInputs = lib.optional (withGui && stdenv.isLinux) webkitgtk
|
||||
++ lib.optionals (withGui && stdenv.isDarwin) [ Cocoa WebKit ];
|
||||
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = lib.optional withGui "webgui";
|
||||
|
||||
postInstall = lib.optionalString (withGui && stdenv.isLinux) ''
|
||||
wrapProgram $out/bin/alfis \
|
||||
--prefix PATH : ${lib.makeBinPath [ zenity ]}
|
||||
|
|
|
@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
|
|||
++ lib.optionals stdenv.isLinux [ systemd ]
|
||||
++ lib.optionals stdenv.isDarwin [ darwin.Security ];
|
||||
|
||||
cargoBuildFlags = [ "--features final" ];
|
||||
buildFeatures = [ "final" ];
|
||||
|
||||
# Fix tests by preventing them from writing to /homeless-shelter.
|
||||
preCheck = ''
|
||||
|
|
|
@ -13,8 +13,8 @@ let
|
|||
sha256Hash = "10gpwb130bzp6a9g958cjqcb2gsm0vdgm08nm5xy45xdh54nxjfg";
|
||||
};
|
||||
betaVersion = {
|
||||
version = "2021.1.1.15"; # "Android Studio Bumblebee (2021.1.1) Beta 2"
|
||||
sha256Hash = "sha256-J+Jw9F8pEE0SMWka//jADOiQ+GSOeRf5GBfp0RDtwqA=";
|
||||
version = "2021.1.1.16"; # "Android Studio Bumblebee (2021.1.1) Beta 3"
|
||||
sha256Hash = "pgmBWzq/5RHJTc41kzB43tbsjvrWx9BJ7UKsR8AO0V4=";
|
||||
};
|
||||
latestVersion = { # canary & dev
|
||||
version = "2021.2.1.3"; # "Android Studio Chipmunk (2021.2.1) Canary 3"
|
||||
|
|
|
@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
buildInputs = lib.optionals stdenv.isLinux [ libX11 libXrandr ];
|
||||
|
||||
cargoBuildFlags = lib.optional (!withSki) "--no-default-features";
|
||||
buildNoDefaultFeatures = !withSki;
|
||||
|
||||
postInstall = ''
|
||||
installManPage man/*
|
||||
|
|
|
@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
|
|||
];
|
||||
buildInputs = [ xorg.libxcb ];
|
||||
|
||||
cargoBuildFlags = [ "--features=all" ];
|
||||
buildFeatures = [ "all" ];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --bash completions/bash-completion/completions/*
|
||||
|
|
|
@ -2,19 +2,22 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lscolors";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version pname;
|
||||
sha256 = "sha256-dwtrs9NlhJ+km2/146HMnDirWRB5Ur5LTmWdKAK03v0=";
|
||||
sha256 = "sha256-74KNnERhyiZamVyS9yzDNVf33KMqDiSfPb5BCTKFuHA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-vQnrLt+VSDPr61VMkYFtjSDnEt+NmWBZUd4qLzPzQBU=";
|
||||
cargoSha256 = "sha256-mjGZ/q9BByndwfnFGk6k5KD9ctY0X0/oaEugiOJY8Ms=";
|
||||
|
||||
# setid is not allowed in the sandbox
|
||||
checkFlags = [ "--skip=tests::style_for_setid" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Rust library and tool to colorize paths using LS_COLORS";
|
||||
homepage = "https://github.com/sharkdp/lscolors";
|
||||
license = with licenses; [ asl20 mit ];
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoSha256 = "0vrn1vc3rwabv6l2r1qb7mkcxbp75q79bfl3rxhyi51ra3ij507r";
|
||||
|
||||
checkPhase = "cargo test --features=integration_tests";
|
||||
checkFeatures = [ "integration_tests" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Human-readable diff for todo.txt files";
|
||||
|
|
|
@ -55,13 +55,13 @@ GEM
|
|||
http-form_data (2.3.0)
|
||||
http-parser (1.2.3)
|
||||
ffi-compiler (>= 1.0, < 2.0)
|
||||
i18n (1.8.10)
|
||||
i18n (1.8.11)
|
||||
concurrent-ruby (~> 1.0)
|
||||
jsonpath (0.9.9)
|
||||
multi_json
|
||||
to_regexp (~> 0.2.1)
|
||||
jwt (2.3.0)
|
||||
krane (2.3.0)
|
||||
krane (2.3.1)
|
||||
activesupport (>= 5.0)
|
||||
colorize (~> 0.8)
|
||||
concurrent-ruby (~> 1.1)
|
||||
|
@ -77,15 +77,15 @@ GEM
|
|||
recursive-open-struct (~> 1.1, >= 1.1.1)
|
||||
rest-client (~> 2.0)
|
||||
memoist (0.16.2)
|
||||
mime-types (3.3.1)
|
||||
mime-types (3.4.0)
|
||||
mime-types-data (~> 3.2015)
|
||||
mime-types-data (3.2021.0901)
|
||||
mime-types-data (3.2021.1115)
|
||||
minitest (5.14.4)
|
||||
multi_json (1.15.0)
|
||||
multipart-post (2.1.1)
|
||||
netrc (0.11.0)
|
||||
oj (3.13.8)
|
||||
os (1.1.1)
|
||||
oj (3.13.9)
|
||||
os (1.1.4)
|
||||
public_suffix (4.0.6)
|
||||
rake (13.0.6)
|
||||
recursive-open-struct (1.1.3)
|
||||
|
@ -108,7 +108,7 @@ GEM
|
|||
unf (0.1.4)
|
||||
unf_ext
|
||||
unf_ext (0.0.8)
|
||||
zeitwerk (2.4.2)
|
||||
zeitwerk (2.5.1)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
@ -117,4 +117,4 @@ DEPENDENCIES
|
|||
krane
|
||||
|
||||
BUNDLED WITH
|
||||
2.2.20
|
||||
2.2.24
|
||||
|
|
|
@ -244,10 +244,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a";
|
||||
sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.8.10";
|
||||
version = "1.8.11";
|
||||
};
|
||||
jsonpath = {
|
||||
dependencies = ["multi_json" "to_regexp"];
|
||||
|
@ -276,10 +276,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1r4sfyapdqcgqns4skxwkxd9v7a4f0h7y7zrgyz7za1p56jmx9sr";
|
||||
sha256 = "0k1lwg0d2phs9n9zdx7nv5rv2p2vipm9jgzalr8x9nrq1is6wgvr";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
};
|
||||
kubeclient = {
|
||||
dependencies = ["http" "recursive-open-struct" "rest-client"];
|
||||
|
@ -308,20 +308,20 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh";
|
||||
sha256 = "1wvbwlkf6i17xvxx70cffw26ijvcc400vfhpbnvd8mmx556cnb4g";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.3.1";
|
||||
version = "3.4.0";
|
||||
};
|
||||
mime-types-data = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1z5wvk6qi4ws1kjh7xn1rfirqw5m72bwvqacck1fjpbh33pcrwxv";
|
||||
sha256 = "03m3fkix2haah20kvh1jgv262yg9jlzn6wq0y31kafxk8fysfy27";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2021.0901";
|
||||
version = "3.2021.1115";
|
||||
};
|
||||
minitest = {
|
||||
groups = ["default"];
|
||||
|
@ -368,20 +368,20 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1wk5vk0py65aqp3xrs8s8qkj8pw6xny5z5p9dx16qdx6j3zw5a6g";
|
||||
sha256 = "1hcmczbp9afxijzg0gvp9milyzk15phfmbpmmsj5ppmziwkdls16";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.13.8";
|
||||
version = "3.13.9";
|
||||
};
|
||||
os = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "12fli64wz5j9868gpzv5wqsingk1jk457qyqksv9ksmq9b0zpc9x";
|
||||
sha256 = "0gwd20smyhxbm687vdikfh1gpi96h8qb1x28s2pdcysf6dm6v0ap";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.1";
|
||||
version = "1.1.4";
|
||||
};
|
||||
public_suffix = {
|
||||
groups = ["default"];
|
||||
|
@ -512,9 +512,9 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl";
|
||||
sha256 = "18l4r6layck0d80ydc692mv1lxak5xbf6w2paj1x7m2ggbggzxgj";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.4.2";
|
||||
version = "2.5.1";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -21,11 +21,11 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoSha256 = "05q3f1wp48mwkz8n0102rwb6jzrgpx3dlbxzf3zcw8r1mblgzim1";
|
||||
|
||||
cargoBuildFlags = lib.optionals stdenv.isLinux [ "--features=desktop-notifications" ];
|
||||
|
||||
nativeBuildInputs = lib.optional stdenv.isLinux pkg-config;
|
||||
buildInputs = lib.optionals stdenv.isLinux [ dbus openssl ] ++ lib.optional stdenv.isDarwin Foundation;
|
||||
|
||||
buildFeatures = lib.optional stdenv.isLinux "desktop-notifications";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A console IRC client";
|
||||
homepage = "https://github.com/osa1/tiny";
|
||||
|
|
|
@ -25,14 +25,14 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoSha256 = "sha256-ZE653OtXyZ9454bKPApmuL2kVko/hGBWEAya1L1KIoc=";
|
||||
|
||||
cargoBuildFlags = lib.optional withNotmuch "--features=notmuch";
|
||||
|
||||
nativeBuildInputs = [ pkg-config gzip makeWrapper ];
|
||||
|
||||
buildInputs = [ openssl dbus sqlite ] ++ lib.optional withNotmuch notmuch;
|
||||
|
||||
checkInputs = [ file ];
|
||||
|
||||
buildFeatures = lib.optional withNotmuch [ "notmuch" ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/man/man1
|
||||
gzip < docs/meli.1 > $out/share/man/man1/meli.1.gz
|
||||
|
|
|
@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
|
|||
buildInputs = [ curl zlib openssl ]
|
||||
++ lib.optional stdenv.isDarwin libiconv;
|
||||
|
||||
cargoBuildFlags = [ "--features no-self-update" ];
|
||||
buildFeatures = [ "no-self-update" ];
|
||||
|
||||
patches = lib.optionals stdenv.isLinux [
|
||||
# Run patchelf on the downloaded binaries.
|
||||
|
|
|
@ -22,12 +22,6 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoSha256 = "sha256-/rLv2/bcVsmWw+ZfyumDcj0ptHPQBCCYR9O/lVlV+G0=";
|
||||
|
||||
# Enables build against a generic BLAS.
|
||||
cargoBuildFlags = [
|
||||
"--features"
|
||||
"netlib"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
buildInputs = [
|
||||
|
@ -38,6 +32,9 @@ rustPlatform.buildRustPackage rec {
|
|||
Security
|
||||
];
|
||||
|
||||
# Enables build against a generic BLAS.
|
||||
buildFeatures = [ "netlib" ];
|
||||
|
||||
postInstall = ''
|
||||
# Install shell completions
|
||||
for shell in bash fish zsh; do
|
||||
|
|
|
@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
buildInputs = lib.optional withOpenCL (if stdenv.isDarwin then OpenCL else ocl-icd);
|
||||
|
||||
cargoBuildFlags = lib.optional (!withOpenCL) "--no-default-features";
|
||||
buildNoDefaultFeatures = !withOpenCL;
|
||||
|
||||
# disable tests that require gpu
|
||||
checkNoDefaultFeatures = true;
|
||||
|
|
|
@ -22,8 +22,6 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoSha256 = "sha256-j9xf97qPdhtakIwhAql0/Go5fPxlyWKAVLk5CMBfAbs=";
|
||||
|
||||
cargoBuildFlags = lib.optional gitImportSupport "--features=git";
|
||||
|
||||
doCheck = false;
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl libsodium xxHash zstd ]
|
||||
|
@ -32,6 +30,8 @@ rustPlatform.buildRustPackage rec {
|
|||
CoreServices Security SystemConfiguration
|
||||
]));
|
||||
|
||||
buildFeatures = lib.optional gitImportSupport "git";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A distributed version control system";
|
||||
homepage = "https://pijul.org";
|
||||
|
|
|
@ -25,10 +25,10 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
buildInputs = [ gtk3 ] ++ lib.optional withWayland gtk-layer-shell;
|
||||
|
||||
cargoBuildFlags = [ "--bin" "eww" ] ++ lib.optionals withWayland [
|
||||
"--no-default-features"
|
||||
"--features=wayland"
|
||||
];
|
||||
buildNoDefaultFeatures = withWayland;
|
||||
buildFeatures = lib.optional withWayland "wayland";
|
||||
|
||||
cargoBuildFlags = [ "--bin" "eww" ];
|
||||
|
||||
cargoTestFlags = cargoBuildFlags;
|
||||
|
||||
|
|
|
@ -27,10 +27,10 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
buildInputs = [ dbus libpulseaudio notmuch openssl ];
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--features=notmuch"
|
||||
"--features=maildir"
|
||||
"--features=pulseaudio"
|
||||
buildFeatures = [
|
||||
"notmuch"
|
||||
"maildir"
|
||||
"pulseaudio"
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
|
|
|
@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
|
|||
# For now, this is the only available featureset. This is also why the file is
|
||||
# in the i3 folder, even though it might be useful for more than just i3
|
||||
# users.
|
||||
cargoBuildFlags = [ "--features i3" ];
|
||||
buildFeatures = [ "i3" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Visually focus windows by label";
|
||||
|
|
|
@ -30,8 +30,8 @@ copyDesktopItems() {
|
|||
|
||||
for desktopItem in $desktopItems; do
|
||||
if [[ -f "$desktopItem" ]]; then
|
||||
echo "Copying '$f' into '$out/share/applications'"
|
||||
install -D -m 444 -t "$out"/share/applications "$f"
|
||||
echo "Copying '$desktopItem' into '$out/share/applications'"
|
||||
install -D -m 444 -t "$out"/share/applications "$desktopItem"
|
||||
else
|
||||
for f in "$desktopItem"/share/applications/*.desktop; do
|
||||
echo "Copying '$f' into '$out/share/applications'"
|
||||
|
|
|
@ -4,10 +4,23 @@ with lib; mkCoqDerivation {
|
|||
pname = "coq-bits";
|
||||
repo = "bits";
|
||||
inherit version;
|
||||
defaultVersion = if versions.isGe "8.7" coq.version then "20190812" else null;
|
||||
defaultVersion =
|
||||
if versions.isGe "8.10" coq.version
|
||||
then "1.1.0"
|
||||
else if versions.isGe "8.7" coq.version
|
||||
then "1.0.0"
|
||||
else null;
|
||||
|
||||
release."20190812".rev = "1.0.0";
|
||||
release."20190812".sha256 = "0nv5mdgrd075dpd8bc7h0xc5i95v0pkm0bfyq5rj6ii1s54dwcjl";
|
||||
release = {
|
||||
"1.0.0" = {
|
||||
rev = "1.0.0";
|
||||
sha256 = "0nv5mdgrd075dpd8bc7h0xc5i95v0pkm0bfyq5rj6ii1s54dwcjl";
|
||||
};
|
||||
"1.1.0" = {
|
||||
rev = "1.1.0";
|
||||
sha256 = "sha256-TCw1kSXeW0ysIdLeNr+EGmpGumEE9i8tinEMp57UXaE=";
|
||||
};
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ mathcomp.algebra ];
|
||||
|
||||
|
|
|
@ -22,20 +22,18 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
# cranelift+jit works everywhere, see:
|
||||
# https://github.com/wasmerio/wasmer/blob/master/Makefile#L22
|
||||
buildFeatures = [ "cranelift" "jit" ];
|
||||
cargoBuildFlags = [
|
||||
# cranelift+jit works everywhere, see:
|
||||
# https://github.com/wasmerio/wasmer/blob/master/Makefile#L22
|
||||
"--features" "cranelift,jit"
|
||||
# must target manifest and desired output bin, otherwise output is empty
|
||||
"--manifest-path" "lib/cli/Cargo.toml"
|
||||
"--bin" "wasmer"
|
||||
];
|
||||
|
||||
cargoTestFlags = [
|
||||
"--features" "test-cranelift"
|
||||
# Can't use test-jit :
|
||||
# error: Package `wasmer-workspace v2.0.0 (/build/source)` does not have the feature `test-jit`
|
||||
];
|
||||
# Can't use test-jit:
|
||||
# error: Package `wasmer-workspace v2.0.0 (/build/source)` does not have the feature `test-jit`
|
||||
checkFeatures = [ "test-cranelift" ];
|
||||
|
||||
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
|
||||
|
||||
|
|
|
@ -1,7 +0,0 @@
|
|||
source $stdenv/setup
|
||||
|
||||
mkdir smack
|
||||
cd smack
|
||||
tar xfvz $src
|
||||
mkdir -p $out/share/java
|
||||
cp libs/smack-*.jar $out/share/java
|
|
@ -2,13 +2,23 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
name = "smack-4.1.9";
|
||||
builder = ./builder.sh;
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.igniterealtime.org/downloadServlet?filename=smack/smack_4_1_9.tar.gz";
|
||||
sha256 = "009x0qcxd4dkvwcjz2nla470pwbabwvg37wc21pslpw42ldi0bzp";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/java
|
||||
cp libs/smack-*.jar $out/share/java
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A XMPP (Jabber) client library for instant messaging and presence";
|
||||
homepage = "http://www.igniterealtime.org/projects/smack/";
|
||||
|
|
36
pkgs/development/python-modules/hdfs/default.nix
Normal file
36
pkgs/development/python-modules/hdfs/default.nix
Normal file
|
@ -0,0 +1,36 @@
|
|||
{ buildPythonPackage
|
||||
, docopt
|
||||
, fastavro
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, nose
|
||||
, pytestCheckHook
|
||||
, requests
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hdfs";
|
||||
# See https://github.com/mtth/hdfs/issues/176.
|
||||
version = "2.5.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mtth";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-94Q3IUoX1Cb+uRqvsfpVZJ1koJSx5cQ3/XpYJ0gkQNU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ docopt requests six ];
|
||||
|
||||
checkInputs = [ fastavro nose pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "hdfs" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python API and command line interface for HDFS";
|
||||
homepage = "https://github.com/mtth/hdfs";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ samuela ];
|
||||
};
|
||||
}
|
31
pkgs/development/python-modules/pydeck/default.nix
Normal file
31
pkgs/development/python-modules/pydeck/default.nix
Normal file
|
@ -0,0 +1,31 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, ipykernel, ipywidgets, pythonOlder, pytestCheckHook, pandas }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydeck";
|
||||
version = "0.7.0";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1zi0gqzd0byj16ja74m2dm99a1hmrlhk26y0x7am07vb1d8lvvsy";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "pydeck" ];
|
||||
|
||||
checkInputs = [ pytestCheckHook pandas ];
|
||||
# tries to start a jupyter server
|
||||
disabledTests = [ "test_nbconvert" ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ipykernel
|
||||
ipywidgets
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/visgl/deck.gl/tree/master/bindings/pydeck";
|
||||
description = "Large-scale interactive data visualization in Python";
|
||||
maintainers = with maintainers; [ creator54 ];
|
||||
license = licenses.asl20;
|
||||
};
|
||||
}
|
61
pkgs/development/python-modules/tailscale/default.nix
Normal file
61
pkgs/development/python-modules/tailscale/default.nix
Normal file
|
@ -0,0 +1,61 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, aresponses
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pydantic
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, yarl
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tailscale";
|
||||
version = "0.1.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "frenck";
|
||||
repo = "python-tailscale";
|
||||
rev = "v${version}";
|
||||
sha256 = "1jqx2i8rghfxlb1c76f37viz9fc1vq95xb2jm3bpnx5yy4n5dly1";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
pydantic
|
||||
yarl
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
aresponses
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Upstream doesn't set a version for the pyproject.toml
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "0.0.0" "${version}" \
|
||||
--replace "--cov" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"tailscale"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python client for the Tailscale API";
|
||||
homepage = "https://github.com/frenck/python-wled";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
|
@ -20,8 +20,8 @@
|
|||
, tensorflow-estimator_2
|
||||
, tensorflow-tensorboard_2
|
||||
, cudaSupport ? false
|
||||
, cudatoolkit ? null
|
||||
, cudnn ? null
|
||||
, cudatoolkit
|
||||
, cudnn
|
||||
, zlib
|
||||
, python
|
||||
, keras-applications
|
||||
|
@ -37,21 +37,15 @@
|
|||
# - the source build doesn't work on Darwin.
|
||||
# - the source build is currently brittle and not easy to maintain
|
||||
|
||||
assert cudaSupport -> cudatoolkit != null
|
||||
&& cudnn != null;
|
||||
|
||||
# unsupported combination
|
||||
assert ! (stdenv.isDarwin && cudaSupport);
|
||||
|
||||
let
|
||||
packages = import ./binary-hashes.nix;
|
||||
|
||||
variant = if cudaSupport then "-gpu" else "";
|
||||
pname = "tensorflow${variant}";
|
||||
metadataPatch = ./relax-dependencies-metadata.patch;
|
||||
patch = ./relax-dependencies.patch;
|
||||
in buildPythonPackage {
|
||||
inherit pname;
|
||||
pname = "tensorflow" + lib.optionalString cudaSupport "-gpu";
|
||||
inherit (packages) version;
|
||||
format = "wheel";
|
||||
|
||||
|
|
|
@ -21,9 +21,6 @@ assert lib.assertMsg (sqliteSupport == true || postgresqlSupport == true || mysq
|
|||
|
||||
let
|
||||
inherit (lib) optional optionals optionalString;
|
||||
features = optional sqliteSupport "sqlite"
|
||||
++ optional postgresqlSupport "postgres"
|
||||
++ optional mysqlSupport "mysql";
|
||||
in
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
|
@ -36,7 +33,6 @@ rustPlatform.buildRustPackage rec {
|
|||
sha256 = "sha256-mRdDc4fHMkwkszY+2l8z1RSNMEQnrWI5/Y0Y2W+guQE=";
|
||||
};
|
||||
|
||||
cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
|
||||
cargoSha256 = "sha256-sQ762Ss31sA5qALHzwkvwbfRXo00cCtqzQyoz3/zf6I=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles pkg-config ];
|
||||
|
@ -48,6 +44,11 @@ rustPlatform.buildRustPackage rec {
|
|||
++ optional postgresqlSupport postgresql
|
||||
++ optionals mysqlSupport [ mariadb zlib ];
|
||||
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = optional sqliteSupport "sqlite"
|
||||
++ optional postgresqlSupport "postgres"
|
||||
++ optional mysqlSupport "mysql";
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
'' + optionalString sqliteSupport ''
|
||||
|
|
|
@ -12,7 +12,8 @@ rustPlatform.buildRustPackage {
|
|||
};
|
||||
|
||||
cargoSha256 = "sha256-05VmQdop4vdzw2XEvVdp9+RNmyZvay1Q7gKN2n8rDEQ=";
|
||||
cargoBuildFlags = [ "--features=c-undef" ];
|
||||
|
||||
buildFeatures = [ "c-undef" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Reimplementation of genkfs in Rust";
|
||||
|
|
|
@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoSha256 = "1f42cqaqnjwi9k4ihqil6z2dqh5dnf76x54gk7mndzkrfg3rl573";
|
||||
|
||||
cargoBuildFlags = lib.optionals (!stdenv.isDarwin) [ "--features=dist-client,dist-server" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
|
||||
|
||||
buildFeatures = lib.optionals (!stdenv.isDarwin) [ "dist-client" "dist-server" ];
|
||||
|
||||
# Tests fail because of client server setup which is not possible inside the pure environment,
|
||||
# see https://github.com/mozilla/sccache/issues/460
|
||||
doCheck = false;
|
||||
|
|
|
@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
|
|||
];
|
||||
|
||||
# enable all output formats
|
||||
cargoBuildFlags = [ "--features" "all" ];
|
||||
buildFeatures = [ "all" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A program that allows you to count your code, quickly";
|
||||
|
|
|
@ -28,9 +28,7 @@ rustPlatform.buildRustPackage rec {
|
|||
buildInputs = [ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [ curl Security ];
|
||||
|
||||
cargoBuildFlags = [ "--no-default-features" ];
|
||||
|
||||
cargoTestFlags = cargoBuildFlags;
|
||||
buildNoDefaultFeatures = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cargo plugin to generate list of all licenses for a crate";
|
||||
|
|
23
pkgs/development/tools/rust/cargo-depgraph/default.nix
Normal file
23
pkgs/development/tools/rust/cargo-depgraph/default.nix
Normal file
|
@ -0,0 +1,23 @@
|
|||
{ lib, rustPlatform, fetchFromSourcehut }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-depgraph";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~jplatte";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Zt60F43hhFSj9zfAkEbgRqODvBRmzn04dHMijbz+uX0=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-mMXIiAfYBqOS3z4735T9dB9TEo7Ph2JCNq0QfyetxJg=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Create dependency graphs for cargo projects using `cargo metadata` and graphviz";
|
||||
homepage = "https://sr.ht/~jplatte/cargo-depgraph";
|
||||
changelog = "https://git.sr.ht/~jplatte/cargo-depgraph/tree/v${version}/item/CHANGELOG.md";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
|
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
|
|||
nativeBuildInputs = [ pkg-config rustfmt ];
|
||||
buildInputs = [ libusb1 libftdi1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ];
|
||||
|
||||
cargoBuildFlags = [ "--features=ftdi" ];
|
||||
buildFeatures = [ "ftdi" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A cargo extension for working with microcontrollers";
|
||||
|
|
|
@ -56,9 +56,6 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
buildAndTestSubdir = "crates/rust-analyzer";
|
||||
|
||||
cargoBuildFlags = lib.optional useMimalloc "--features=mimalloc";
|
||||
cargoTestFlags = lib.optional useMimalloc "--features=mimalloc";
|
||||
|
||||
nativeBuildInputs = lib.optional useMimalloc cmake;
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
|
@ -66,6 +63,8 @@ rustPlatform.buildRustPackage rec {
|
|||
libiconv
|
||||
];
|
||||
|
||||
buildFeatures = lib.optional useMimalloc "mimalloc";
|
||||
|
||||
RUST_ANALYZER_REV = version;
|
||||
|
||||
inherit doCheck;
|
||||
|
|
|
@ -40,7 +40,9 @@ rustPlatform.buildRustPackage rec {
|
|||
zlib
|
||||
] ++ lib.optionals stdenv.isDarwin [ CoreServices Security libiconv xz ];
|
||||
|
||||
cargoBuildFlags = [ "--features no-self-update" ];
|
||||
buildFeatures = [ "no-self-update" ];
|
||||
|
||||
checkFeatures = [ ];
|
||||
|
||||
patches = lib.optionals stdenv.isLinux [
|
||||
(runCommand "0001-dynamically-patchelf-binaries.patch" { CC = stdenv.cc; patchelf = patchelf; libPath = "$ORIGIN/../lib:${libPath}"; } ''
|
||||
|
|
|
@ -26,9 +26,7 @@ rustPlatform.buildRustPackage rec {
|
|||
buildInputs = lib.optional robloxSupport openssl
|
||||
++ lib.optional (robloxSupport && stdenv.isDarwin) Security;
|
||||
|
||||
cargoBuildFlags = lib.optional (!robloxSupport) "--no-default-features";
|
||||
|
||||
cargoTestFlags = cargoBuildFlags;
|
||||
buildNoDefaultFeatures = !robloxSupport;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A blazing-fast modern Lua linter written in Rust";
|
||||
|
|
|
@ -19,8 +19,8 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoSha256 = "sha256-/4ZW1FIfK51ak2EIV6dYY3XpucPPR+OZySPWwcKP4v0=";
|
||||
|
||||
cargoBuildFlags = lib.optionals lua52Support [ "--features" "lua52" ]
|
||||
++ lib.optionals luauSupport [ "--features" "luau" ];
|
||||
buildFeatures = lib.optional lua52Support "lua52"
|
||||
++ lib.optional luauSupport "luau";
|
||||
|
||||
# test_standard fails on darwin
|
||||
doCheck = !stdenvNoCC.isDarwin;
|
||||
|
|
|
@ -1,42 +0,0 @@
|
|||
{ lib, stdenv, fetchurl, SDL, SDL_image, SDL_ttf, SDL_mixer }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "beret";
|
||||
version = "1.2.0";
|
||||
|
||||
buildInputs = [ SDL SDL_image SDL_ttf SDL_mixer ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${SDL.dev}/include/SDL";
|
||||
NIX_CFLAGS_LINK = lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
|
||||
NIX_LDFLAGS = lib.optionalString stdenv.isDarwin
|
||||
"-framework CoreFoundation -framework OpenGL -framework Cocoa";
|
||||
|
||||
patches = [ ./use-home-dir.patch ];
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's@RESOURCE_PATH ""@RESOURCE_PATH "'$out'/share/"@' game.c
|
||||
'';
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gitorious.org/beret/beret/archive-tarball/ae029777";
|
||||
name = "beret-1.2.0.tar.gz";
|
||||
sha256 = "1rx9z72id1810fgv8mizk8qxwd1kh5xi07fdhmjc62mh3fn38szc";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
install -v -m755 beret $out/bin
|
||||
mkdir -p $out/share
|
||||
cp -av tahoma.ttf images music rooms sfx $out/share
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A 2D puzzle-platformer game about a scientist with telekinetic abilities";
|
||||
homepage = "http://kiwisauce.com/beret/";
|
||||
license = licenses.lgpl2;
|
||||
maintainers = with maintainers; [ lovek323 ];
|
||||
platforms = platforms.all;
|
||||
broken = true; # source won't download, and no replacement is visible
|
||||
};
|
||||
}
|
||||
|
|
@ -31,10 +31,11 @@ let
|
|||
|
||||
buildAndTestSubdir = "adapter";
|
||||
|
||||
buildFeatures = [ "weak-linkage" ];
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--lib"
|
||||
"--bin=codelldb"
|
||||
"--features=weak-linkage"
|
||||
];
|
||||
|
||||
# Tests are linked to liblldb but it is not available here.
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "bcc";
|
||||
version = "0.22.0";
|
||||
version = "0.23.0";
|
||||
|
||||
disabled = !stdenv.isLinux;
|
||||
|
||||
|
@ -14,7 +14,7 @@ python.pkgs.buildPythonApplication rec {
|
|||
owner = "iovisor";
|
||||
repo = "bcc";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7FQz02APzjCjxCaw+e3H2GWz+UKsH0Dzgk9LoDgwDpU=";
|
||||
sha256 = "sha256-4zfjr3VLg26uZ4xNKA1wayti7f2tqGvYSbwoZnr+Ygk=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
format = "other";
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.14.16";
|
||||
version = "5.15.2";
|
||||
release = "1";
|
||||
suffix = "xanmod${release}-cacule";
|
||||
suffix = "xanmod${release}-tt";
|
||||
in
|
||||
buildLinux (args // rec {
|
||||
inherit version;
|
||||
|
@ -13,20 +13,33 @@ buildLinux (args // rec {
|
|||
owner = "xanmod";
|
||||
repo = "linux";
|
||||
rev = modDirVersion;
|
||||
sha256 = "sha256-ro7WnN0BPxW/8sajUyGTnvmbemKJEadSBcFmjZ+Wtrs=";
|
||||
sha256 = "sha256-3tIwj+4xf/I5srEAqECbfH343J5nzCWViq1ZnidZI24=";
|
||||
};
|
||||
|
||||
structuredExtraConfig = with lib.kernel; {
|
||||
# removed options
|
||||
CFS_BANDWIDTH = lib.mkForce (option no);
|
||||
RT_GROUP_SCHED = lib.mkForce (option no);
|
||||
SCHED_AUTOGROUP = lib.mkForce (option no);
|
||||
|
||||
# AMD P-state driver
|
||||
X86_AMD_PSTATE = yes;
|
||||
|
||||
# Linux RNG framework
|
||||
LRNG = yes;
|
||||
|
||||
# Paragon's NTFS3 driver
|
||||
NTFS3_FS = module;
|
||||
NTFS3_LZX_XPRESS = yes;
|
||||
NTFS3_FS_POSIX_ACL = yes;
|
||||
|
||||
# Preemptive Full Tickless Kernel at 500Hz
|
||||
SCHED_CORE = lib.mkForce (option no);
|
||||
PREEMPT_VOLUNTARY = lib.mkForce no;
|
||||
PREEMPT = lib.mkForce yes;
|
||||
NO_HZ_FULL = yes;
|
||||
HZ_500 = yes;
|
||||
|
||||
# Google's Multigenerational LRU Framework
|
||||
LRU_GEN = yes;
|
||||
LRU_GEN_ENABLED = yes;
|
||||
|
||||
# Google's BBRv2 TCP congestion Control
|
||||
TCP_CONG_BBR2 = yes;
|
||||
DEFAULT_BBR2 = yes;
|
||||
|
@ -46,14 +59,12 @@ buildLinux (args // rec {
|
|||
ANDROID_BINDER_DEVICES = freeform "binder,hwbinder,vndbinder";
|
||||
|
||||
# Futex WAIT_MULTIPLE implementation for Wine / Proton Fsync.
|
||||
# Futex2 interface compatible w/ latest Wine / Proton Fsync.
|
||||
FUTEX = yes;
|
||||
FUTEX2 = yes;
|
||||
FUTEX_PI = yes;
|
||||
};
|
||||
|
||||
extraMeta = {
|
||||
branch = "5.14-cacule";
|
||||
branch = "5.15-tt";
|
||||
maintainers = with lib.maintainers; [ fortuneteller2k lovesegfault ];
|
||||
description = "Built with custom settings and new features built to provide a stable, responsive and smooth desktop experience";
|
||||
broken = stdenv.isAarch64;
|
||||
|
|
|
@ -20,9 +20,8 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
cargoBuildFlags = [ "--no-default-features" "--features=socks" ];
|
||||
|
||||
cargoTestFlags = cargoBuildFlags;
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = [ "socks" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An RPKI Validator written in Rust";
|
||||
|
|
|
@ -1,6 +0,0 @@
|
|||
source $stdenv/setup
|
||||
|
||||
set -e
|
||||
|
||||
mkdir -p $out/share/java
|
||||
cp $src $out/share/java/mssql-jdbc.jar
|
|
@ -1,15 +1,25 @@
|
|||
{lib, stdenv, fetchurl}:
|
||||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mssql-jdbc";
|
||||
version = "7.2.2";
|
||||
builder = ./builder.sh;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Microsoft/mssql-jdbc/releases/download/v${version}/${pname}-${version}.jre8.jar";
|
||||
url = "https://github.com/Microsoft/mssql-jdbc/releases/download/v${version}/mssql-jdbc-${version}.jre8.jar";
|
||||
sha256 = "09psxjy1v3khq8lcq6h9mbgyijsgawf0z2qryk1l91ypnwl8s3pg";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/java
|
||||
cp $src $out/share/java/mssql-jdbc.jar
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
|
|
@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec {
|
|||
++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ xorg.libX11 ]
|
||||
++ lib.optionals (withExtraFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ];
|
||||
|
||||
cargoBuildFlags = lib.optional withExtraFeatures "--features=extra";
|
||||
buildFeatures = lib.optional withExtraFeatures "extra";
|
||||
|
||||
# Since 0.34, nu has an indirect dependency on `zstd-sys` (via `polars` and
|
||||
# `parquet`, for dataframe support), which by default has an impure build
|
||||
|
|
|
@ -25,12 +25,14 @@ rustPlatform.buildRustPackage rec {
|
|||
sha256 = "1pl7f8fhxfcy0c6c08vkagp0x1ak96vc5wgamigrk1nkd6l371lb";
|
||||
};
|
||||
|
||||
cargoBuildFlags = lib.optionals (!stdenv.isLinux) [ "--no-default-features" "--features" "pulse" ];
|
||||
cargoSha256 = "1y7m61j07gvqfqz97mda39nc602sv7a826c06m8l22i7z380xfms";
|
||||
|
||||
buildInputs = [ xlibsWrapper xorg.libXScrnSaver libpulseaudio ] ++ lib.optional stdenv.isDarwin Security;
|
||||
nativeBuildInputs = [ pkg-config patchelf python3 ];
|
||||
|
||||
buildNoDefaultFeatures = !stdenv.isLinux;
|
||||
buildFeatures = lib.optional (!stdenv.isLinux) "pulse";
|
||||
|
||||
postFixup = lib.optionalString stdenv.isLinux ''
|
||||
RPATH="$(patchelf --print-rpath $out/bin/xidlehook)"
|
||||
patchelf --set-rpath "$RPATH:${libpulseaudio}/lib" $out/bin/xidlehook
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
{ lib, fetchpatch, fetchzip, yarn2nix-moretea, nodejs, jq, dos2unix }:
|
||||
|
||||
yarn2nix-moretea.mkYarnPackage rec {
|
||||
version = "0.8.98";
|
||||
version = "0.9.50";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/meshcentral/-/meshcentral-${version}.tgz";
|
||||
sha256 = "0120csvak07mkgaiq4sxyslcipgfgal0mhd8gwywcij2s71a3n26";
|
||||
sha256 = "0igkl2ip2mas3djg1rmw209xar1kfiqy277r2lzi5zcnn4hh820m";
|
||||
};
|
||||
|
||||
packageJSON = ./package.json;
|
||||
|
@ -28,6 +28,8 @@ yarn2nix-moretea.mkYarnPackage rec {
|
|||
|
||||
publishBinsFor = [ ];
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Computer management web app";
|
||||
homepage = "https://meshcentral.com/info/";
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "meshcentral",
|
||||
"version": "0.8.98",
|
||||
"version": "0.9.50",
|
||||
"keywords": [
|
||||
"Remote Device Management",
|
||||
"Remote Device Monitoring",
|
||||
|
@ -39,19 +39,21 @@
|
|||
"body-parser": "^1.19.0",
|
||||
"cbor": "~5.2.0",
|
||||
"compression": "^1.7.4",
|
||||
"cookie-session": "^2.0.0-beta.3",
|
||||
"cookie-session": "^1.4.0",
|
||||
"express": "^4.17.0",
|
||||
"express-handlebars": "^3.1.0",
|
||||
"express-ws": "^4.0.0",
|
||||
"ipcheck": "^0.1.0",
|
||||
"minimist": "^1.2.0",
|
||||
"minimist": "^1.2.5",
|
||||
"multiparty": "^4.2.1",
|
||||
"nedb": "^1.8.0",
|
||||
"@yetzt/nedb": "^1.8.0",
|
||||
"node-forge": "^0.10.0",
|
||||
"ws": "^5.2.3",
|
||||
"xmldom": "^0.5.0",
|
||||
"yauzl": "^2.10.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=10.0.0"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/Ylianst/MeshCentral.git"
|
||||
|
@ -68,10 +70,9 @@
|
|||
"passport-saml": "*",
|
||||
"ws": "5.2.3",
|
||||
"cbor": "5.2.0",
|
||||
"nedb": "*",
|
||||
"@yetzt/nedb": "*",
|
||||
"https": "*",
|
||||
"yauzl": "*",
|
||||
"xmldom": "*",
|
||||
"ipcheck": "*",
|
||||
"express": "*",
|
||||
"archiver": "4.0.2",
|
||||
|
@ -80,9 +81,9 @@
|
|||
"express-ws": "4.0.0",
|
||||
"compression": "*",
|
||||
"body-parser": "*",
|
||||
"cookie-session": "*",
|
||||
"cookie-session": "1.4.0",
|
||||
"express-handlebars": "*",
|
||||
"node-windows": "*",
|
||||
"node-windows": "0.1.4",
|
||||
"loadavg-windows": "*",
|
||||
"node-sspi": "*",
|
||||
"ldapauth-fork": "*",
|
||||
|
@ -93,8 +94,10 @@
|
|||
"aedes": "0.39.0",
|
||||
"mysql": "*",
|
||||
"@mysql/xdevapi": "*",
|
||||
"mongodb": "*",
|
||||
"mongodb": "4.1.0",
|
||||
"saslprep": "*",
|
||||
"pg": "8.7.1",
|
||||
"pgtools": "0.3.2",
|
||||
"mariadb": "*",
|
||||
"node-vault": "*",
|
||||
"semver": "*",
|
||||
|
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -27,9 +27,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
buildInputs = [ bzip2 xz zlib zstd ];
|
||||
|
||||
cargoBuildFlags = [ "--features" "zstd/pkg-config" ];
|
||||
|
||||
cargoTestFlags = cargoBuildFlags;
|
||||
buildFeatures = [ "zstd/pkg-config" ];
|
||||
|
||||
postInstall = ''
|
||||
help2man $out/bin/ouch > ouch.1
|
||||
|
|
|
@ -11,7 +11,6 @@ rustPlatform.buildRustPackage rec {
|
|||
sha256 = "1w7hdqgqr1jgxid3k7f2j52wz31gv8bzr9rsm6xzp7nnihp6i45p";
|
||||
};
|
||||
|
||||
cargoBuildFlags = ["--features" "bin"];
|
||||
cargoSha256 = "08ip6x4kink244majlk595yh551c2ap3ry58wly994mh8wf6ifwb";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
@ -24,6 +23,8 @@ rustPlatform.buildRustPackage rec {
|
|||
libsixel
|
||||
];
|
||||
|
||||
buildFeatures = [ "bin" ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/termplay --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
|
||||
'';
|
||||
|
|
|
@ -22,8 +22,8 @@
|
|||
, features ? ([ "sinks" "sources" "transforms" ]
|
||||
# the second feature flag is passed to the rdkafka dependency
|
||||
# building on linux fails without this feature flag (both x86_64 and AArch64)
|
||||
++ (lib.optionals enableKafka [ "rdkafka-plain" "rdkafka/dynamic_linking" ])
|
||||
++ (lib.optional stdenv.targetPlatform.isUnix "unix"))
|
||||
++ lib.optionals enableKafka [ "rdkafka-plain" "rdkafka/dynamic_linking" ]
|
||||
++ lib.optional stdenv.targetPlatform.isUnix "unix")
|
||||
}:
|
||||
|
||||
let
|
||||
|
@ -51,24 +51,28 @@ rustPlatform.buildRustPackage {
|
|||
RUSTONIG_SYSTEM_LIBONIG = true;
|
||||
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
|
||||
|
||||
cargoBuildFlags = [ "--no-default-features" "--features" (lib.concatStringsSep "," features) ];
|
||||
TZDIR = "${tzdata}/share/zoneinfo";
|
||||
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = features;
|
||||
|
||||
# TODO investigate compilation failure for tests
|
||||
# dev dependency includes httpmock which depends on iashc which depends on curl-sys with http2 feature enabled
|
||||
# compilation fails because of a missing http2 include
|
||||
doCheck = !stdenv.isDarwin;
|
||||
# healthcheck_grafana_cloud is trying to make a network access
|
||||
# test_stream_errors is flaky on linux-aarch64
|
||||
# tcp_with_tls_intermediate_ca is flaky on linux-x86_64
|
||||
checkPhase = ''
|
||||
TZDIR=${tzdata}/share/zoneinfo cargo test \
|
||||
--no-default-features \
|
||||
--features ${lib.concatStringsSep "," features} \
|
||||
-- --test-threads 1 \
|
||||
--skip=sinks::loki::tests::healthcheck_grafana_cloud \
|
||||
--skip=kubernetes::api_watcher::tests::test_stream_errors \
|
||||
--skip=sources::socket::test::tcp_with_tls_intermediate_ca \
|
||||
--skip=sources::host_metrics::cgroups::tests::generates_cgroups_metrics
|
||||
'';
|
||||
|
||||
checkFlags = [
|
||||
# tries to make a network access
|
||||
"--skip=sinks::loki::tests::healthcheck_grafana_cloud"
|
||||
|
||||
# flaky on linux-aarch64
|
||||
"--skip=kubernetes::api_watcher::tests::test_stream_errors"
|
||||
|
||||
# flaky on linux-x86_64
|
||||
"--skip=sources::socket::test::tcp_with_tls_intermediate_ca"
|
||||
|
||||
"--skip=sources::host_metrics::cgroups::tests::generates_cgroups_metrics"
|
||||
];
|
||||
|
||||
# recent overhauls of DNS support in 0.9 mean that we try to resolve
|
||||
# vector.dev during the checkPhase, which obviously isn't going to work.
|
||||
|
|
|
@ -12,13 +12,14 @@ rustPlatform.buildRustPackage rec {
|
|||
sha256 = "sha256-jwoWxK4phBqhIeo3+oRnpGsfvtn9gTR1ryd4N+0Lmbw=";
|
||||
};
|
||||
|
||||
cargoBuildFlags = [ "--features=ssl" ];
|
||||
cargoSha256 = "sha256-+3SG1maarY4DJ4+QiYGwltGLksOoOhKtcqstRwgzi2k=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
buildInputs = [ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [ libiconv Security ];
|
||||
|
||||
buildFeatures = [ "ssl" ];
|
||||
|
||||
# Needed to get openssl-sys to use pkg-config.
|
||||
OPENSSL_NO_VENDOR=1;
|
||||
|
||||
|
|
|
@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
# I'm picking pancurses for Windows simply because that's the example given in Cursive's
|
||||
# documentation for picking an alternative backend. We could just as easily pick crossterm.
|
||||
cargoBuildFlags = lib.optionals (!useNcurses) [ "--no-default-features" "--features pancurses-backend" ];
|
||||
buildNoDefaultFeatures = !useNcurses;
|
||||
buildFeatures = lib.optional (!useNcurses) "pancurses-backend";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A visual hex viewer for the terminal";
|
||||
|
|
|
@ -15,7 +15,9 @@ rustPlatform.buildRustPackage rec {
|
|||
cargoBuildFlags = "-p ${pname}";
|
||||
|
||||
# FIXME can’t test --all-targets and --doc in a single invocation
|
||||
cargoTestFlags = "--features std --all-targets --workspace";
|
||||
checkFeatures = [ "std" ];
|
||||
|
||||
cargoTestFlags = [ "--all-targets" "--workspace" ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ]
|
||||
++ lib.optional stdenv.isDarwin llvmPackages.libclang;
|
||||
|
|
|
@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
dontConfigure = true;
|
||||
|
||||
makeFlags = lib.optional stdenv.isDarwin "OPTFLAGS=-O0";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
|
|
|
@ -15,9 +15,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoSha256 = "sha256-e20POz9ZvuT0S+YG+9x7hcudhXQpOR4rVSFJbz76OI0=";
|
||||
|
||||
cargoBuildFlags = lib.optionals withJson [ "--features" "json" ];
|
||||
|
||||
cargoCheckFlags = cargoBuildFlags;
|
||||
buildFeatures = lib.optional withJson "json";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Lints and suggestions for the nix programming language";
|
||||
|
|
|
@ -32,8 +32,7 @@ rustPlatform.buildRustPackage rec {
|
|||
Security
|
||||
];
|
||||
|
||||
# enables `cargo audit fix`
|
||||
cargoBuildFlags = [ "--features fix" ];
|
||||
buildFeatures = [ "fix" ];
|
||||
|
||||
# The tests require network access which is not available in sandboxed Nix builds.
|
||||
doCheck = false;
|
||||
|
|
|
@ -14,12 +14,16 @@ rustPlatform.buildRustPackage rec {
|
|||
cargoSha256 = "159a5ph1gxwcgahyr8885lq3c1w76nxzfrfdpyqixqrr7jzx2rd3";
|
||||
cargoDepsName = pname;
|
||||
|
||||
cargoBuildFlags = [ "--bin sy" "--features" "vault,extract,completions,substitute,process" ];
|
||||
|
||||
nativeBuildInputs = [ libgpg-error gpgme gettext installShellFiles ];
|
||||
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
buildFeatures = [ "vault" "extract" "completions" "substitute" "process" ];
|
||||
|
||||
checkFeatures = [ ];
|
||||
|
||||
cargoBuildFlags = [ "--bin" "sy" ];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd sy \
|
||||
--bash <($out/bin/sy completions bash) \
|
||||
|
|
|
@ -3,10 +3,7 @@
|
|||
, libiconv, Security, CoreServices
|
||||
, dbBackend ? "sqlite", libmysqlclient, postgresql }:
|
||||
|
||||
let
|
||||
featuresFlag = "--features ${dbBackend}";
|
||||
|
||||
in rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "vaultwarden";
|
||||
version = "1.23.0";
|
||||
|
||||
|
@ -35,14 +32,7 @@ in rustPlatform.buildRustPackage rec {
|
|||
# This may be removed if https://github.com/dani-garcia/vaultwarden/issues/712 is fixed.
|
||||
RUSTC_BOOTSTRAP = 1;
|
||||
|
||||
cargoBuildFlags = [ featuresFlag ];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
echo "Running cargo cargo test ${featuresFlag} -- ''${checkFlags} ''${checkFlagsArray+''${checkFlagsArray[@]}}"
|
||||
cargo test ${featuresFlag} -- ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"}
|
||||
runHook postCheck
|
||||
'';
|
||||
buildFeatures = dbBackend;
|
||||
|
||||
passthru.tests = nixosTests.vaultwarden;
|
||||
|
||||
|
|
|
@ -18,12 +18,13 @@ rustPlatform.buildRustPackage rec {
|
|||
sha256 = "1bn364rmp0q86rd7vgv4n7x09cdf9m4njcaq92jnk85ni6h147ax";
|
||||
};
|
||||
|
||||
cargoBuildFlags = lib.optionals nvidiaSupport [ "--features" "nvidia" ];
|
||||
cargoSha256 = "0c2mk2bcz4qjyqmf11yqhnhy4pqxr77b3c1gvr5jfmjshx4ff7v2";
|
||||
|
||||
nativeBuildInputs = lib.optional nvidiaSupport makeWrapper;
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ IOKit ];
|
||||
|
||||
buildFeatures = lib.optional nvidiaSupport "nvidia";
|
||||
|
||||
postInstall = lib.optionalString nvidiaSupport ''
|
||||
wrapProgram $out/bin/zenith \
|
||||
--suffix LD_LIBRARY_PATH : "/run/opengl-driver/lib"
|
||||
|
|
|
@ -22,13 +22,13 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoSha256 = "1kfdgh8dra4jxgcdb0lln5wwrimz0dpp33bq3h7jgs8ngaq2a9wp";
|
||||
|
||||
cargoBuildFlags = lib.optional withPCRE2 "--features pcre2";
|
||||
|
||||
nativeBuildInputs = [ asciidoctor installShellFiles ]
|
||||
++ lib.optional withPCRE2 pkg-config;
|
||||
buildInputs = lib.optional withPCRE2 pcre2
|
||||
++ lib.optional stdenv.isDarwin Security;
|
||||
|
||||
buildFeatures = lib.optional withPCRE2 "pcre2";
|
||||
|
||||
preFixup = ''
|
||||
installManPage $releaseDir/build/ripgrep-*/out/rg.1
|
||||
|
||||
|
|
|
@ -76,6 +76,7 @@ mapAliases ({
|
|||
bazaarTools = throw "bazaar has been deprecated by breezy."; # added 2020-04-19
|
||||
bcat = throw "bcat has been removed because upstream is dead"; # added 2021-08-22
|
||||
beegfs = throw "beegfs has been removed."; # added 2019-11-24
|
||||
beret = throw "beret has been removed"; # added 2021-11-16
|
||||
bluezFull = bluez; # Added 2019-12-03
|
||||
bpftool = bpftools; # Added 2021-05-03
|
||||
brackets = throw "brackets has been removed, it was unmaintained and had open vulnerabilities"; # added 2021-01-24
|
||||
|
|
|
@ -12819,6 +12819,7 @@ with pkgs;
|
|||
cargo-deny = callPackage ../development/tools/rust/cargo-deny {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
cargo-depgraph = callPackage ../development/tools/rust/cargo-depgraph { };
|
||||
cargo-dephell = callPackage ../development/tools/rust/cargo-dephell {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
@ -29850,8 +29851,6 @@ with pkgs;
|
|||
|
||||
bench = haskell.lib.compose.justStaticExecutables haskellPackages.bench;
|
||||
|
||||
beret = callPackage ../games/beret { };
|
||||
|
||||
black-hole-solver = callPackage ../games/black-hole-solver {
|
||||
inherit (perlPackages) PathTiny;
|
||||
};
|
||||
|
|
|
@ -3468,6 +3468,8 @@ in {
|
|||
|
||||
hdbscan = callPackage ../development/python-modules/hdbscan { };
|
||||
|
||||
hdfs = callPackage ../development/python-modules/hdfs { };
|
||||
|
||||
hdlparse = callPackage ../development/python-modules/hdlparse { };
|
||||
|
||||
hdmedians = callPackage ../development/python-modules/hdmedians { };
|
||||
|
@ -6304,6 +6306,8 @@ in {
|
|||
|
||||
pydbus = callPackage ../development/python-modules/pydbus { };
|
||||
|
||||
pydeck = callPackage ../development/python-modules/pydeck { };
|
||||
|
||||
pydeconz = callPackage ../development/python-modules/pydeconz { };
|
||||
|
||||
pydelijn = callPackage ../development/python-modules/pydelijn { };
|
||||
|
@ -9091,6 +9095,8 @@ in {
|
|||
|
||||
tailer = callPackage ../development/python-modules/tailer { };
|
||||
|
||||
tailscale = callPackage ../development/python-modules/tailscale { };
|
||||
|
||||
tappy = callPackage ../development/python-modules/tappy { };
|
||||
|
||||
tasklib = callPackage ../development/python-modules/tasklib { };
|
||||
|
|
Loading…
Reference in a new issue