Merge master into staging-next
This commit is contained in:
@@ -179,7 +179,7 @@ let
|
||||
hasSharedLibraries = with final;
|
||||
(isAndroid || isGnu || isMusl # Linux (allows multiple libcs)
|
||||
|| isDarwin || isSunOS || isOpenBSD || isFreeBSD || isNetBSD # BSDs
|
||||
|| isCygwin || isMinGW # Windows
|
||||
|| isCygwin || isMinGW || isWindows # Windows
|
||||
|| isWasm # WASM
|
||||
) && !isStatic;
|
||||
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config
|
||||
{ lib, stdenv, fetchsvn, fetchpatch2, pkg-config
|
||||
, autoreconfHook, autoconf-archive
|
||||
, ncurses, db , popt, libtool
|
||||
, libiconv, CoreServices
|
||||
# Sound sub-systems
|
||||
, alsaSupport ? (!stdenv.isDarwin), alsa-lib
|
||||
, pulseSupport ? true, libpulseaudio, autoreconfHook
|
||||
, pulseSupport ? true, libpulseaudio
|
||||
, jackSupport ? true, libjack2
|
||||
, ossSupport ? true
|
||||
# Audio formats
|
||||
@@ -15,7 +16,7 @@
|
||||
, musepackSupport ? true, libmpc, libmpcdec, taglib
|
||||
, vorbisSupport ? true, libvorbis
|
||||
, speexSupport ? true, speex
|
||||
, ffmpegSupport ? true, ffmpeg_4
|
||||
, ffmpegSupport ? true, ffmpeg_7
|
||||
, sndfileSupport ? true, libsndfile
|
||||
, wavpackSupport ? true, wavpack
|
||||
# Misc
|
||||
@@ -24,22 +25,39 @@
|
||||
, withDebug ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "moc";
|
||||
version = "2.5.2";
|
||||
version = "2.6-alpha3-unstable-2019-09-14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.daper.net/pub/soft/moc/stable/moc-${version}.tar.bz2";
|
||||
sha256 = "026v977kwb0wbmlmf6mnik328plxg8wykfx9ryvqhirac0aq39pk";
|
||||
src = fetchsvn {
|
||||
url = "svn://svn.daper.net/moc/trunk";
|
||||
rev = "3005";
|
||||
hash = "sha256-JksJxHQgQ8hPTFtLvEvZuFh2lflDNrEmDTMWWwVnjZQ=";
|
||||
};
|
||||
|
||||
patches = []
|
||||
++ lib.optional ffmpegSupport ./moc-ffmpeg4.patch
|
||||
++ lib.optional pulseSupport ./pulseaudio.patch;
|
||||
patches = [
|
||||
# FFmpeg 6 support
|
||||
(fetchpatch2 {
|
||||
url = "https://cygwin.com/cgit/cygwin-packages/moc/plain/Support-for-recent-ffmpeg-change.patch?id=ab70f1306b8416852915be4347003aac3bdc216";
|
||||
hash = "sha256-5hLEFBJ+7Nvxn6pNj4bngcg2qJsCzxiuP6yEj+7tvs0=";
|
||||
stripLen = 1;
|
||||
})
|
||||
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ lib.optional pulseSupport autoreconfHook;
|
||||
# FFmpeg 7 support
|
||||
(fetchpatch2 {
|
||||
url = "https://cygwin.com/cgit/cygwin-packages/moc/plain/ffmpeg-7.0.patch?id=ab70f1306b8416852915be4347003aac3bdc216e";
|
||||
hash = "sha256-dYw6DNyw61MGfv+GdBz5Dtrr9fVph1tf7vxexWONwF8=";
|
||||
stripLen = 1;
|
||||
})
|
||||
|
||||
./use-ax-check-compile-flag.patch
|
||||
] ++ lib.optional pulseSupport ./pulseaudio.patch;
|
||||
|
||||
postPatch = ''
|
||||
rm m4/*
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook autoconf-archive ];
|
||||
|
||||
buildInputs = [ ncurses db popt libtool ]
|
||||
# Sound sub-systems
|
||||
@@ -56,7 +74,7 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optionals musepackSupport [ libmpc libmpcdec taglib ]
|
||||
++ lib.optional vorbisSupport libvorbis
|
||||
++ lib.optional speexSupport speex
|
||||
++ lib.optional ffmpegSupport ffmpeg_4
|
||||
++ lib.optional ffmpegSupport ffmpeg_7
|
||||
++ lib.optional sndfileSupport libsndfile
|
||||
++ lib.optional wavpackSupport wavpack
|
||||
# Misc
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
Index: decoder_plugins/ffmpeg/ffmpeg.c
|
||||
===================================================================
|
||||
--- /decoder_plugins/ffmpeg/ffmpeg.c (revisión: 2963)
|
||||
+++ /decoder_plugins/ffmpeg/ffmpeg.c (copia de trabajo)
|
||||
@@ -697,7 +697,7 @@
|
||||
* FFmpeg/LibAV in use. For some versions this will be caught in
|
||||
* *_find_stream_info() above and misreported as an unfound codec
|
||||
* parameters error. */
|
||||
- if (data->codec->capabilities & CODEC_CAP_EXPERIMENTAL) {
|
||||
+ if (data->codec->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
|
||||
decoder_error (&data->error, ERROR_FATAL, 0,
|
||||
"The codec is experimental and may damage MOC: %s",
|
||||
data->codec->name);
|
||||
@@ -705,8 +705,8 @@
|
||||
}
|
||||
|
||||
set_downmixing (data);
|
||||
- if (data->codec->capabilities & CODEC_CAP_TRUNCATED)
|
||||
- data->enc->flags |= CODEC_FLAG_TRUNCATED;
|
||||
+ if (data->codec->capabilities & AV_CODEC_CAP_TRUNCATED)
|
||||
+ data->enc->flags |= AV_CODEC_FLAG_TRUNCATED;
|
||||
|
||||
if (avcodec_open2 (data->enc, data->codec, NULL) < 0)
|
||||
{
|
||||
@@ -725,7 +725,7 @@
|
||||
|
||||
data->sample_width = sfmt_Bps (data->fmt);
|
||||
|
||||
- if (data->codec->capabilities & CODEC_CAP_DELAY)
|
||||
+ if (data->codec->capabilities & AV_CODEC_CAP_DELAY)
|
||||
data->delay = true;
|
||||
data->seek_broken = is_seek_broken (data);
|
||||
data->timing_broken = is_timing_broken (data->ic);
|
||||
@@ -0,0 +1,43 @@
|
||||
diff --git a/configure.in b/configure.in
|
||||
index eb71bdf0b0...342baf10c5 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -102,16 +102,16 @@
|
||||
|
||||
AC_C_CONST
|
||||
AC_TYPE_INTPTR_T
|
||||
-AX_CFLAGS_GCC_OPTION(-Wall)
|
||||
-AX_CFLAGS_GCC_OPTION(-Wextra)
|
||||
+AX_CHECK_COMPILE_FLAG(-Wall)
|
||||
+AX_CHECK_COMPILE_FLAG(-Wextra)
|
||||
|
||||
dnl Overly-enthusiastic warning suppression.
|
||||
save_CFLAGS="$CFLAGS"
|
||||
-AX_CFLAGS_GCC_OPTION([-Wgnu-zero-variadic-macro-arguments], ,
|
||||
+AX_CHECK_COMPILE_FLAG([-Wgnu-zero-variadic-macro-arguments],
|
||||
AC_DEFINE([HAVE_VARIADIC_MACRO_WARNING], 1,
|
||||
[Define if compiler recognises warning option]))
|
||||
-AX_CFLAGS_GCC_OPTION([-Werror=unknown-warning-option])
|
||||
-AX_CFLAGS_GCC_OPTION([-Wformat-truncation], ,
|
||||
+AX_CHECK_COMPILE_FLAG([-Werror=unknown-warning-option])
|
||||
+AX_CHECK_COMPILE_FLAG([-Wformat-truncation],
|
||||
AC_DEFINE([HAVE_FORMAT_TRUNCATION_WARNING], 1,
|
||||
[Define if compiler recognises warning option]))
|
||||
CFLAGS="$save_CFLAGS"
|
||||
@@ -242,13 +242,13 @@
|
||||
else
|
||||
if test "x$enable_debug" = "xgdb"
|
||||
then
|
||||
- AX_CFLAGS_GCC_OPTION([-ggdb])
|
||||
- AX_CFLAGS_GCC_OPTION([-O0])
|
||||
+ AX_CHECK_COMPILE_FLAG([-ggdb])
|
||||
+ AX_CHECK_COMPILE_FLAG([-O0])
|
||||
COMPILE_DEBUG='gdb'
|
||||
fi
|
||||
if test "x$ac_cv_cflags_gcc_option__ggdb" = "x"
|
||||
then
|
||||
- AX_CFLAGS_GCC_OPTION([-g])
|
||||
+ AX_CHECK_COMPILE_FLAG([-g])
|
||||
COMPILE_DEBUG='yes'
|
||||
fi
|
||||
EXTRA_OBJS="$EXTRA_OBJS null_out.o md5.o"
|
||||
+2168
-1310
File diff suppressed because it is too large
Load Diff
@@ -12,26 +12,31 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cosmic-workspaces-epoch";
|
||||
version = "unstable-2023-11-21";
|
||||
version = "1.0.0-alpha.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = pname;
|
||||
rev = "f61cdc5759235177521fbb6a39f164b9615adfc0";
|
||||
hash = "sha256-ZPkPqROZXRLLhv6fbjfsov5hIt+D0K7VFajKebHVZaw=";
|
||||
rev = "epoch-${version}";
|
||||
hash = "sha256-z3xQ6Vgqkm8hYLo2550NbFRkTMRQ0F9zn85iobnykH4=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"accesskit-0.11.0" = "sha256-xVhe6adUb8VmwIKKjHxwCwOo5Y1p3Or3ylcJJdLDrrE=";
|
||||
"accesskit-0.12.2" = "sha256-1UwgRyUe0PQrZrpS7574oNLi13fg5HpgILtZGW6JNtQ=";
|
||||
"atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA=";
|
||||
"smithay-client-toolkit-0.18.0" = "sha256-2WbDKlSGiyVmi7blNBr2Aih9FfF2dq/bny57hoA4BrE=";
|
||||
"cosmic-comp-config-0.1.0" = "sha256-NKXIKhZLwZ0BZyGVEplAJ75H5YOsLRNeRrzdhczo3FQ=";
|
||||
"cosmic-config-0.1.0" = "sha256-CxeefjDmEqQkXPhWTomF1yb4GCI9vs3OCvMawBGUgaw=";
|
||||
"cosmic-protocols-0.1.0" = "sha256-st46wmOncJvu0kj6qaot6LT/ojmW/BwXbbGf8s0mdZ8=";
|
||||
"softbuffer-0.3.3" = "sha256-eKYFVr6C1+X6ulidHIu9SP591rJxStxwL9uMiqnXx4k=";
|
||||
"taffy-0.3.11" = "sha256-+gXAFZsS1cWxEisEpP0FMz9q1/UV7L2Ri4ToIP5Bt7s=";
|
||||
"clipboard_macos-0.1.0" = "sha256-cG5vnkiyDlQnbEfV2sPbmBYKv1hd3pjJrymfZb8ziKk=";
|
||||
"cosmic-bg-config-0.1.0" = "sha256-imGSOPS/ay3EycyrrQcIePDXNEYRk7NTAV+EtUPtEdg=";
|
||||
"cosmic-client-toolkit-0.1.0" = "sha256-1XtyEvednEMN4MApxTQid4eed19dEN5ZBDt/XRjuda0=";
|
||||
"cosmic-comp-config-0.1.0" = "sha256-Y/U4hYY9Scj+0QdJfW++fUzmVXswguy0PMJoLYDrp4I=";
|
||||
"cosmic-config-0.1.0" = "sha256-DgMh0gqWUmXjBhBySR0CMnv/8O3XbS2BwomU9eNt+4o=";
|
||||
"cosmic-text-0.12.1" = "sha256-x0XTxzbmtE2d4XCG/Nuq3DzBpz15BbnjRRlirfNJEiU=";
|
||||
"d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4=";
|
||||
"glyphon-0.5.0" = "sha256-j1HrbEpUBqazWqNfJhpyjWuxYAxkvbXzRKeSouUoPWg=";
|
||||
"smithay-clipboard-0.8.0" = "sha256-4InFXm0ahrqFrtNLeqIuE3yeOpxKZJZx+Bc0yQDtv34=";
|
||||
"softbuffer-0.4.1" = "sha256-a0bUFz6O8CWRweNt/OxTvflnPYwO5nm6vsyc/WcXyNg=";
|
||||
"taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI=";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -40,6 +45,12 @@ rustPlatform.buildRustPackage rec {
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libxkbcommon libinput libglvnd mesa udev wayland ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/{applications,icons/hicolor/scalable/apps}
|
||||
cp data/*.desktop $out/share/applications/
|
||||
cp data/*.svg $out/share/icons/hicolor/scalable/apps/
|
||||
'';
|
||||
|
||||
# Force linking to libEGL, which is always dlopen()ed, and to
|
||||
# libwayland-client, which is always dlopen()ed except by the
|
||||
# obscure winit backend.
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gerrit";
|
||||
version = "3.10.0";
|
||||
version = "3.10.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war";
|
||||
hash = "sha256-mlaXCRQlqg2uwzm2/Vi15K5D6lmUUscfZQk/lW1YR+s=";
|
||||
hash = "sha256-gWONjpn/YrSHtabacI+7Ao9pGeqcialRaaca2ct5oDM=";
|
||||
};
|
||||
|
||||
buildCommand = ''
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
"stable": {
|
||||
"version": "5.5.0",
|
||||
"hash": "sha256-co/B22kF0D9LBb569zzaCi7aew3pFDz/W5UV8KxoA4g="
|
||||
"version": "5.5.11452",
|
||||
"hash": "sha256-SIOzKgxuVKnMnjybY0LValAOBKso+XishfDVK5JfVPs="
|
||||
},
|
||||
"beta": {
|
||||
"version": "5.5.0",
|
||||
"hash": "sha256-co/B22kF0D9LBb569zzaCi7aew3pFDz/W5UV8KxoA4g="
|
||||
"version": "5.5.11452",
|
||||
"hash": "sha256-SIOzKgxuVKnMnjybY0LValAOBKso+XishfDVK5JfVPs="
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
CoreServices ? darwin.apple_sdk.frameworks.CoreServices,
|
||||
}:
|
||||
let
|
||||
version = "0.6.1";
|
||||
version = "0.6.2";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "mdbook-alerts";
|
||||
@@ -17,10 +17,10 @@ rustPlatform.buildRustPackage {
|
||||
owner = "lambdalisue";
|
||||
repo = "rs-mdbook-alerts";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-aCuufzCNKKUzyKS2/N2QokmO7e14TMfyd7yCjRsM0EE=";
|
||||
hash = "sha256-wbXBsLOxQPEOzPcTOpG28B8Or74WGiAhgaLwnHAwT0g=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Nimkusc4Rautp+SxOsPq9txx9loIziSzQpG16mHQGb0=";
|
||||
cargoHash = "sha256-Q+mq6xu8fK6Jwee3x4hzHmC2zudV9IcGV0JfJRoKNMQ=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
stdenv,
|
||||
fetchzip,
|
||||
makeWrapper,
|
||||
jre,
|
||||
openjdk17,
|
||||
python3,
|
||||
unzip,
|
||||
}:
|
||||
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
jre
|
||||
openjdk17
|
||||
makeWrapper
|
||||
unzip
|
||||
];
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
makeWrapper ${python3}/bin/python $out/bin/nzbhydra2 \
|
||||
--add-flags "$out/lib/nzbhydra2/nzbhydra2wrapperPy3.py" \
|
||||
--prefix PATH ":" ${jre}/bin
|
||||
--prefix PATH ":" ${openjdk17}/bin
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "rakshasa-rtorrent";
|
||||
version = "0.9.8-unstable-2023-03-16";
|
||||
version = "0.9.8-unstable-2024-08-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rakshasa";
|
||||
repo = "rtorrent";
|
||||
rev = "1da0e3476dcabbf74b2e836d6b4c37b4d96bde09";
|
||||
hash = "sha256-OXOZSMuNAU+VGwNyyfzcmkTRjDJq9HsKUNxZDYpSvFQ=";
|
||||
rev = "892e595015404c125df4a836b2a4fa18c01b4586";
|
||||
hash = "sha256-y7VlpviWT4kq4sfeWq00qM40tBAyGFBAplwrji45dOc=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
diff --git a/crates/turborepo-lib/src/lib.rs b/crates/turborepo-lib/src/lib.rs
|
||||
index e8d41933da..26b8c7c92f 100644
|
||||
--- a/crates/turborepo-lib/src/lib.rs
|
||||
+++ b/crates/turborepo-lib/src/lib.rs
|
||||
@@ -2,6 +2,7 @@
|
||||
#![feature(box_patterns)]
|
||||
#![feature(error_generic_member_access)]
|
||||
#![feature(hash_extract_if)]
|
||||
+#![feature(lazy_cell)]
|
||||
#![feature(option_get_or_insert_default)]
|
||||
#![feature(once_cell_try)]
|
||||
#![feature(panic_info_message)]
|
||||
@@ -0,0 +1,96 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
capnproto,
|
||||
darwin,
|
||||
extra-cmake-modules,
|
||||
fontconfig,
|
||||
llvmPackages,
|
||||
nix-update-script,
|
||||
openssl,
|
||||
pkg-config,
|
||||
protobuf,
|
||||
rust-jemalloc-sys,
|
||||
zlib,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "turbo-unwrapped";
|
||||
version = "2.0.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vercel";
|
||||
repo = "turbo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-rh9BX8M3Kgu07Pz4G3AM6S9zeK3Bb6CzOpcYo7rQgIw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# upstream uses nightly where lazy_cell is stable
|
||||
./enable-lazy_cell.patch
|
||||
];
|
||||
|
||||
cargoHash = "sha256-oZHSoPrPCUwXSrxEASm4LuYO+XHyNDRRl38Q7U7F/lk=";
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
capnproto
|
||||
extra-cmake-modules
|
||||
pkg-config
|
||||
protobuf
|
||||
]
|
||||
# https://github.com/vercel/turbo/blob/ea740706e0592b3906ab34c7cfa1768daafc2a84/CONTRIBUTING.md#linux-dependencies
|
||||
++ lib.optional stdenv.isLinux llvmPackages.bintools;
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
fontconfig
|
||||
openssl
|
||||
rust-jemalloc-sys
|
||||
zlib
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin (
|
||||
with darwin.apple_sdk_11_0.frameworks;
|
||||
[
|
||||
CoreFoundation
|
||||
CoreServices
|
||||
IOKit
|
||||
]
|
||||
);
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--package"
|
||||
"turbo"
|
||||
];
|
||||
|
||||
# Browser tests time out with chromium and google-chrome
|
||||
doCheck = false;
|
||||
|
||||
env = {
|
||||
# nightly features are used
|
||||
RUSTC_BOOTSTRAP = 1;
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"'v(\d+\.\d+\.\d+)'"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "High-performance build system for JavaScript and TypeScript codebases";
|
||||
homepage = "https://turbo.build/";
|
||||
changelog = "https://github.com/vercel/turbo/releases/tag/v${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
dlip
|
||||
getchoo
|
||||
];
|
||||
mainProgram = "turbo";
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
{
|
||||
lib,
|
||||
symlinkJoin,
|
||||
makeBinaryWrapper,
|
||||
testers,
|
||||
turbo,
|
||||
turbo-unwrapped,
|
||||
# https://turbo.build/repo/docs/telemetry
|
||||
disableTelemetry ? true,
|
||||
disableUpdateNotifier ? true,
|
||||
}:
|
||||
|
||||
symlinkJoin rec {
|
||||
pname = "turbo";
|
||||
inherit (turbo-unwrapped) version;
|
||||
name = "${pname}-${version}";
|
||||
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
|
||||
paths = [ turbo-unwrapped ];
|
||||
|
||||
postBuild = ''
|
||||
wrapProgram $out/bin/turbo \
|
||||
${lib.optionalString disableTelemetry "--set TURBO_TELEMETRY_DISABLED 1"} \
|
||||
${lib.optionalString disableUpdateNotifier "--set TURBO_NO_UPDATE_NOTIFIER 1"}
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion { package = turbo; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
inherit (turbo-unwrapped.meta)
|
||||
description
|
||||
homepage
|
||||
changelog
|
||||
license
|
||||
mainProgram
|
||||
maintainers
|
||||
;
|
||||
};
|
||||
}
|
||||
@@ -27,13 +27,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "uwsm";
|
||||
version = "0.17.4";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Vladimir-csp";
|
||||
repo = "uwsm";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-wjKFaZBEA5nbUob6czwJqny62rJdCoWEM3IUl1fTWOw=";
|
||||
hash = "sha256-VGywdMRHJaQgWD9EurYdMTlbOo8Wu8NWiLuiY7xJh4M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
+5394
-592
File diff suppressed because it is too large
Load Diff
@@ -1,8 +1,9 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, gst_all_1
|
||||
, mesa
|
||||
, pkg-config
|
||||
, libglvnd
|
||||
, libxkbcommon
|
||||
, pipewire
|
||||
@@ -11,22 +12,37 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "xdg-desktop-portal-cosmic";
|
||||
version = "unstable-2023-12-07";
|
||||
version = "1.0.0-alpha.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = pname;
|
||||
rev = "23b3e5a1b9fa76e30266f29949d54e97c2fadf6e";
|
||||
hash = "sha256-AqwJ3bV8Xz0MpY/ZmWgE9vNJIACX5SVeIYbSewyG/Bs=";
|
||||
rev = "epoch-${version}";
|
||||
hash = "sha256-HjQ8VttWjWcMfVBXyeiju27nyZziY/5V1csUEstqTtE=";
|
||||
};
|
||||
|
||||
env.VERGEN_GIT_COMMIT_DATE = "2024-08-02";
|
||||
env.VERGEN_GIT_SHA = src.rev;
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"smithay-client-toolkit-0.18.0" = "sha256-2WbDKlSGiyVmi7blNBr2Aih9FfF2dq/bny57hoA4BrE=";
|
||||
"cosmic-protocols-0.1.0" = "sha256-AEgvF7i/OWPdEMi8WUaAg99igBwE/AexhAXHxyeJMdc=";
|
||||
"ashpd-0.7.0" = "sha256-jBuxKJ2ADBvkJPPv4gzmFlZFybrfZBkCjerzeKe2Tt4=";
|
||||
"libspa-0.7.2" = "sha256-QWOcNWzEyxfTdjUIB33s9dpWJ7Fsfmb5jd70CXOP/bw=";
|
||||
"accesskit-0.12.2" = "sha256-1UwgRyUe0PQrZrpS7574oNLi13fg5HpgILtZGW6JNtQ=";
|
||||
"atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA=";
|
||||
"clipboard_macos-0.1.0" = "sha256-cG5vnkiyDlQnbEfV2sPbmBYKv1hd3pjJrymfZb8ziKk=";
|
||||
"cosmic-bg-config-0.1.0" = "sha256-e195Hp0LD0bvHRi3AQvtQ9vccgWBqYwna6g+4U8rWdI=";
|
||||
"cosmic-client-toolkit-0.1.0" = "sha256-1XtyEvednEMN4MApxTQid4eed19dEN5ZBDt/XRjuda0=";
|
||||
"cosmic-config-0.1.0" = "sha256-l4LKJ19/5UOMm8oWhhVFvoN4Kbar/EMwBKaiA8RZ7VU=";
|
||||
"cosmic-files-0.1.0" = "sha256-ZEAWOvT8rlM5dke5pYeGu1MO8umPu0LQmUkNq4BGPsQ=";
|
||||
"cosmic-settings-daemon-0.1.0" = "sha256-+1XB7r45Uc71fLnNR4U0DUF2EB8uzKeE4HIrdvKhFXo=";
|
||||
"cosmic-text-0.12.0" = "sha256-x7UMzlzYkWySFgSQTO1rRn+pyPG9tXKpJ7gzx/wpm8U=";
|
||||
"d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4=";
|
||||
"glyphon-0.5.0" = "sha256-j1HrbEpUBqazWqNfJhpyjWuxYAxkvbXzRKeSouUoPWg=";
|
||||
"libspa-0.8.0" = "sha256-iOT9y8hppY9hisHdbMRAhkRIAB/wzNnjWzAgT2Vf6eY=";
|
||||
"smithay-clipboard-0.8.0" = "sha256-pBQZ+UXo9hZ907mfpcZk+a+8pKrIWdczVvPkjT3TS8U=";
|
||||
"softbuffer-0.4.1" = "sha256-a0bUFz6O8CWRweNt/OxTvflnPYwO5nm6vsyc/WcXyNg=";
|
||||
"taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI=";
|
||||
"winit-0.29.10" = "sha256-ScTII2AzK3SC8MVeASZ9jhVWsEaGrSQ2BnApTxgfxK4=";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -34,6 +50,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
nativeBuildInputs = [ rustPlatform.bindgenHook pkg-config ];
|
||||
buildInputs = [ libglvnd libxkbcommon mesa pipewire wayland ];
|
||||
checkInputs = [ gst_all_1.gstreamer ];
|
||||
|
||||
# Force linking to libEGL, which is always dlopen()ed, and to
|
||||
# libwayland-client, which is always dlopen()ed except by the
|
||||
|
||||
@@ -163,7 +163,7 @@ in
|
||||
hash = "sha256-QP5/jwexQXai1A5Iiwiyrm+/vkdAc+9NVGt+jEQz2mY=";
|
||||
};
|
||||
haxe_4_3 = generic {
|
||||
version = "4.3.5";
|
||||
hash = "sha256-vms7FoOL8cDPorHd/EJq8HEHGRX1JfL8EZmDtxW9lOw=";
|
||||
version = "4.3.6";
|
||||
hash = "sha256-m/A0xxB3fw+syPmH1GPKKCcj0a2G/HMRKOu+FKrO5jQ=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -366,7 +366,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.34.157";
|
||||
version = "1.34.158";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -374,7 +374,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "boto3_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-paCANr9V+SblJzvHRTW9WL1uaNO5Hx3FEWBf4h8Mzz4=";
|
||||
hash = "sha256-APECk1mT4NCQQnrHkqTsU5Dk1nD6w5xbXNQ9mb0Ejc4=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "botocore-stubs";
|
||||
version = "1.34.156";
|
||||
version = "1.34.158";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "botocore_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-u1rRaHzTYwNcPwAIVFQkdgQEVWKUY9Tk2x6/QQSKTAY=";
|
||||
hash = "sha256-XeDJ5uZ4cLEyBmTcUL9T2/beUiksuW2PCBNYkU8KAQ4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-stubs-ext";
|
||||
version = "5.0.3";
|
||||
version = "5.0.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "django_stubs_ext";
|
||||
inherit version;
|
||||
hash = "sha256-zTYfW5Ucar34Z8VdJHVB8GCdHoM0zLCcehKRARFCUjQ=";
|
||||
hash = "sha256-hdoGUiQgR3Qgi+KcfQK0SC1aaSGKcoRlwvvkFyX9yBk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "model-bakery";
|
||||
version = "1.18.2";
|
||||
version = "1.19.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "model-bakers";
|
||||
repo = "model_bakery";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-X+P4ajTtjzIUFlOGM5D87oEb8nN1MFUyKtNy8RKAvB0=";
|
||||
hash = "sha256-OSLRFuBG4GamSOpZvkPvoBanmRdDM8lCTNOwwZVjyEQ=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pycddl";
|
||||
version = "0.6.1";
|
||||
format = "pyproject";
|
||||
version = "0.6.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-63fe8UJXEH6t4l7ujV8JDvlGb7q3kL6fHHATFdklzFc=";
|
||||
hash = "sha256-lVybSr+QvyepdTZfiTjqU0ENu6TT87ZZXIECBA8nMV4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with rustPlatform; [
|
||||
@@ -42,7 +42,7 @@ buildPythonPackage rec {
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-ssDEKRd3Y9/10oXBZHCxvlRkl9KMh3pGYbCkM4rXThQ=";
|
||||
hash = "sha256-VpJ/PLAwwuakwsNAtLDdWGXCxl6jGMTvsEhzIHk6a0g=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydrawise";
|
||||
version = "2024.6.5";
|
||||
version = "2024.8.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "dknowles2";
|
||||
repo = "pydrawise";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ug9gADM6ig6i2mu3GhQ+vsbNf3vEfR4L7OQ5Ixuh5so=";
|
||||
hash = "sha256-svy2bYyXDmN4mZK3VqVjr7GLUgnin09aEoTMKKbPJxk=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
fetchFromGitHub,
|
||||
gevent,
|
||||
jinja2,
|
||||
packaging,
|
||||
paramiko,
|
||||
pytestCheckHook,
|
||||
python-dateutil,
|
||||
@@ -15,35 +16,41 @@
|
||||
pywinrm,
|
||||
pyyaml,
|
||||
setuptools,
|
||||
typeguard,
|
||||
typing-extensions,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyinfra";
|
||||
version = "2.9.2";
|
||||
format = "setuptools";
|
||||
version = "3.0.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Fizzadar";
|
||||
repo = pname;
|
||||
repo = "pyinfra";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-lzbFwAg1aLCfBnSnqq4oVteArpkRBa7hU8V3vB5ODa8=";
|
||||
hash = "sha256-Pjmh/aPsMIwGv5Agf+UGm1T3jv8i9jJQ7SEGc3vDxZg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
click
|
||||
colorama
|
||||
configparser
|
||||
distro
|
||||
gevent
|
||||
jinja2
|
||||
packaging
|
||||
paramiko
|
||||
python-dateutil
|
||||
pywinrm
|
||||
pyyaml
|
||||
setuptools
|
||||
];
|
||||
typeguard
|
||||
] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
@@ -56,7 +63,6 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python-based infrastructure automation";
|
||||
mainProgram = "pyinfra";
|
||||
longDescription = ''
|
||||
pyinfra automates/provisions/manages/deploys infrastructure. It can be used for
|
||||
ad-hoc command execution, service deployment, configuration management and more.
|
||||
@@ -64,7 +70,8 @@ buildPythonPackage rec {
|
||||
homepage = "https://pyinfra.com";
|
||||
downloadPage = "https://pyinfra.com/Fizzadar/pyinfra/releases";
|
||||
changelog = "https://github.com/Fizzadar/pyinfra/blob/v${version}/CHANGELOG.md";
|
||||
maintainers = with maintainers; [ totoroot ];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ totoroot ];
|
||||
mainProgram = "pyinfra";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -4,22 +4,25 @@
|
||||
fetchPypi,
|
||||
pythonOlder,
|
||||
requests,
|
||||
setuptools,
|
||||
xmltodict,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysecuritas";
|
||||
version = "0.1.6";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "W3DLZCXUH9y5NPipFEu6URmKN+oVXMgeDF1rfKtxRng=";
|
||||
hash = "sha256-W3DLZCXUH9y5NPipFEu6URmKN+oVXMgeDF1rfKtxRng=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
xmltodict
|
||||
requests
|
||||
];
|
||||
@@ -32,9 +35,9 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python client to access Securitas Direct Mobile API";
|
||||
mainProgram = "pysecuritas";
|
||||
homepage = "https://github.com/Cebeerre/pysecuritas";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "pysecuritas";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,38 +2,46 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
pythonOlder,
|
||||
mock,
|
||||
pykerberos,
|
||||
pytestCheckHook,
|
||||
requests,
|
||||
pythonOlder,
|
||||
requests-credssp,
|
||||
requests-ntlm,
|
||||
six,
|
||||
requests,
|
||||
setuptools,
|
||||
xmltodict,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pywinrm";
|
||||
version = "0.4.3";
|
||||
format = "setuptools";
|
||||
version = "0.5.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-mVZ0v1rGSyViycVlQEcxCeUw02veEMJi1aUpYSGtVWU=";
|
||||
hash = "sha256-VCjrHklK95VFRs1P8Vye8aMKdeBbJaOf1gbO8iIB6fE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
requests
|
||||
requests-ntlm
|
||||
six
|
||||
xmltodict
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
credssp = [ requests-credssp ];
|
||||
kerberos = [ pykerberos ];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
mock
|
||||
pytestCheckHook
|
||||
];
|
||||
] ++ lib.flatten (builtins.attrValues optional-dependencies);
|
||||
|
||||
pythonImportsCheck = [ "winrm" ];
|
||||
|
||||
@@ -42,6 +50,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Python library for Windows Remote Management";
|
||||
homepage = "https://github.com/diyan/pywinrm";
|
||||
changelog = "https://github.com/diyan/pywinrm/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [
|
||||
elasticdog
|
||||
|
||||
@@ -8,8 +8,8 @@ let
|
||||
hash = "sha256-2qJ6C1QbxjUyP/lsLe2ZVGf/n+bWn/ZwIVWKqa2dzDY=";
|
||||
};
|
||||
"9" = {
|
||||
version = "9.6.0";
|
||||
hash = "sha256-2uD36CLFayCXm7WWXjtzuL2rtri47xIdpthXUIWZyjU=";
|
||||
version = "9.7.0";
|
||||
hash = "sha256-s1AY+/qPWDZosmSeQHkipyE1XNgfYb7rSsHUJY5YVVk=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-udeps";
|
||||
version = "0.1.49";
|
||||
version = "0.1.50";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "est31";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XIr1erxW2S7Ok0DqsDtLn9wRT874o7tIWrt+HrjHACs=";
|
||||
sha256 = "sha256-SU9SX+Z03CnJAuR1RCdSuU5Q+lxqAbqJY4SA83Ezj8M=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-x++h5FOb5LXV9miRYZjnZcmp2Djn0P2gdBLAOO977IU=";
|
||||
cargoHash = "sha256-HWJt9WaSKVJDcUEOgi0Zai3k44KyQqs+ckTAZfZyibA=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
Generated
-13638
File diff suppressed because it is too large
Load Diff
@@ -1,73 +0,0 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, protobuf
|
||||
, rustPlatform
|
||||
, pkg-config
|
||||
, openssl
|
||||
, extra-cmake-modules
|
||||
, fontconfig
|
||||
, rust-jemalloc-sys
|
||||
, testers
|
||||
, turbo
|
||||
, nix-update-script
|
||||
, IOKit
|
||||
, CoreServices
|
||||
, CoreFoundation
|
||||
, capnproto
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec{
|
||||
pname = "turbo-unwrapped";
|
||||
version = "1.13.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vercel";
|
||||
repo = "turbo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-q1BxBAjfHyGDaH/IywPw9qnZJjzeU4tu2CyUWbnd6y8=";
|
||||
};
|
||||
cargoBuildFlags = [
|
||||
"--package"
|
||||
"turbo"
|
||||
];
|
||||
RELEASE_TURBO_CLI = "true";
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes."tui-term-0.1.8" = "sha256-MNeVnF141uNWbjqXEbHwXnMTkCnvIteb5v40HpEK6D4=";
|
||||
};
|
||||
|
||||
RUSTC_BOOTSTRAP = 1;
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
extra-cmake-modules
|
||||
protobuf
|
||||
capnproto
|
||||
];
|
||||
buildInputs = [
|
||||
openssl
|
||||
fontconfig
|
||||
rust-jemalloc-sys
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
IOKit
|
||||
CoreServices
|
||||
CoreFoundation
|
||||
];
|
||||
|
||||
# Browser tests time out with chromium and google-chrome
|
||||
doCheck = false;
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [ "--version-regex" "^\d+\.\d+\.\d+$" ];
|
||||
};
|
||||
tests.version = testers.testVersion { package = turbo; };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "High-performance build system for JavaScript and TypeScript codebases";
|
||||
mainProgram = "turbo";
|
||||
homepage = "https://turbo.build/";
|
||||
maintainers = with maintainers; [ dlip ];
|
||||
license = licenses.mpl20;
|
||||
};
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
{ lib, symlinkJoin, makeWrapper, turbo-unwrapped
|
||||
, disableTelemetry ? true, disableUpdateNotifier ? true }:
|
||||
|
||||
symlinkJoin {
|
||||
pname = "turbo";
|
||||
name = "turbo-${turbo-unwrapped.version}";
|
||||
inherit (turbo-unwrapped) version meta;
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
paths = [ turbo-unwrapped ];
|
||||
postBuild = ''
|
||||
rm $out/bin/turbo
|
||||
makeWrapper ${turbo-unwrapped}/bin/turbo $out/bin/turbo \
|
||||
${lib.optionalString disableTelemetry "--set TURBO_TELEMETRY_DISABLED 1"} \
|
||||
${lib.optionalString disableUpdateNotifier "--add-flags --no-update-notifier"}
|
||||
'';
|
||||
}
|
||||
@@ -1,24 +1,22 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
python3,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "psudohash";
|
||||
version = "unstable-2023-05-15";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "t3l3machus";
|
||||
repo = "psudohash";
|
||||
# https://github.com/t3l3machus/psudohash/issues/8
|
||||
rev = "2d586dec8b5836546ae54b924eb59952a7ee393c";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-l/Rp9405Wf6vh85PFrRTtTLJE7GPODowseNqEw42J18=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
python3
|
||||
];
|
||||
buildInputs = [ python3 ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
@@ -36,6 +34,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "Password list generator for orchestrating brute force attacks and cracking hashes";
|
||||
homepage = "https://github.com/t3l3machus/psudohash";
|
||||
changelog = "https://github.com/t3l3machus/psudohash/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ exploitoverload ];
|
||||
mainProgram = "psudohash";
|
||||
|
||||
@@ -10933,11 +10933,6 @@ with pkgs;
|
||||
|
||||
nzbget = callPackage ../tools/networking/nzbget { };
|
||||
|
||||
nzbhydra2 = callPackage ../servers/nzbhydra2 {
|
||||
# Requires Java 17, not lower, not higher
|
||||
jre = openjdk17;
|
||||
};
|
||||
|
||||
oapi-codegen = callPackage ../tools/networking/oapi-codegen { };
|
||||
|
||||
oath-toolkit = callPackage ../tools/security/oath-toolkit { };
|
||||
@@ -13545,12 +13540,6 @@ with pkgs;
|
||||
|
||||
tuptime = callPackage ../tools/system/tuptime { };
|
||||
|
||||
turbo = callPackage ../tools/misc/turbo/wrapper.nix { };
|
||||
|
||||
turbo-unwrapped = callPackage ../tools/misc/turbo {
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) IOKit CoreServices CoreFoundation;
|
||||
};
|
||||
|
||||
turses = callPackage ../applications/networking/instant-messengers/turses { };
|
||||
|
||||
tutanota-desktop = callPackage ../applications/networking/mailreaders/tutanota-desktop { };
|
||||
|
||||
Reference in New Issue
Block a user