Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-06-11 00:09:47 +00:00 committed by GitHub
commit dcfc502458
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
66 changed files with 2761 additions and 235 deletions

View file

@ -8,7 +8,7 @@ in {
package = mkOption {
type = types.package;
default = pkgs.pleroma-otp;
default = pkgs.pleroma;
description = "Pleroma package to use.";
};

View file

@ -0,0 +1,33 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config
, mpg123, ffmpeg, libvorbis, libao, jansson
}:
stdenv.mkDerivation rec {
pname = "vgmstream";
version = "r1050-3448-g77cc431b";
src = fetchFromGitHub {
owner = "vgmstream";
repo = "vgmstream";
rev = version;
sha256 = "030q02c9li14by7vm00gn6v3m4dxxmfwiy9iyz3xsgzq1i7pqc1d";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ mpg123 ffmpeg libvorbis libao jansson ];
# There's no nice way to build the audacious plugin without a circular dependency
cmakeFlags = [ "-DBUILD_AUDACIOUS=OFF" ];
preConfigure = ''
echo "#define VERSION \"${version}\"" > cli/version.h
'';
meta = with lib; {
description = "A library for playback of various streamed audio formats used in video games";
homepage = "https://vgmstream.org";
maintainers = with maintainers; [ zane ];
license = with licenses; isc;
platforms = with platforms; unix;
};
}

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "xplr";
version = "0.14.0";
version = "0.14.1";
src = fetchCrate {
inherit pname version;
sha256 = "1cyybqb91n91h6nig7rxxxw9c7krz80jdfl25bdr7mlbzymssn0q";
sha256 = "08gb4dnnzdy3whn2411xmar1wpvmc014scbniicksra8p1xizh0b";
};
buildInputs = lib.optional stdenv.isDarwin libiconv;
cargoSha256 = "1bj1rgsmkbby4ma325fhpb911bwabhd5bihyv9j0dfvgm1ffdm8a";
cargoSha256 = "1yxbirqf6c4bc364gw0nnjrjvhvjy2j2pbmvlpakv0bmyfphhb95";
meta = with lib; {
description = "A hackable, minimal, fast TUI file explorer";

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "tektoncd-cli";
version = "0.18.0";
version = "0.19.0";
src = fetchFromGitHub {
owner = "tektoncd";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-vZxpfVMUl1EZwCuLlwmSKWrz86aTjWYlAIwO4b9ACqk=";
sha256 = "sha256-fWcHjpfbpj2lrJ0FawhQJuSxAEX1WwOY7m+CAgag4qk=";
};
vendorSha256 = null;
@ -43,7 +43,8 @@ buildGoModule rec {
installCheckPhase = ''
runHook preInstallCheck
$out/bin/tkn --help
$out/bin/tkn version | grep "Client version: ${version}"
# New tkn version functionality outputs empty https://github.com/tektoncd/cli/issues/1389
# $out/bin/tkn version | grep "Client version: ${version}"
runHook postInstallCheck
'';

View file

@ -57,7 +57,7 @@ let
append-version = p: n: p + display-pkg n "" coqPackages.${n}.version + "-";
prefix-name = foldl append-version "" namePrefix;
var-coqlib-install = (optionalString (versions.isGe "8.7" coq.coq-version) "COQMF_") + "COQLIB";
useDune2 = args.useDune2 or useDune2ifVersion fetched.version;
useDune2 = args.useDune2 or (useDune2ifVersion fetched.version);
in
stdenv.mkDerivation (removeAttrs ({

View file

@ -9,14 +9,14 @@
}:
stdenvNoCC.mkDerivation rec {
pname = "orchis";
version = "2021-04-20";
pname = "orchis-theme";
version = "2021-06-09";
src = fetchFromGitHub {
repo = "Orchis-theme";
owner = "vinceliuice";
rev = version;
sha256 = "sha256-cCUmainVTqFztZGpL2z2Zj6zcE2SQBWrec6yNFUMo5M=";
sha256 = "sha256-YlrocFDk3da2eqxbJ5lPUUxHHvJZx19LOa0MSljWY8Q=";
};
nativeBuildInputs = [ gtk3 sassc ];
@ -25,10 +25,6 @@ stdenvNoCC.mkDerivation rec {
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
dontPatch = true;
dontConfigure = true;
dontBuild = true;
preInstall = ''
mkdir -p $out/share/themes
'';

View file

@ -4,18 +4,41 @@ let
getPatches = dir:
let files = builtins.attrNames (builtins.readDir dir);
in map (f: dir + ("/" + f)) files;
version = "2.0.3";
version = "2.2.1";
dartVersion = "2.13.1";
channel = "stable";
filename = "flutter_linux_${version}-${channel}.tar.xz";
dartStable = dart.override {
version = dartVersion;
sources = {
"${dartVersion}-x86_64-darwin" = fetchurl {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-macos-x64-release.zip";
sha256 = "0kb6r2rmp5d0shvgyy37fmykbgww8qaj4f8k79rmqfv5lwa3izya";
};
"${dartVersion}-x86_64-linux" = fetchurl {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip";
sha256 = "0zq8wngyrw01wjc5s6w1vz2jndms09ifiymjjixxby9k41mr6jrq";
};
"${dartVersion}-i686-linux" = fetchurl {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-ia32-release.zip";
sha256 = "0zv4q8xv2i08a6izpyhhnil75qhs40m5mgyvjqjsswqkwqdf7lkj";
};
"${dartVersion}-aarch64-linux" = fetchurl {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip";
sha256 = "0bb9jdmg5p608jmmiqibp13ydiw9avgysxlmljvgsl7wl93j6rgc";
};
};
};
in
{
mkFlutter = mkFlutter;
stable = mkFlutter rec {
inherit dart version;
dart = dartStable;
inherit version;
pname = "flutter";
src = fetchurl {
url = "https://storage.googleapis.com/flutter_infra/releases/${channel}/linux/${filename}";
sha256 = "14a63cpkp78rgymmlrppds69jsrdarg33dr43nb7s61r0xfh9icm";
sha256 = "009pwk2casz10gibgjpz08102wxmkq9iq3994b3c2q342g6526g0";
};
patches = getPatches ./patches;
};

View file

@ -1,5 +1,5 @@
diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh
index c44f867746..c9eda34e26 100644
index be9320210e..6eb50aae95 100644
--- a/bin/internal/shared.sh
+++ b/bin/internal/shared.sh
@@ -218,8 +218,6 @@ function shared::execute() {
@ -12,16 +12,23 @@ index c44f867746..c9eda34e26 100644
case "$BIN_NAME" in
flutter*)
diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
index 3dc7929dd1..e65d70d55b 100644
index 550a75bc65..c98a4591cc 100644
--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
@@ -246,11 +246,7 @@ class FlutterCommandRunner extends CommandRunner<void> {
@@ -244,7 +244,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
globals.flutterUsage.suppressAnalytics = true;
}
- globals.flutterVersion.ensureVersionFile();
final bool machineFlag = topLevelResults['machine'] as bool;
- if (topLevelResults.command?.name != 'upgrade' && topLevelResults['version-check'] as bool && !machineFlag) {
final bool ci = await globals.botDetector.isRunningOnBot;
final bool redirectedCompletion = !globals.stdio.hasTerminal &&
@@ -253,10 +252,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
final bool versionCheckFlag = topLevelResults['version-check'] as bool;
final bool explicitVersionCheckPassed = topLevelResults.wasParsed('version-check') && versionCheckFlag;
- if (topLevelResults.command?.name != 'upgrade' &&
- (explicitVersionCheckPassed || (versionCheckFlag && !isMachine))) {
- await globals.flutterVersion.checkFlutterVersionFreshness();
- }

View file

@ -1,24 +1,24 @@
diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart
index a6c59bae07..21f6c9812a 100644
index 80fb16673f..5723f93f9f 100644
--- a/packages/flutter_tools/lib/src/asset.dart
+++ b/packages/flutter_tools/lib/src/asset.dart
@@ -5,6 +5,7 @@
@@ -7,6 +7,7 @@
import 'package:meta/meta.dart';
import 'package:package_config/package_config.dart';
+import 'base/common.dart';
import 'base/context.dart';
import 'base/deferred_component.dart';
import 'base/file_system.dart';
import 'base/logger.dart';
@@ -14,6 +15,7 @@ import 'cache.dart';
@@ -16,6 +17,7 @@ import 'build_info.dart';
import 'cache.dart';
import 'convert.dart';
import 'dart/package_map.dart';
import 'devfs.dart';
+import 'globals.dart' as globals;
import 'devfs.dart';
import 'flutter_manifest.dart';
import 'license_collector.dart';
import 'project.dart';
@@ -377,7 +379,7 @@ class ManifestAssetBundle implements AssetBundle {
@@ -449,7 +451,7 @@ class ManifestAssetBundle implements AssetBundle {
for (final Map<String, Object> font in family['fonts'] as List<Map<String, Object>>) {
final Uri entryUri = _fileSystem.path.toUri(font['asset'] as String);
result.add(_Asset(
@ -28,32 +28,40 @@ index a6c59bae07..21f6c9812a 100644
entryUri: entryUri,
package: null,
diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart
index 11e3bf3e11..39d6fae0d1 100644
index 152d4e75e5..1fcff7e2bd 100644
--- a/packages/flutter_tools/lib/src/cache.dart
+++ b/packages/flutter_tools/lib/src/cache.dart
@@ -321,8 +321,15 @@ class Cache {
@@ -9,6 +9,7 @@ import 'package:file/memory.dart';
import 'package:meta/meta.dart';
import 'package:process/process.dart';
+import 'globals.dart' as globals;
import 'base/common.dart';
import 'base/error_handling_io.dart';
import 'base/file_system.dart';
@@ -298,8 +299,15 @@ class Cache {
return;
}
assert(_lock == null);
+
+ final Directory dir = _fileSystem.directory(_fileSystem.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter'));
+ final Directory dir = _fileSystem.directory(_fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter'));
+ if (!dir.existsSync()) {
+ dir.createSync(recursive: true);
+ globals.os.chmod(dir, '755');
+ }
+
final File lockFile =
- _fileSystem.file(_fileSystem.path.join(flutterRoot, 'bin', 'cache', 'lockfile'));
+ _fileSystem.file(_fileSystem.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'lockfile'));
- _fileSystem.file(_fileSystem.path.join(flutterRoot!, 'bin', 'cache', 'lockfile'));
+ _fileSystem.file(_fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter', 'lockfile'));
try {
_lock = lockFile.openSync(mode: FileMode.write);
} on FileSystemException catch (e) {
@@ -424,7 +431,7 @@ class Cache {
@@ -404,7 +412,7 @@ class Cache {
if (_rootOverride != null) {
return _fileSystem.directory(_fileSystem.path.join(_rootOverride.path, 'bin', 'cache'));
return _fileSystem.directory(_fileSystem.path.join(_rootOverride!.path, 'bin', 'cache'));
} else {
- return _fileSystem.directory(_fileSystem.path.join(flutterRoot, 'bin', 'cache'));
+ return _fileSystem.directory(_fileSystem.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter'));
- return _fileSystem.directory(_fileSystem.path.join(flutterRoot!, 'bin', 'cache'));
+ return _fileSystem.directory(_fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter'));
}
}

View file

@ -13,6 +13,7 @@
, version
, darwin
, lit
, makeWrapper
, enableManpages ? false
}:
@ -30,7 +31,7 @@ stdenv.mkDerivation (rec {
outputs = [ "out" "lib" "dev" ];
nativeBuildInputs = [
cmake python3 which swig lit
cmake python3 which swig lit makeWrapper
] ++ lib.optionals enableManpages [
python3.pkgs.sphinx python3.pkgs.recommonmark
];
@ -68,7 +69,15 @@ stdenv.mkDerivation (rec {
doCheck = false;
installCheckPhase = ''
if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then
return 1;
fi
'';
postInstall = ''
wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/
# Editor support
# vscode:
install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json

View file

@ -63,3 +63,29 @@ index aff75d7db334..98a527c5e761 100644
install(TARGETS lldbIntelFeatures
- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX})
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
diff --git a/cmake/modules/LLDBStandalone.cmake b/cmake/modules/LLDBStandalone.cmake
index 752113b..010f187 100644
--- a/cmake/modules/LLDBStandalone.cmake
+++ b/cmake/modules/LLDBStandalone.cmake
@@ -62,7 +62,7 @@ endif()
# They are used as destination of target generators.
set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin)
-set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX})
+set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
if(WIN32 OR CYGWIN)
# DLL platform -- put DLLs into bin.
set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf74802..1c98cae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -222,7 +222,7 @@ if (LLDB_ENABLE_PYTHON)
if(LLDB_BUILD_FRAMEWORK)
set(LLDB_PYTHON_INSTALL_PATH ${LLDB_FRAMEWORK_INSTALL_DIR}/LLDB.framework/Resources/Python)
else()
- set(LLDB_PYTHON_INSTALL_PATH ${LLDB_PYTHON_RELATIVE_PATH})
+ set(LLDB_PYTHON_INSTALL_PATH ${CMAKE_INSTALL_LIBDIR}/../${LLDB_PYTHON_RELATIVE_PATH})
endif()
if (NOT CMAKE_CFG_INTDIR STREQUAL ".")
string(REPLACE ${CMAKE_CFG_INTDIR} "\$\{CMAKE_INSTALL_CONFIG_NAME\}" LLDB_PYTHON_INSTALL_PATH ${LLDB_PYTHON_INSTALL_PATH})

View file

@ -13,6 +13,7 @@
, version
, darwin
, lit
, makeWrapper
, enableManpages ? false
}:
@ -30,7 +31,7 @@ stdenv.mkDerivation (rec {
outputs = [ "out" "lib" "dev" ];
nativeBuildInputs = [
cmake python3 which swig lit
cmake python3 which swig lit makeWrapper
] ++ lib.optionals enableManpages [
python3.pkgs.sphinx python3.pkgs.recommonmark
];
@ -68,7 +69,15 @@ stdenv.mkDerivation (rec {
doCheck = false;
installCheckPhase = ''
if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then
return 1;
fi
'';
postInstall = ''
wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/
# Editor support
# vscode:
install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json

View file

@ -63,3 +63,29 @@ index efba2f74904f..e08413b1dbb1 100644
install(TARGETS lldbIntelFeatures
- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX})
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
diff --git a/cmake/modules/LLDBStandalone.cmake b/cmake/modules/LLDBStandalone.cmake
index 752113b..010f187 100644
--- a/cmake/modules/LLDBStandalone.cmake
+++ b/cmake/modules/LLDBStandalone.cmake
@@ -62,7 +62,7 @@ endif()
# They are used as destination of target generators.
set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin)
-set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX})
+set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
if(WIN32 OR CYGWIN)
# DLL platform -- put DLLs into bin.
set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf74802..1c98cae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -222,7 +222,7 @@ if (LLDB_ENABLE_PYTHON)
if(LLDB_BUILD_FRAMEWORK)
set(LLDB_PYTHON_INSTALL_PATH ${LLDB_FRAMEWORK_INSTALL_DIR}/LLDB.framework/Resources/Python)
else()
- set(LLDB_PYTHON_INSTALL_PATH ${LLDB_PYTHON_RELATIVE_PATH})
+ set(LLDB_PYTHON_INSTALL_PATH ${CMAKE_INSTALL_LIBDIR}/../${LLDB_PYTHON_RELATIVE_PATH})
endif()
if (NOT CMAKE_CFG_INTDIR STREQUAL ".")
string(REPLACE ${CMAKE_CFG_INTDIR} "\$\{CMAKE_INSTALL_CONFIG_NAME\}" LLDB_PYTHON_INSTALL_PATH ${LLDB_PYTHON_INSTALL_PATH})

View file

@ -19,6 +19,7 @@
, Carbon
, Cocoa
, lit
, makeWrapper
, enableManpages ? false
}:
@ -41,7 +42,7 @@ stdenv.mkDerivation (rec {
outputs = [ "out" "lib" "dev" ];
nativeBuildInputs = [
cmake python3 which swig lit
cmake python3 which swig lit makeWrapper
] ++ lib.optionals enableManpages [
python3.pkgs.sphinx python3.pkgs.recommonmark
];
@ -84,7 +85,15 @@ stdenv.mkDerivation (rec {
doCheck = false;
installCheckPhase = ''
if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then
return 1;
fi
'';
postInstall = ''
wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/
# Editor support
# vscode:
install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json

View file

@ -63,3 +63,29 @@ index 734167e51bc5..f95761b5df58 100644
install(TARGETS lldbIntelFeatures
- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX})
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
diff --git a/cmake/modules/LLDBStandalone.cmake b/cmake/modules/LLDBStandalone.cmake
index 752113b..010f187 100644
--- a/cmake/modules/LLDBStandalone.cmake
+++ b/cmake/modules/LLDBStandalone.cmake
@@ -62,7 +62,7 @@ endif()
# They are used as destination of target generators.
set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin)
-set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX})
+set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
if(WIN32 OR CYGWIN)
# DLL platform -- put DLLs into bin.
set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5633e2..86e4738 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,7 +79,7 @@ if (LLDB_ENABLE_PYTHON)
if(LLDB_BUILD_FRAMEWORK)
set(lldb_python_target_dir "${LLDB_FRAMEWORK_ABSOLUTE_BUILD_DIR}/LLDB.framework/Resources/Python/lldb")
else()
- set(lldb_python_target_dir "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${LLDB_PYTHON_RELATIVE_PATH}/lldb")
+ set(lldb_python_target_dir "${CMAKE_INSTALL_LIBDIR}/../${LLDB_PYTHON_RELATIVE_PATH}/lldb")
endif()
get_target_property(lldb_python_bindings_dir swig_wrapper_python BINARY_DIR)
finish_swig_python("lldb-python" "${lldb_python_bindings_dir}" "${lldb_python_target_dir}")

View file

@ -12,6 +12,7 @@
, python3
, version
, darwin
, makeWrapper
}:
stdenv.mkDerivation rec {
@ -37,7 +38,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "lib" "dev" ];
nativeBuildInputs = [
cmake python3 which swig
cmake python3 which swig makeWrapper
];
buildInputs = [
@ -61,7 +62,15 @@ stdenv.mkDerivation rec {
doCheck = false;
installCheckPhase = ''
if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then
return 1;
fi
'';
postInstall = ''
wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/
mkdir -p $out/share/man/man1
cp ../docs/lldb.1 $out/share/man/man1/

View file

@ -79,3 +79,42 @@ index b5316540fdf3..3c3c882d503f 100644
install(TARGETS lldbIntelFeatures
- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX})
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cdf22c4..d56fc6a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -146,7 +146,7 @@ if (NOT LLDB_DISABLE_PYTHON)
--cfgBldDir=${lldb_scripts_dir}
--prefix=${CMAKE_BINARY_DIR}
--cmakeBuildConfiguration=${CMAKE_CFG_INTDIR}
- --lldbLibDir=lib${LLVM_LIBDIR_SUFFIX}
+ --lldbLibDir=${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}
${use_python_wrapper_from_src_dir}
${use_six_py_from_system}
VERBATIM
diff --git a/cmake/modules/LLDBStandalone.cmake b/cmake/modules/LLDBStandalone.cmake
index a9059dd..d76a47d 100644
--- a/cmake/modules/LLDBStandalone.cmake
+++ b/cmake/modules/LLDBStandalone.cmake
@@ -124,7 +124,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
link_directories("${LLVM_LIBRARY_DIR}")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX})
+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_INSTALL_LIBDIR}/lib${LLVM_LIBDIR_SUFFIX})
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX})
set(LLDB_BUILT_STANDALONE 1)
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 3598247..bd60451 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -47,7 +47,7 @@ if(NOT LLDB_BUILD_FRAMEWORK)
endif()
set(SWIG_PYTHON_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${swig_python_subdir})
- set(SWIG_INSTALL_DIR lib${LLVM_LIBDIR_SUFFIX})
+ set(SWIG_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
# Install the LLDB python module
install(DIRECTORY ${SWIG_PYTHON_DIR} DESTINATION ${SWIG_INSTALL_DIR})

View file

@ -12,6 +12,7 @@
, python3
, version
, darwin
, makeWrapper
, lit
}:
@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "lib" "dev" ];
nativeBuildInputs = [
cmake python3 which swig lit
cmake python3 which swig lit makeWrapper
];
buildInputs = [
@ -58,7 +59,15 @@ stdenv.mkDerivation rec {
doCheck = false;
installCheckPhase = ''
if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then
return 1;
fi
'';
postInstall = ''
wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/
# man page
mkdir -p $out/share/man/man1
install ../docs/lldb.1 -t $out/share/man/man1/

View file

@ -63,3 +63,43 @@ index b5316540fdf3..3c3c882d503f 100644
install(TARGETS lldbIntelFeatures
- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX})
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cdf22c4..d56fc6a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -146,7 +146,7 @@ if (NOT LLDB_DISABLE_PYTHON)
--cfgBldDir=${lldb_scripts_dir}
--prefix=${CMAKE_BINARY_DIR}
--cmakeBuildConfiguration=${CMAKE_CFG_INTDIR}
- --lldbLibDir=lib${LLVM_LIBDIR_SUFFIX}
+ --lldbLibDir=${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}
${use_python_wrapper_from_src_dir}
${use_six_py_from_system}
VERBATIM
diff --git a/cmake/modules/LLDBStandalone.cmake b/cmake/modules/LLDBStandalone.cmake
index b726797..1f057ac 100644
--- a/cmake/modules/LLDBStandalone.cmake
+++ b/cmake/modules/LLDBStandalone.cmake
@@ -95,7 +95,7 @@ include_directories(
"${CLANG_INCLUDE_DIRS}")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX})
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_INSTALL_LIBDIR}/lib${LLVM_LIBDIR_SUFFIX})
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX})
set(LLDB_BUILT_STANDALONE 1)
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 7de7973..b70aecc 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -50,7 +50,8 @@ if(NOT LLDB_BUILD_FRAMEWORK)
OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(
COMMAND ${PYTHON_EXECUTABLE}
- -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_lib(True, False, ''))"
+ -c "import distutils.sysconfig, sys; print(distutils.sysconfig.get_python_lib(True, False, sys.argv[1]))"
+ ${CMAKE_INSTALL_LIBDIR}/../
OUTPUT_VARIABLE SWIG_INSTALL_DIR
OUTPUT_STRIP_TRAILING_WHITESPACE)

View file

@ -6,18 +6,18 @@
stdenv.mkDerivation rec {
pname = "unison-code-manager";
milestone_id = "M1m";
milestone_id = "M2g";
version = "1.0.${milestone_id}-alpha";
src = if (stdenv.isDarwin) then
fetchurl {
url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-osx.tar.gz";
sha256 = "06pxvp753j8pr0pn02l7cswmmas5pk1vlkw83yd04h3f2rx1s61v";
url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-macos.tar.gz";
sha256 = "1ib9pdzrfpzbi35fpwm9ym621nlydplvzgbhnyd86dbwbv3i9sga";
}
else
fetchurl {
url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-linux64.tar.gz";
sha256 = "1qspvfq805d34kz031pf9sqw8kzz7h637kc8lnbjlgvwixxkxc7c";
url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-linux.tar.gz";
sha256 = "004jx7q657mkcrvilk4lfkp8xcpl2bjflpn9m2p7jzlrlk97v9nj";
};
# The tarball is just the prebuilt binary, in the archive root.

View file

@ -47,7 +47,7 @@ in
stdenv.mkDerivation rec {
pname = "racket";
version = "8.0"; # always change at once with ./minimal.nix
version = "8.1"; # always change at once with ./minimal.nix
src = (lib.makeOverridable ({ name, sha256 }:
fetchurl {
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
}
)) {
name = "${pname}-${version}";
sha256 = "0lqqpa88v0br93qw7450a4blyi3pwn7sq2k04h0ikbsqrdnfj7lj";
sha256 = "0wlgp9dlibhv1d181arz309fszz31l5gb5gl94bqzfcav014g3k8";
};
FONTCONFIG_FILE = fontsConf;

View file

@ -5,7 +5,7 @@ racket.overrideAttrs (oldAttrs: rec {
name = "racket-minimal-${oldAttrs.version}";
src = oldAttrs.src.override {
inherit name;
sha256 = "0qvfi6rg9cwzh716q5j7m30rqq9xysi6zsalqlpdqrzhnx8y54k0";
sha256 = "1q54n16s0hmnry8q381wd7zfpyjndfjswn97vsbd4isngwz3w12k";
};
meta = oldAttrs.meta // {

View file

@ -0,0 +1,28 @@
From c02f2e040dd1e7664777c5a705272e4eb7bfb569 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Thu, 10 Jun 2021 14:09:19 +0200
Subject: [PATCH] vfs0090: add missing explicit dependencies in meson.build
Make all dependencies explicit, so they can be found when building with Nix.
---
meson.build | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meson.build b/meson.build
index 54a7ca4..88f8793 100644
--- a/meson.build
+++ b/meson.build
@@ -17,6 +17,9 @@ udev_dep = dependency('udev')
vfs009x_deps += libfprint_tod_dep
vfs009x_deps += dependency('nss')
vfs009x_deps += dependency('openssl')
+vfs009x_deps += dependency('gusb')
+vfs009x_deps += dependency('libfprint-2')
+vfs009x_deps += dependency('glib-2.0')
vfs0090_deps += dependency('pixman-1')
--
2.31.1

View file

@ -0,0 +1,26 @@
From 5405e02c629e689449e852424aed8cca217ed309 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Thu, 10 Jun 2021 14:10:52 +0200
Subject: [PATCH] vfs0090: add missing <linux/limits.h> include
This header is needed for the NAME_MAX constant used in this file.
---
vfs0090.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/vfs0090.c b/vfs0090.c
index 8034faf..6070df7 100644
--- a/vfs0090.c
+++ b/vfs0090.c
@@ -24,6 +24,7 @@
#include <errno.h>
#include <ctype.h>
+#include <linux/limits.h>
#include <nss.h>
#include <pk11pub.h>
#include <sechash.h>
--
2.31.1

View file

@ -0,0 +1,42 @@
{ stdenv, lib, fetchFromGitLab, pkg-config, libfprint, libfprint-tod, gusb, udev, nss, openssl, meson, pixman, ninja, glib }:
stdenv.mkDerivation {
pname = "libfprint-2-tod1-vfs0090";
version = "0.8.5";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "3v1n0";
repo = "libfprint-tod-vfs0090";
rev = "6084a1545589beec0c741200b18b0902cca225ba";
sha256 = "sha256-tSML/8USd/LuHF/YGLvNgykixF6VYtfE4SXzeV47840=";
};
patches = [
# TODO remove once https://gitlab.freedesktop.org/3v1n0/libfprint-tod-vfs0090/-/merge_requests/1 is merged
./0001-vfs0090-add-missing-explicit-dependencies-in-meson.b.patch
# TODO remove once https://gitlab.freedesktop.org/3v1n0/libfprint-tod-vfs0090/-/merge_requests/2 is merged
./0002-vfs0090-add-missing-linux-limits.h-include.patch
];
nativeBuildInputs = [ pkg-config meson ninja ];
buildInputs = [ libfprint libfprint-tod glib gusb udev nss openssl pixman ];
installPhase = ''
runHook preInstall
install -D -t "$out/lib/libfprint-2/tod-1/" libfprint-tod-vfs009x.so
install -D -t "$out/lib/udev/rules.d/" $src/60-libfprint-2-tod-vfs0090.rules
runHook postInstall
'';
passthru.driverPath = "/lib/libfprint-2/tod-1";
meta = with lib; {
description = "A libfprint-2-tod Touch OEM Driver for 2016 ThinkPad's fingerprint readers";
homepage = "https://gitlab.freedesktop.org/3v1n0/libfprint-tod-vfs0090";
license = licenses.lgpl21Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ valodim ];
};
}

View file

@ -1,10 +1,13 @@
{ lib, stdenv, fetchzip, cmake, zlib, libpng }:
{ lib, stdenv, fetchFromGitHub, cmake, zlib, libpng }:
stdenv.mkDerivation {
name = "libharu-2.3.0";
stdenv.mkDerivation rec {
pname = "libharu";
version = "2.3.0";
src = fetchzip {
url = "https://github.com/libharu/libharu/archive/RELEASE_2_3_0.tar.gz";
src = fetchFromGitHub {
owner = "libharu";
repo = pname;
rev = "RELEASE_${lib.replaceStrings ["."] ["_"] version}";
sha256 = "15s9hswnl3qqi7yh29jyrg0hma2n99haxznvcywmsp8kjqlyg75q";
};

View file

@ -0,0 +1,159 @@
{ stdenv
, bash
, abseil-cpp
, fetchFromGitHub
, fetchFromGitLab
, fetchpatch
, fetchurl
, flatbuffers
, hostPlatform
, lib
, zlib
}:
let
tflite-eigen = fetchFromGitLab {
owner = "libeigen";
repo = "eigen";
rev = "3d9051ea84a5089b277c88dac456b3b1576bfa7f";
sha256 = "1y3f2jvimb5i904f4n37h23cv2pkdlbz8656s0kga1y7c0p50wif";
};
gemmlowp-src = fetchFromGitHub {
owner = "google";
repo = "gemmlowp";
rev = "fda83bdc38b118cc6b56753bd540caa49e570745";
sha256 = "1sbp8kmr2azwlvfbzryy1frxi99jhsh1nc93bdbxdf8zdgpv0kxl";
};
neon-2-sse-src = fetchFromGitHub {
owner = "intel";
repo = "ARM_NEON_2_x86_SSE";
rev = "1200fe90bb174a6224a525ee60148671a786a71f";
sha256 = "0fhxch711ck809dpq1myxz63jiiwfcnxvj45ww0kg8s0pqpn5kv6";
};
farmhash-src = fetchFromGitHub {
owner = "google";
repo = "farmhash";
rev = "816a4ae622e964763ca0862d9dbd19324a1eaf45";
sha256 = "1mqxsljq476n1hb8ilkrpb39yz3ip2hnc7rhzszz4sri8ma7qzp6";
};
fft2d-src = fetchurl {
url = "http://www.kurims.kyoto-u.ac.jp/~ooura/fft2d.tgz";
sha256 = "ada7e99087c4ed477bfdf11413f2ba8db8a840ba9bbf8ac94f4f3972e2a7cec9";
};
fp16-src = fetchFromGitHub {
owner = "Maratyszcza";
repo = "FP16";
rev = "4dfe081cf6bcd15db339cf2680b9281b8451eeb3";
sha256 = "06a8dfl3a29r93nxpp6hpywsajz5d555n3sqd3i6krybb6swnvh7";
};
ruy-src = fetchFromGitHub {
owner = "google";
repo = "ruy";
rev = "23633b37099b614a2f836ef012cafc8087fdb98c";
sha256 = "14k9hz6ss8qy8nsajk6lrq25f6qxrldxky31ijw0dpqnfnnswrx4";
};
cpuinfo-src = fetchFromGitHub {
owner = "pytorch";
repo = "cpuinfo";
rev = "5916273f79a21551890fd3d56fc5375a78d1598d";
sha256 = "0q6760xdxsg18acdv8vq3yrq7ksr7wsm8zbyan01zf2khnb6fw4x";
};
in
stdenv.mkDerivation rec {
pname = "tensorflow-lite";
version = "2.5.0";
src = fetchFromGitHub {
owner = "tensorflow";
repo = "tensorflow";
rev = "v${version}";
sha256 = "1jdw2i1rq06zqd6aabh7bbm0avsg4pygnfmd7gviv0blhih9054l";
};
buildInputs = [ zlib flatbuffers ];
dontConfigure = true;
postPatch = ''
substituteInPlace ./tensorflow/lite/tools/make/Makefile \
--replace /bin/bash ${bash}/bin/bash \
--replace /bin/sh ${bash}/bin/sh
'';
makefile = "tensorflow/lite/tools/make/Makefile";
preBuild =
let
includes =
lib.concatMapStringsSep
" "
(subdir: "-I $PWD/tensorflow/lite/tools/make/downloads/${subdir}")
[
"neon_2_sse"
"gemmlowp"
"absl"
"fp16/include"
"farmhash/src"
"ruy"
"cpuinfo"
"cpuinfo/src"
"cpuinfo/include"
"cpuinfo/deps/clog/include"
"eigen"
];
in
''
# enter the vendoring lair of doom
prefix="$PWD/tensorflow/lite/tools/make/downloads"
mkdir -p "$prefix"
tar xzf ${fft2d-src} -C "$prefix"
ln -s ${ruy-src} "$prefix/ruy"
ln -s ${gemmlowp-src} "$prefix/gemmlowp"
ln -s ${neon-2-sse-src} "$prefix/neon_2_sse"
ln -s ${farmhash-src} "$prefix/farmhash"
ln -s ${cpuinfo-src} "$prefix/cpuinfo"
ln -s ${fp16-src} "$prefix/fp16"
ln -s ${tflite-eigen} "$prefix/eigen"
# tensorflow lite is using the *source* of flatbuffers
ln -s ${flatbuffers.src} "$prefix/flatbuffers"
# tensorflow lite expects to compile abseil into `libtensorflow-lite.a`
ln -s ${abseil-cpp.src} "$prefix/absl"
buildFlagsArray+=(INCLUDES="-I $PWD ${includes}" TARGET_TOOLCHAIN_PREFIX="" -j$NIX_BUILD_CORES all)
'';
installPhase = ''
mkdir "$out"
# copy the static lib and binaries into the output dir
cp -r ./tensorflow/lite/tools/make/gen/linux_${hostPlatform.uname.processor}/{bin,lib} "$out"
find ./tensorflow/lite -type f -name '*.h' | while read f; do
path="$out/include/''${f/.\//}"
install -D "$f" "$path"
# remove executable bit from headers
chmod -x "$path"
done
'';
meta = with lib; {
description = "An open source deep learning framework for on-device inference.";
homepage = "https://www.tensorflow.org/lite";
license = licenses.asl20;
maintainers = with maintainers; [ cpcloud ];
platforms = [ "x86_64-linux" "aarch64-linux" ];
};
}

View file

@ -0,0 +1,45 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 28103856e..a36909c0e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -449,13 +449,6 @@ install(FILES
DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel
)
-if(EIGEN_BUILD_PKGCONFIG)
- configure_file(eigen3.pc.in eigen3.pc @ONLY)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eigen3.pc
- DESTINATION ${PKGCONFIG_INSTALL_DIR}
- )
-endif()
-
install(DIRECTORY Eigen DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
add_subdirectory(doc EXCLUDE_FROM_ALL)
@@ -570,8 +563,15 @@ set ( EIGEN_VERSION_MAJOR ${EIGEN_WORLD_VERSION} )
set ( EIGEN_VERSION_MINOR ${EIGEN_MAJOR_VERSION} )
set ( EIGEN_VERSION_PATCH ${EIGEN_MINOR_VERSION} )
set ( EIGEN_DEFINITIONS "")
-set ( EIGEN_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}" )
set ( EIGEN_ROOT_DIR ${CMAKE_INSTALL_PREFIX} )
+GNUInstallDirs_get_absolute_install_dir(EIGEN_INCLUDE_DIR INCLUDE_INSTALL_DIR)
+
+if(EIGEN_BUILD_PKGCONFIG)
+ configure_file(eigen3.pc.in eigen3.pc @ONLY)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eigen3.pc
+ DESTINATION ${PKGCONFIG_INSTALL_DIR}
+ )
+endif()
# Interface libraries require at least CMake 3.0
if (NOT CMAKE_VERSION VERSION_LESS 3.0)
diff --git a/eigen3.pc.in b/eigen3.pc.in
index 3368a3aa1..d6778bf06 100644
--- a/eigen3.pc.in
+++ b/eigen3.pc.in
@@ -6,4 +6,4 @@ Description: A C++ template library for linear algebra: vectors, matrices, and r
Requires:
Version: @EIGEN_VERSION_NUMBER@
Libs:
-Cflags: -I${prefix}/@INCLUDE_INSTALL_DIR@
+Cflags: -I@EIGEN_INCLUDE_DIR@

View file

@ -0,0 +1,52 @@
{ lib, fetchurl, stdenv, ocaml, ocamlbuild, findlib, ocaml_extlib, glib, perl, pkg-config, stdlib-shims, ounit }:
stdenv.mkDerivation {
pname = "ocaml${ocaml.version}-cudf";
version = "0.9";
src = fetchurl {
url = "https://gforge.inria.fr/frs/download.php/36602/cudf-0.9.tar.gz";
sha256 = "sha256-mTLk2V3OI1sUNIYv84nM3reiirf0AuozG5ZzLCmn4Rw=";
};
buildFlags = [
"all"
"opt"
];
nativeBuildInputs = [
findlib
ocaml
ocamlbuild
pkg-config
];
buildInputs = [
glib
perl
stdlib-shims
];
propagatedBuildInputs = [
ocaml_extlib
];
checkTarget = [
"all"
"test"
];
checkInputs = [
ounit
];
doCheck = true;
preInstall = "mkdir -p $OCAMLFIND_DESTDIR";
installFlags = "BINDIR=$(out)/bin";
# passthru.tests = { inherit dose3; }; # To-Do: To be enabled when Dose3 PR is accepted.
meta = with lib; {
description = "A library for CUDF format";
homepage = "http://www.mancoosi.org/cudf/";
downloadPage = "https://gforge.inria.fr/projects/cudf/";
license = licenses.lgpl3;
maintainers = with maintainers; [ superherointj ];
};
}

View file

@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "aiosyncthing";
version = "0.5.1";
version = "0.6.3";
src = fetchFromGitHub {
owner = "zhulik";
repo = pname;
rev = "v${version}";
sha256 = "0704qbg3jy80vaw3bcvhy988s1qs3fahpfwkja71fy70bh0vc860";
sha256 = "sha256-vn8S2/kRW5C2Hbes9oLM4LGm1jWWK0zeLdujR14y6EI=";
};
propagatedBuildInputs = [
@ -34,6 +34,11 @@ buildPythonPackage rec {
pytest-mock
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace " --cov=aiosyncthing --cov-report=html" ""
'';
pythonImportsCheck = [ "aiosyncthing" ];
meta = with lib; {

View file

@ -1,30 +1,39 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, mock
, smbus-cffi
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "bme680";
version = "1.0.5";
version = "1.1.1";
src = fetchFromGitHub {
owner = "pimoroni";
repo = "bme680-python";
rev = "v${version}";
sha256 = "sha256-oIXh1JnGTI/Cj4MQFpWq+sWR2X+ioCsK0Q+T7wPITCQ=";
sha256 = "sha256-gmdRxMJ0DoCyNcb/bYp746PBi4HktHAAYOcSQJ0Uheg=";
};
propagatedBuildInputs = [ smbus-cffi ];
propagatedBuildInputs = [
smbus-cffi
];
preBuild = ''
cd library
'';
checkInputs = [ pytestCheckHook ];
# next release will have tests, but not the current one
doCheck = false;
checkInputs = [
mock
pytestCheckHook
];
postPatch = ''
substituteInPlace library/setup.cfg \
--replace "smbus" "smbus-cffi"
'';
pythonImportsCheck = [ "bme680" ];

View file

@ -1,11 +1,13 @@
{ lib, fetchPypi, buildPythonPackage, pythonOlder
{ lib
, fetchPypi
, buildPythonPackage
, pythonOlder
, aspy-yaml
, cached-property
, cfgv
, identify
, importlib-metadata
, importlib-resources
, isPy27
, nodeenv
, python
, six
@ -15,13 +17,13 @@
buildPythonPackage rec {
pname = "pre-commit";
version = "2.11.0";
disabled = isPy27;
version = "2.13.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit version;
pname = "pre_commit";
sha256 = "15f1chxrbmfcajk1ngk3jvf6jjbigb5dg66wnn7phmlywaawpy06";
sha256 = "sha256-dklyxgaT3GaLqOhuspZU7DFEUBMQ9xmHQqdnvsOFo3g=";
};
patches = [
@ -53,6 +55,8 @@ buildPythonPackage rec {
--subst-var-by nodeenv ${nodeenv}
'';
pythonImportsCheck = [ "pre_commit" ];
meta = with lib; {
description = "A framework for managing and maintaining multi-language pre-commit hooks";
homepage = "https://pre-commit.com/";

View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "pysonos";
version = "0.0.50";
version = "0.0.51";
disabled = !isPy3k;
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "amelchio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-iyFdT+RH2dtMtD+jSLFuAVE1DIQn6k9ONLOXNFhpuHs=";
sha256 = "sha256-MjsbqrH4SWnnwGe9BVHaValoQEiaaZVhFdn6MDoEyZs=";
};
propagatedBuildInputs = [

View file

@ -0,0 +1,46 @@
{ lib
, buildPythonPackage
, distro
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, setuptools-scm
, setuptools-scm-git-archive
}:
buildPythonPackage rec {
pname = "ruyaml";
version = "0.90.0.2";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "pycontribs";
repo = pname;
rev = version;
sha256 = "0gxvwry7n1gczxkjzyfrr3fammllkvnnamja4yln8xrg3n1h89al";
};
nativeBuildInputs = [
setuptools-scm
setuptools-scm-git-archive
];
SETUPTOOLS_SCM_PRETEND_VERSION = version;
propagatedBuildInputs = [
distro
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "ruyaml" ];
meta = with lib; {
description = "YAML 1.2 loader/dumper package for Python";
homepage = "https://ruyaml.readthedocs.io/";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -2,7 +2,6 @@
, fetchFromGitHub
, buildPythonPackage
, poetry
, isPy27
, docopt
, easywatch
, jinja2
@ -13,7 +12,7 @@
buildPythonPackage rec {
pname = "staticjinja";
version = "2.0.0";
version = "2.0.1";
format = "pyproject";
# No tests in pypi
@ -21,7 +20,7 @@ buildPythonPackage rec {
owner = "staticjinja";
repo = pname;
rev = version;
sha256 = "0z5y4l4sv4c7zmp6pj1ws3psq7i87xqbcmk648bmsa1d6prr1hil";
sha256 = "sha256-sGon3+So4EuVRTUqcP9omfJ91wBzJSm7CSkuefX3S+8=";
};
nativeBuildInputs = [

View file

@ -4,13 +4,13 @@ with lib;
buildGoModule rec {
pname = "butane";
version = "0.11.0";
version = "0.12.0";
src = fetchFromGitHub {
owner = "coreos";
repo = "butane";
rev = "v${version}";
sha256 = "1s4rkq7mj1lyi8h47jyfy3qygfxhrmpihdy8rcnn55gcy04lm0qc";
sha256 = "0wjnzxjv71pmn88f6fm20xhsmdib6jwn9839n1xw9px9w95qg0yy";
};
vendorSha256 = null;

View file

@ -0,0 +1,65 @@
{ lib
, fetchFromGitHub
, python3
}:
python3.pkgs.buildPythonApplication rec {
pname = "sqlfluff";
version = "0.6.0a2";
disabled = python3.pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "13hzr0jialzi2nlvqwvff3w0h6jikqvcg0p2p4irwlisg4db8w7w";
};
propagatedBuildInputs = with python3.pkgs; [
appdirs
cached-property
click
colorama
configparser
diff_cover
jinja2
oyaml
pathspec
pytest
tblib
toml
] ++ lib.optionals (pythonOlder "3.7") [
dataclasses
] ++ lib.optionals (pythonOlder "3.9") [
typing-extensions
];
checkInputs = with python3.pkgs; [
hypothesis
pytestCheckHook
];
disabledTestPaths = [
# dbt is not available yet
"test/core/templaters/dbt_test.py"
# Don't run the plugin related tests
"test/core/plugin_test.py"
"plugins/sqlfluff-plugin-example/test/rules/rule_test_cases_test.py"
];
disabledTests = [
# dbt is not available yet
"test__linter__skip_dbt_model_disabled"
"test_rules__test_helper_has_variable_introspection"
"test__rules__std_file_dbt"
];
pythonImportsCheck = [ "sqlfluff" ];
meta = with lib; {
description = "SQL linter and auto-formatter";
homepage = "https://www.sqlfluff.com/";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "dockle";
version = "0.3.14";
version = "0.3.15";
src = fetchFromGitHub {
owner = "goodwithtech";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Xe5qgM0yPBVtH9S4OSiNnkKxcH0W89aABJF6PVRBEhQ=";
sha256 = "sha256-jxFlbGJ95cSv08HcqrVufpTE5KkvAC9zOTQ2+JZWe5A=";
};
vendorSha256 = "sha256-h+2AcppNUJ7zjHeBzDy1iWoR3i7a2v0Pc7vOfoUqPOw=";

View file

@ -31,5 +31,6 @@ stdenv.mkDerivation rec {
homepage = "https://dwheeler.com/flawfinder/";
license = with licenses; [ gpl2Only ];
maintainers = with maintainers; [ fab ];
platforms = platforms.all;
};
}

View file

@ -2,18 +2,18 @@
stdenv.mkDerivation rec {
pname = "clojure-lsp";
version = "2021.04.13-12.47.33";
version = "2021.06.01-16.19.44";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "1la0d28pvp1fqnxp3scb2vawcblilwyx42djxn379vag403p1i2d";
sha256 = "sha256-dACvjm+uEVWotoeYhA4gCenKeprpF2dI0PGNRAVALao=";
};
jar = fetchurl {
url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp.jar";
sha256 = "059gz7y2rzwdxpyqy80w4lghzgxi5lb4rxmks1721yq6k7ljjyqy";
sha256 = "sha256-V12rSYv/Yu12ZpLSROd+4pyGiEGRfJ7lmRqCeikcQ5Q=";
};
GRAALVM_HOME = graalvm11-ce;
@ -41,6 +41,8 @@ stdenv.mkDerivation rec {
checkPhase = ''
runHook preCheck
export HOME="$(mktemp -d)"
./clojure-lsp --version | fgrep -q '${version}'
${babashka}/bin/bb integration-test/run-all.clj ./clojure-lsp
runHook postCheck

View file

@ -1,12 +1,14 @@
{ lib, stdenv, fetchurl, pkg-config, libjpeg, libX11, libXxf86vm, curl, libogg
{ lib, stdenv, fetchsvn, pkg-config, libjpeg, libX11, libXxf86vm, curl, libogg
, libvorbis, freetype, openal, libGL }:
stdenv.mkDerivation {
name = "alienarena-7.65";
stdenv.mkDerivation rec {
pname = "alienarena";
version = "7.71.2";
src = fetchurl {
url = "https://icculus.org/alienarena/Files/alienarena-7.65-linux20130207.tar.gz";
sha256 = "03nnv4m2xmswr0020hssajncdb8sy95jp5yccsm53sgxga4r8igg";
src = fetchsvn {
url = "svn://svn.icculus.org/alienarena/trunk";
rev = "5673";
sha256 = "1qfrgrp7nznk5n1jqvjba6l1w8y2ixzyx9swkpvd02rdwlwrp9kw";
};
nativeBuildInputs = [ pkg-config ];

View file

@ -1,31 +1,23 @@
{ lib, fetchFromGitHub, rustPlatform, installShellFiles }:
{ lib, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "proton-caller";
version = "2.2.3";
version = "2.3.0";
src = fetchFromGitHub {
owner = "caverym";
repo = pname;
rev = version;
sha256 = "0968pmapg6157q4rvfp690l1sjnws8hm62lvm8kaaqysac339z7z";
sha256 = "1rj0f8jzmrvj6gz1rcdjmxdqk2i5cxhz9ji4217kwyb6h1h0jmdk";
};
cargoSha256 = "1vp2vvgy8z350a59k1c3s5ww6w2wikiha4s7jkkz9khl0spn19a8";
nativeBuildInputs = [ installShellFiles ];
outputs = [ "out" "man" ];
postInstall = ''
installManPage manual/proton-call.6
'';
cargoSha256 = "165kzza1m8h37y1ir0d0hp0z645h4ihkyj83fii69f18gk47r3kg";
meta = with lib; {
description = "Run Windows programs with Proton";
changelog = "https://github.com/caverym/proton-caller/releases/tag/${version}";
homepage = "https://github.com/caverym/proton-caller";
license = licenses.gpl3Only;
license = licenses.mit;
maintainers = with maintainers; [ kho-dialga ];
};
}

View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "dbus-broker";
version = "28";
version = "29";
src = fetchFromGitHub {
owner = "bus1";
repo = "dbus-broker";
rev = "v${version}";
sha256 = "1rsn74x6yhyl9w7jqgnzgzyhp9cln1602jyzpw5qvrkdk5b7zzgs";
sha256 = "1abbi8c0mgdqjidlp2wnmy0a88xv173hq88sh5m966c5r1h6alkq";
fetchSubmodules = true;
};

View file

@ -215,7 +215,7 @@ nixBuild() {
nixFlakeBuild() {
if [ -z "$buildHost" ]; then
nix build "$@" --out-link "${tmpDir}/result"
nix "${flakeFlags[@]}" build "$@" --out-link "${tmpDir}/result"
readlink -f "${tmpDir}/result"
else
local attr="$1"

View file

@ -17,12 +17,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
assert http2Support -> nghttp2 != null;
stdenv.mkDerivation rec {
version = "2.4.47";
version = "2.4.48";
pname = "apache-httpd";
src = fetchurl {
url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
sha256 = "sha256-I9AG28jleBFqETj6RX7qgkBIRY6JyECHIZ8DcogMA8o=";
sha256 = "0v4npxnvih5mlxx6dywwhhfs8xvgcckc0hxzwk3hi0g8nbkjdj0v";
};
# FIXME: -dev depends on -doc

View file

@ -1,71 +0,0 @@
{ lib
, stdenv
, autoPatchelfHook
, fetchurl
, file
, makeWrapper
, ncurses
, nixosTests
, openssl
, unzip
, zlib
}:
stdenv.mkDerivation {
pname = "pleroma-otp";
version = "2.3.0";
# To find the latest binary release stable link, have a look at
# the CI pipeline for the latest commit of the stable branch
# https://git.pleroma.social/pleroma/pleroma/-/tree/stable
src = {
aarch64-linux = fetchurl {
url = "https://git.pleroma.social/pleroma/pleroma/-/jobs/182392/artifacts/download";
sha256 = "1drpd6xh7m2damxi5impb8jwvjl6m3qv5yxynl12i8g66vi3rbwf";
};
x86_64-linux = fetchurl {
url = "https://git.pleroma.social/pleroma/pleroma/-/jobs/182388/artifacts/download";
sha256 = "0glr0iiqmylwwsn5r946yqr9kx97j2zznrc0imyxm3j0vhz8xzl4";
};
}."${stdenv.hostPlatform.system}";
nativeBuildInputs = [ unzip ];
buildInputs = [
autoPatchelfHook
file
makeWrapper
ncurses
openssl
zlib
];
# mkDerivation fails to detect the zip nature of $src due to the
# missing .zip extension.
# Let's unpack the archive explicitely.
unpackCmd = "unzip $curSrc";
installPhase = ''
mkdir $out
cp -r * $out'';
# Pleroma is using the project's root path (here the store path)
# as its TMPDIR.
# Patching it to move the tmp dir to the actual tmpdir
postFixup = ''
wrapProgram $out/bin/pleroma \
--set-default RELEASE_TMP "/tmp"
wrapProgram $out/bin/pleroma_ctl \
--set-default RELEASE_TMP "/tmp"'';
passthru.tests = {
pleroma = nixosTests.pleroma;
};
meta = with lib; {
description = "ActivityPub microblogging server";
homepage = https://git.pleroma.social/pleroma/pleroma;
license = licenses.agpl3;
maintainers = with maintainers; [ ninjatrappeur ];
platforms = [ "x86_64-linux" "aarch64-linux" ];
};
}

View file

@ -0,0 +1,224 @@
{ lib, beamPackages
, fetchFromGitHub, fetchFromGitLab
, file, cmake
, nixosTests, writeText
, ...
}:
beamPackages.mixRelease rec {
pname = "pleroma";
version = "2.3.50";
src = fetchFromGitLab {
domain = "git.pleroma.social";
owner = "pleroma";
repo = "pleroma";
rev = "94687e23938b808a3fff95c92956ec337160cd0b";
sha256 = "160ss6qhx3007lyb0f5cjzbm5dzxq9q8rfn83l8qfxgan8hliag6";
};
mixNixDeps = import ./mix.nix {
inherit beamPackages lib;
overrides = (final: prev: {
# mix2nix does not support git dependencies yet,
# so we need to add them manually
prometheus_ex = beamPackages.buildMix rec {
name = "prometheus_ex";
version = "3.0.5";
src = fetchFromGitLab {
domain = "git.pleroma.social";
group = "pleroma";
owner = "elixir-libraries";
repo = "prometheus.ex";
rev = "a4e9beb3c1c479d14b352fd9d6dd7b1f6d7deee5";
sha256 = "1v0q4bi7sb253i8q016l7gwlv5562wk5zy3l2sa446csvsacnpjk";
};
beamDeps = with final; [ prometheus ];
};
eblurhash = beamPackages.buildRebar3 rec {
name = "eblurhash";
version = "0.0.0";
src = fetchFromGitHub {
owner = "zotonic";
repo = "eblurhash";
rev = "04a0b76eadf4de1be17726f39b6313b88708fd12";
sha256 = "1b9r41scg9rn3skx65ssv1q5lczmg0ky6h1y39qajsvdi5w3swyx";
};
beamDeps = with final; [ ];
};
captcha = beamPackages.buildMix rec {
name = "captcha";
version = "0.1.0";
src = fetchFromGitLab {
domain = "git.pleroma.social";
group = "pleroma";
owner = "elixir-libraries";
repo = "elixir-captcha";
rev = "e0f16822d578866e186a0974d65ad58cddc1e2ab";
sha256 = "0qbf86l59kmpf1nd82v4141ba9ba75xwmnqzpgbm23fa1hh8pi9c";
};
beamDeps = with final; [ ];
};
remote_ip = beamPackages.buildMix rec {
name = "remote_ip";
version = "0.1.5";
src = fetchFromGitLab {
domain = "git.pleroma.social";
group = "pleroma";
owner = "elixir-libraries";
repo = "remote_ip";
rev = "b647d0deecaa3acb140854fe4bda5b7e1dc6d1c8";
sha256 = "0c7vmakcxlcs3j040018i7bfd6z0yq6fjfig02g5fgakx398s0x6";
};
beamDeps = with final; [ combine plug inet_cidr ];
};
concurrent_limiter = beamPackages.buildMix rec {
name = "concurrent_limiter";
version = "0.1.0";
src = fetchFromGitLab {
domain = "git.pleroma.social";
group = "pleroma";
owner = "elixir-libraries";
repo = "concurrent_limiter";
rev = "d81be41024569330f296fc472e24198d7499ba78";
sha256 = "1nci8zz1gy7dnvxf5ydjqbagf4g9f7z5x1v9kdyy7jz9f37z6qw9";
};
beamDeps = with final; [ telemetry ];
};
prometheus_phx = beamPackages.buildMix rec {
name = "prometheus_phx";
version = "0.1.1";
preBuild = ''
touch config/prod.exs
'';
src = fetchFromGitLab {
domain = "git.pleroma.social";
group = "pleroma";
owner = "elixir-libraries";
repo = "prometheus-phx";
rev = "9cd8f248c9381ffedc799905050abce194a97514";
sha256 = "0211z4bxb0bc0zcrhnph9kbbvvi1f2v95madpr96pqzr60y21cam";
};
beamDeps = with final; [ prometheus_ex ];
};
majic = beamPackages.buildMix rec {
name = "majic";
version = "1.0.0";
src = fetchFromGitLab {
domain = "git.pleroma.social";
group = "pleroma";
owner = "elixir-libraries";
repo = "majic";
rev = "289cda1b6d0d70ccb2ba508a2b0bd24638db2880";
sha256 = "15605lsdd74bmsp5z96f76ihn7m2g3p1hjbhs2x7v7309n1k108n";
};
patchPhase = ''
substituteInPlace lib/majic/server.ex --replace "erlang.now" "erlang.time"
'';
buildInputs = [ file ];
beamDeps = with final; [ nimble_pool mime plug elixir_make ];
};
crypt = beamPackages.buildRebar3 rec {
name = "crypt";
version = "0.4.3";
src = fetchFromGitLab {
domain = "git.pleroma.social";
group = "pleroma";
owner = "elixir-libraries";
repo = "crypt";
rev = "cf2aa3f11632e8b0634810a15b3e612c7526f6a3";
sha256 = "0fnzljxy9pwabh1nzx0vawn131d5pdfb0p98kvpkqs441jr0ii73";
};
postInstall = "mv $out/lib/erlang/lib/crypt-${version}/priv/{source,crypt}.so";
beamDeps = with final; [ elixir_make ];
};
web_push_encryption = beamPackages.buildMix rec {
name = "web_push_encryption";
version = "0.3.0";
src = fetchFromGitHub {
owner = "lanodan";
repo = "elixir-web-push-encryption";
rev = "026a043037a89db4da8f07560bc8f9c68bcf0cc0";
sha256 = "0a4x6njqp8v579bc965c9ipsr1z3klrc0pvgj8x1xf69r77gs6sj";
};
beamDeps = with final; [ httpoison jose ];
};
# Some additional build inputs and build fixes
http_signatures = prev.http_signatures.override {
patchPhase = ''
substituteInPlace mix.exs --replace ":logger" ":logger, :public_key"
'';
};
fast_html = prev.fast_html.override {
nativeBuildInputs = [ cmake ];
dontUseCmakeConfigure = true;
};
syslog = prev.syslog.override {
buildPlugins = with beamPackages; [ pc ];
};
# This needs a different version (1.0.14 -> 1.0.18) to build properly with
# our Erlang/OTP version.
eimp = beamPackages.buildRebar3 rec {
name = "eimp";
version = "1.0.18";
src = beamPackages.fetchHex {
pkg = name;
inherit version;
sha256 = "0fnx2pm1n2m0zs2skivv43s42hrgpq9i143p9mngw9f3swjqpxvx";
};
patchPhase = ''
echo '{plugins, [pc]}.' >> rebar.config
'';
buildPlugins = with beamPackages; [ pc ];
beamDeps = with final; [ p1_utils ];
};
mime = prev.mime.override {
patchPhase = let
cfgFile = writeText "config.exs" ''
use Mix.Config
config :mime, :types, %{
"application/activity+json" => ["activity+json"],
"application/jrd+json" => ["jrd+json"],
"application/ld+json" => ["activity+json"],
"application/xml" => ["xml"],
"application/xrd+xml" => ["xrd+xml"]
}
'';
in ''
mkdir config
cp ${cfgFile} config/config.exs
'';
};
});
};
passthru = {
tests.pleroma = nixosTests.pleroma;
inherit mixNixDeps;
};
meta = with lib; {
description = "ActivityPub microblogging server";
homepage = https://git.pleroma.social/pleroma/pleroma;
license = licenses.agpl3;
maintainers = with maintainers; [ petabyteboy ninjatrappeur ];
platforms = [ "x86_64-linux" "aarch64-linux" ];
};
}

1520
pkgs/servers/pleroma/mix.nix Normal file

File diff suppressed because it is too large Load diff

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "oksh";
version = "6.8.1";
version = "6.9";
src = fetchFromGitHub {
owner = "ibara";
repo = pname;
rev = "${pname}-${version}";
sha256 = "0lny550qfanysc4pqs0mxxx8zyz6plv9ll8y05gz0xmq9vx5384r";
sha256 = "sha256-b5b6xYqlmjWAT8kTq6YraVLawV/k3ugHZUjXD1LJyhs=";
};
meta = with lib; {

View file

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "zsh-fast-syntax-highlighting";
version = "1.54";
version = "1.55";
src = fetchFromGitHub {
owner = "zdharma";
repo = "fast-syntax-highlighting";
rev = "v${version}";
sha256 = "019hda2pj8lf7px4h1z07b9l6icxx4b2a072jw36lz9bh6jahp32";
sha256 = "0h7f27gz586xxw7cc0wyiv3bx0x3qih2wwh05ad85bh2h834ar8d";
};
dontConfigure = true;
@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation rec {
plugindir="$out/share/zsh/site-functions"
mkdir -p "$plugindir"
cp -r -- {,_,-}fast-* chroma themes "$plugindir"/
cp -r -- {,_,-,.}fast-* *chroma themes "$plugindir"/
'';
meta = with lib; {

View file

@ -1,20 +1,20 @@
# DO NOT EDIT! This file is generated automatically by update.sh
{ }:
{
version = "3.3.1";
version = "3.4.0";
pulumiPkgs = {
x86_64-linux = [
{
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.3.1-linux-x64.tar.gz";
sha256 = "1mqvx5g1pfc5fi4xmdp8fva1pzfxqm062mzl972fc3yrzfl7792f";
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.4.0-linux-x64.tar.gz";
sha256 = "1xi4sr7wl948j0hjjjg7gxiy5y3zdlg4b2k8y0h2sf6s8h5hdrm3";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-linux-amd64.tar.gz";
sha256 = "0d88xfi7zzmpyrnvakwxsyavdx6d5hmfrcf4jhmd53mni0m0551l";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.6.0-linux-amd64.tar.gz";
sha256 = "0i2bwxx49nqca3kykxbjfbbmgyr3qdlw3q4wp384ai5r9psk4iac";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.7.0-linux-amd64.tar.gz";
sha256 = "1zygz2imx7fxnczlcz4lbcxp521k94sjasqndjd9566y10xk64px";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.1.0-linux-amd64.tar.gz";
@ -29,8 +29,8 @@
sha256 = "1ppwha1zk73w39msp6jym9in7jsrxzc530qgj4lj0961mb9rdkra";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.3.1-linux-amd64.tar.gz";
sha256 = "1r9cgwb0d332hrx33i40vphimhwcnqw5gkzbin7rmxlmasrkgwwy";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.4.0-linux-amd64.tar.gz";
sha256 = "1fyk7vy0lfbwhfr0m25nphrfiza14ysyciynhsk3cy613sjbcxgx";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.0.0-linux-amd64.tar.gz";
@ -41,8 +41,8 @@
sha256 = "0yhdcjscdkvvai95z2v6xabvvsfvaqi38ngpqrb73ahlwqhz3nys";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.6.0-linux-amd64.tar.gz";
sha256 = "1pagydam6xypb1gbk710v3qid2bn77df9lzqfxk5l2pbbs65cvyp";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.8.0-linux-amd64.tar.gz";
sha256 = "0gnhan9wmrkszpcd8a43k5z12pwgzwaqgryz6qiz3r829aasbgf4";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.1.0-linux-amd64.tar.gz";
@ -57,8 +57,8 @@
sha256 = "0lqnb1xrb5ma8ssvn63lh92ihja6zx4nrx40pici1ggaln4sphn0";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.3.0-linux-amd64.tar.gz";
sha256 = "0l1pr8yfq901wr8ngan1hrwhb4lvcxa92sg38gqixzma0x6xhgwb";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.3.1-linux-amd64.tar.gz";
sha256 = "027jqzk2nxsqwff7yx306sz2b3r6nyj0za2kyw1aid5k2lg4wc6k";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.1.0-linux-amd64.tar.gz";
@ -99,16 +99,16 @@
];
x86_64-darwin = [
{
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.3.1-darwin-x64.tar.gz";
sha256 = "0ri2wq45qm8fabdfsyr1vipnf6ybshxhqr3zrjs8qq1pyf92m5ks";
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.4.0-darwin-x64.tar.gz";
sha256 = "169il8bb4y3kbl6ms5856wfv2ws8pmyq1zgj6x4ra5y9wm6vb492";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-darwin-amd64.tar.gz";
sha256 = "12mkr0xczdnp21k0k7qn4r3swkaq3pr6v2z853p1db7ksz5kds23";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.6.0-darwin-amd64.tar.gz";
sha256 = "1rnb9q8w88jhp9mm3g31dnd4dis3j52pl97cd0yqg046f6jm048q";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.7.0-darwin-amd64.tar.gz";
sha256 = "0gb2ridcq7zxb849s77za1cyqnh3kai54gfk6402xq736ycf5w7c";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.1.0-darwin-amd64.tar.gz";
@ -123,8 +123,8 @@
sha256 = "1wwldhy6r6985rwx9vv73jb1nsna387sk6mba81lyc55ar67nsp9";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.3.1-darwin-amd64.tar.gz";
sha256 = "18qisw7m1kih27vl2099rzw44h8qyr2f3dnxby03z95f1nwyz1f1";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.4.0-darwin-amd64.tar.gz";
sha256 = "17lvl37aplxnanmci1drx4fh1mhijfqbflkpd50y4pb3h5lpy9s0";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.0.0-darwin-amd64.tar.gz";
@ -135,8 +135,8 @@
sha256 = "1dpsbq3b0fz86355jy7rz4kcsa1lnw4azn25vzlis89ay1ncbblc";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.6.0-darwin-amd64.tar.gz";
sha256 = "07fdrg3wd3wlsvh37gbxli0xcxd2c7g61ynrxzi0q8dg7687gjpq";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.8.0-darwin-amd64.tar.gz";
sha256 = "0b80bkjmsl6g7fw0c56bphddrfj0mqnn11w80wf2czs1aclcss37";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.1.0-darwin-amd64.tar.gz";
@ -151,8 +151,8 @@
sha256 = "1lkrx2cayhhv432dvzvz8q4i1gfi659rkl59c0y0dkwbs8x425zb";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.3.0-darwin-amd64.tar.gz";
sha256 = "0ic8cnrv8z1qwnlqk3dc3xrczx4ncxwdsdh1shk655hcsfdrcldq";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.3.1-darwin-amd64.tar.gz";
sha256 = "1f3vdij0ikf4nr5zdy32qpv9kbz8pdq8d39hnx8p41cs1lxiw3kd";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.1.0-darwin-amd64.tar.gz";

View file

@ -3,24 +3,24 @@
# Version of Pulumi from
# https://www.pulumi.com/docs/get-started/install/versions/
VERSION="3.3.1"
VERSION="3.4.0"
# Grab latest release ${VERSION} from
# https://github.com/pulumi/pulumi-${NAME}/releases
plugins=(
"auth0=2.2.0"
"aws=4.6.0"
"aws=4.7.0"
"cloudflare=3.1.0"
"consul=3.2.0"
"datadog=3.3.0"
"digitalocean=4.3.1"
"digitalocean=4.4.0"
"docker=3.0.0"
"equinix-metal=2.0.0"
"gcp=5.6.0"
"gcp=5.8.0"
"github=4.1.0"
"gitlab=4.1.0"
"hcloud=1.0.0"
"kubernetes=3.3.0"
"kubernetes=3.3.1"
"linode=3.1.0"
"mailgun=3.1.0"
"mysql=3.0.0"

View file

@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = [ freeglut glew libX11 libXext libGL libGLU mesa mesa.osmesa wayland ];
nativeBuildInputs = [ pkg-config ];
configureFlags = [ "--with-system-data-files" ];
enableParallelBuilding = true;
meta = with lib; {

View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, zlib, pciutils, coreutils, acpica-tools, iasl, makeWrapper, gnugrep, gnused, file, buildEnv }:
let
version = "4.13";
version = "4.14";
commonMeta = with lib; {
description = "Various coreboot-related tools";
@ -16,13 +16,14 @@ let
src = fetchurl {
url = "https://coreboot.org/releases/coreboot-${version}.tar.xz";
sha256 = "0sl50aajnah4a138sr3jjm3ydc8gfh5vvlhviz3ypp95b9jdlya7";
sha256 = "0viw2x4ckjwiylb92w85k06b0g9pmamjy2yqs7fxfqbmfadkf1yr";
};
enableParallelBuilding = true;
postPatch = ''
cd ${path}
patchShebangs .
'';
makeFlags = [

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "kak-lsp";
version = "9.0.0";
version = "10.0.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "1wfv2fy5ga6kc51zka3pak0hq97csm2l11bz74w3n1hrf5q9nnf8";
sha256 = "sha256-SmK4G9AoKGqKGbXucn5AO5DTOeVNq3gCBGvDTIJQgRU=";
};
cargoSha256 = "1b6bcqbdkpxgxyfz89d8fhxfxvqc988pa9wxq5fsihnix8bm7jdk";
cargoSha256 = "sha256-iY5xT8e/gRN/mBT9v5LhMcl9g1/SyrH/glPBP+toZ9o=";
buildInputs = lib.optional stdenv.isDarwin [ Security ];

View file

@ -4,22 +4,23 @@
let
inherit (python3Packages)
python nose cryptography pyyaml requests mock python-dateutil setuptools;
python pytest nose cryptography pyyaml requests mock python-dateutil setuptools;
in stdenv.mkDerivation rec {
pname = "svtplay-dl";
version = "3.7";
version = "3.9.1";
src = fetchFromGitHub {
owner = "spaam";
repo = "svtplay-dl";
rev = version;
sha256 = "0krskxbmlglkipqzjwgm2nmq118m8l0djgh0f8l6n2w3bjblhyfx";
sha256 = "0b207l3dnkpixjhxzis77cfhwd5mjiwrmj8cngxpx2wl1i83xw54";
};
pythonPaths = [ cryptography pyyaml requests ];
buildInputs = [ python perl nose mock python-dateutil setuptools ] ++ pythonPaths;
buildInputs = [ python perl mock python-dateutil setuptools ] ++ pythonPaths;
nativeBuildInputs = [ gitMinimal zip makeWrapper ];
checkInputs = [ nose pytest ];
postPatch = ''
substituteInPlace scripts/run-tests.sh \

View file

@ -3,11 +3,11 @@
python3Packages.buildPythonPackage rec {
pname = "yubikey-manager";
version = "4.0.1";
version = "4.0.3";
srcs = fetchurl {
url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz";
hash = "sha256-OxbKo5vwOBabU6/2hO4RMWiifo4IVIxz+DlcwP9xO/E=";
hash = "sha256-p7tv/bj6PMCnCU5j8Vhi60LxLiPmR1Cuf8xVdDVtZvQ=";
};
propagatedBuildInputs =

View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "boundary";
version = "0.2.3";
version = "0.3.0";
src =
let
@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
x86_64-darwin = "darwin_amd64";
};
sha256 = selectSystem {
x86_64-linux = "sha256-tfTyhuQaVh0F1HvFS+ToDk/lJEHEYMQVNFpdEjABer4=";
aarch64-linux = "sha256-0g6nYoNgu3C/r4fgKuZBrzTjpt14lQf2rpbVMS9CEZE=";
x86_64-darwin = "sha256-er1bDqi+PDucwUSsWDi8z1fUZTz7epq6HE6cOLTN3SE=";
x86_64-linux = "sha256-vBXNDd9p9g1joBMcwt87uI/EIAeKa+QrndCh1kTwZyM=";
aarch64-linux = "sha256-Xompe1Q8Q3gAqpQQT04CWDx/f0Yc8HbnkZQbN+faB0g=";
x86_64-darwin = "sha256-cE4YrZPNAldCR31O3gI4W/y4RgV7+64yL15obb5uRcY=";
};
in
fetchzip {

View file

@ -5,17 +5,20 @@
buildGoModule rec {
pname = "ipinfo";
version = "1.1.5";
version = "2.0.1";
src = fetchFromGitHub {
owner = pname;
repo = "cli";
rev = "${pname}-${version}";
sha256 = "16i5vmx39j7l5mhs28niapki9530nsbw6xik8rsky55v9i5pr72d";
sha256 = "00rqqkybvzxcpa6fy799fxmn95xqx7s3z3mqfryzi35dlmjdfzqy";
};
vendorSha256 = null;
# Tests require network access
doCheck = false;
meta = with lib; {
description = "Command Line Interface for the IPinfo API";
homepage = "https://github.com/ipinfo/cli";

View file

@ -0,0 +1,35 @@
{ lib, stdenv, fetchFromGitLab, fetchpatch, bluez }:
stdenv.mkDerivation rec {
pname = "redfang";
version = "2.5";
src = fetchFromGitLab {
group = "kalilinux";
owner = "packages";
repo = pname;
rev = "upstream/${version}";
sha256 = "sha256-dF9QmBckyHAZ+JbLr0jTmp0eMu947unJqjrTMsJAfIE=";
};
patches = [
# make install rule
(fetchpatch {
url = "https://gitlab.com/kalilinux/packages/redfang/-/merge_requests/1.diff";
sha256 = "sha256-oxIrUAucxsBL4+u9zNNe2XXoAd088AEAHcRB/AN7B1M=";
})
];
installFlags = [ "DESTDIR=$(out)" ];
NIX_CFLAGS_COMPILE = "-Wno-format-security";
buildInputs = [ bluez ];
meta = with lib; {
description = "A small proof-of-concept application to find non discoverable bluetooth devices";
homepage = "https://gitlab.com/kalilinux/packages/redfang";
license = licenses.gpl2Only;
maintainers = with maintainers; [ fortuneteller2k ];
};
}

View file

@ -1,5 +1,16 @@
{ stdenv, lib, fetchFromGitHub, asciidoc, cmake, docbook_xsl, pkg-config
, bash-completion, openssl, curl, libxml2, libxslt }:
{ stdenv
, lib
, fetchFromGitHub
, asciidoc
, cmake
, docbook_xsl
, pkg-config
, bash-completion
, openssl
, curl
, libxml2
, libxslt
}:
stdenv.mkDerivation rec {
pname = "lastpass-cli";
@ -15,7 +26,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ asciidoc cmake docbook_xsl pkg-config ];
buildInputs = [
bash-completion curl openssl libxml2 libxslt
bash-completion
curl
openssl
libxml2
libxslt
];
installTargets = [ "install" "install-doc" ];
@ -23,13 +38,14 @@ stdenv.mkDerivation rec {
postInstall = ''
install -Dm644 -T ../contrib/lpass_zsh_completion $out/share/zsh/site-functions/_lpass
install -Dm644 -T ../contrib/completions-lpass.fish $out/share/fish/vendor_completions.d/lpass.fish
install -Dm755 -T ../contrib/examples/git-credential-lastpass $out/bin/git-credential-lastpass
'';
meta = with lib; {
description = "Stores, retrieves, generates, and synchronizes passwords securely";
homepage = "https://github.com/lastpass/lastpass-cli";
license = licenses.gpl2Plus;
platforms = platforms.unix;
homepage = "https://github.com/lastpass/lastpass-cli";
license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ cstrahan ];
};
}

View file

@ -0,0 +1,29 @@
{ lib, stdenv, fetchFromGitHub, bison, flex, perl, }:
stdenv.mkDerivation rec {
pname = "jbofihe";
version = "0.43";
src = fetchFromGitHub {
owner = "lojban";
repo = "jbofihe";
rev = "v${version}";
sha256 = "1xx7x1256sjncyzx656jl6jl546vn8zz0siymqalz6v9yf341p98";
};
nativeBuildInputs = [ bison flex perl ];
doCheck = true;
checkPhase = ''
runHook preCheck
(cd tests && ./run *.in)
runHook postCheck
'';
meta = with lib; {
description = "Parser & analyser for Lojban";
homepage = "https://github.com/lojban/jbofihe";
license = licenses.gpl2Only;
maintainers = with maintainers; [ chkno ];
};
}

View file

@ -522,6 +522,7 @@ mapAliases ({
openjpeg_2 = openjpeg; # added 2021-01-25
opensans-ttf = open-sans; # added 2018-12-04
openssh_with_kerberos = openssh; # added 2018-01-28
orchis = orchis-theme; # added 2021-06-09
onnxruntime = throw "onnxruntime has been removed due to poor maintainability"; # added 2020-12-04
osquery = throw "osquery has been removed."; # added 2019-11-24
osxfuse = macfuse-stubs; # added 2021-03-20
@ -600,6 +601,7 @@ mapAliases ({
pkgconfig = pkg-config; # added 2018-02-02, moved to aliases.nix 2021-01-18
pkgconfigUpstream = pkg-configUpstream; # added 2018-02-02
planner = throw "planner has been removed from nixpkgs, as it is no longer developed and still uses python2/PyGTK."; # added 2021-02-02
pleroma-otp = pleroma; # added 2021-07-10
pltScheme = racket; # just to be sure
plexpy = tautulli; # plexpy got renamed to tautulli, added 2019-02-22
pmtools = acpica-tools; # added 2018-11-01

View file

@ -874,6 +874,8 @@ in
quich = callPackage ../tools/misc/quich { } ;
redfang = callPackage ../tools/networking/redfang { };
tfk8s = callPackage ../tools/misc/tfk8s { };
tnat64 = callPackage ../tools/networking/tnat64 { };
@ -1950,6 +1952,8 @@ in
cudaSupport = config.cudaSupport or false;
};
tensorflow-lite = callPackage ../development/libraries/science/math/tensorflow-lite { };
behdad-fonts = callPackage ../data/fonts/behdad-fonts { };
bfetch = callPackage ../tools/misc/bfetch { };
@ -6490,6 +6494,9 @@ in
ispell = callPackage ../tools/text/ispell {};
iodash = callPackage ../development/libraries/iodash { };
jbofihe = callPackage ../tools/text/jbofihe {};
jumanpp = callPackage ../tools/text/jumanpp {};
jump = callPackage ../tools/system/jump {};
@ -7869,7 +7876,7 @@ in
tautulli = python3Packages.callPackage ../servers/tautulli { };
pleroma-otp = callPackage ../servers/pleroma-otp { };
pleroma = callPackage ../servers/pleroma { };
ploticus = callPackage ../tools/graphics/ploticus {
libpng = libpng12;
@ -11978,6 +11985,8 @@ in
jdk = oraclejdk;
};
sqlfluff = callPackage ../development/tools/database/sqlfluff { };
sqlx-cli = callPackage ../development/tools/rust/sqlx-cli {
inherit (darwin.apple_sdk.frameworks) SystemConfiguration CoreFoundation Security;
};
@ -16115,6 +16124,8 @@ in
libfprint-2-tod1-goodix = callPackage ../development/libraries/libfprint-2-tod1-goodix { };
libfprint-2-tod1-vfs0090 = callPackage ../development/libraries/libfprint-2-tod1-vfs0090 { };
libfpx = callPackage ../development/libraries/libfpx { };
libgadu = callPackage ../development/libraries/libgadu { };
@ -22180,7 +22191,7 @@ in
orbitron = callPackage ../data/fonts/orbitron { };
orchis = callPackage ../data/themes/orchis { };
orchis-theme = callPackage ../data/themes/orchis-theme { };
orion = callPackage ../data/themes/orion {};
@ -29410,9 +29421,7 @@ in
migrate = callPackage ../applications/science/biology/migrate { };
minia = callPackage ../applications/science/biology/minia {
boost = boost159;
};
minia = callPackage ../applications/science/biology/minia { };
mirtk = callPackage ../development/libraries/science/biology/mirtk { };
@ -31288,6 +31297,8 @@ in
vbam = callPackage ../misc/emulators/vbam { };
vgmstream = callPackage ../applications/audio/vgmstream { };
vice = callPackage ../misc/emulators/vice { };
ViennaRNA = callPackage ../applications/science/molecular-dynamics/viennarna { };

View file

@ -233,6 +233,8 @@ let
csv-lwt = callPackage ../development/ocaml-modules/csv/lwt.nix { };
cudf = callPackage ../development/ocaml-modules/cudf { };
curly = callPackage ../development/ocaml-modules/curly {
inherit (pkgs) curl;
};

View file

@ -7449,6 +7449,8 @@ in {
runway-python = callPackage ../development/python-modules/runway-python { };
ruyaml = callPackage ../development/python-modules/ruyaml { };
rx = callPackage ../development/python-modules/rx { };
rxv = callPackage ../development/python-modules/rxv { };