Dennis Gosnell
2 years ago
commit
660ce9cd0d
@ -1,16 +0,0 @@ |
||||
diff --git a/command/init.go b/command/init.go
|
||||
index 403ca245b..05d98329a 100644
|
||||
--- a/command/init.go
|
||||
+++ b/command/init.go
|
||||
@@ -64,6 +64,11 @@ func (c *InitCommand) Run(args []string) int {
|
||||
return 1
|
||||
}
|
||||
|
||||
+ val, ok := os.LookupEnv("NIX_TERRAFORM_PLUGIN_DIR")
|
||||
+ if ok {
|
||||
+ flagPluginPath = append(flagPluginPath, val)
|
||||
+ }
|
||||
+
|
||||
if len(flagPluginPath) > 0 {
|
||||
c.pluginPath = flagPluginPath
|
||||
c.getPlugins = false
|
||||
@ -0,0 +1,58 @@ |
||||
{ lib |
||||
, stdenv |
||||
, fetchFromGitHub |
||||
, writeText |
||||
, fontconfig |
||||
, libX11 |
||||
, libXft |
||||
, libXinerama |
||||
, libXpm |
||||
, libXrender |
||||
, conf ? null |
||||
}: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
pname = "shod"; |
||||
version = "2.4.0"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "phillbush"; |
||||
repo = "shod"; |
||||
rev = "v${version}"; |
||||
sha256 = "sha256-jrPuI3ADppqaJ2y9GksiJZZd4LtN1P5yjWwlf9VuYDc="; |
||||
}; |
||||
|
||||
buildInputs = [ |
||||
fontconfig |
||||
libX11 |
||||
libXft |
||||
libXinerama |
||||
libXpm |
||||
libXrender |
||||
]; |
||||
|
||||
postPatch = |
||||
let |
||||
configFile = |
||||
if lib.isDerivation conf || builtins.isPath conf |
||||
then conf else writeText "config.h" conf; |
||||
in |
||||
lib.optionalString (conf != null) "cp ${configFile} config.h"; |
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ]; |
||||
|
||||
meta = with lib; { |
||||
description = "A mouse-based window manager that can tile windows inside floating containers"; |
||||
longDescription = '' |
||||
shod is a multi-monitor floating reparenting X11 window manager that |
||||
supports tiled and tabbed containers. shod sets no keybindings, reads no |
||||
configuration, and works only via mouse with a given key modifier (Alt by |
||||
default) and by responding to client messages sent by the shodc utility |
||||
(shod's remote controller). |
||||
''; |
||||
homepage = "https://github.com/phillbush/shod"; |
||||
license = licenses.mit; |
||||
maintainers = with maintainers; [ azahi ]; |
||||
platforms = platforms.unix; |
||||
}; |
||||
} |
||||
@ -0,0 +1,42 @@ |
||||
{ stdenv |
||||
, lib |
||||
, fetchurl |
||||
, autoreconfHook |
||||
, pkg-config |
||||
, libopenmpt |
||||
}: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
pname = "libopenmpt-modplug"; |
||||
version = "0.8.9.0-openmpt1"; |
||||
|
||||
outputs = [ "out" "dev" ]; |
||||
|
||||
src = fetchurl { |
||||
url = "https://lib.openmpt.org/files/libopenmpt-modplug/libopenmpt-modplug-${version}.tar.gz"; |
||||
sha256 = "sha256-7M4aDuz9sLWCTKuJwnDc5ZWWKVosF8KwQyFez018T/c="; |
||||
}; |
||||
|
||||
enableParallelBuilding = true; |
||||
|
||||
nativeBuildInputs = [ |
||||
autoreconfHook |
||||
pkg-config |
||||
]; |
||||
|
||||
buildInputs = [ |
||||
libopenmpt |
||||
]; |
||||
|
||||
configureFlags = [ |
||||
"--enable-libmodplug" |
||||
]; |
||||
|
||||
meta = with lib; { |
||||
description = "A libmodplug emulation layer based on libopenmpt"; |
||||
homepage = "https://lib.openmpt.org/libopenmpt/"; |
||||
license = licenses.bsd3; |
||||
maintainers = with maintainers; [ OPNA2608 ]; |
||||
platforms = platforms.unix; |
||||
}; |
||||
} |
||||
@ -1,244 +0,0 @@ |
||||
From 3d983eff304c28574c330a52d70a60145c9e157e Mon Sep 17 00:00:00 2001
|
||||
From: Jonas Vautherin <jonas.vautherin@gmail.com>
|
||||
Date: Fri, 14 Jan 2022 00:14:26 +0100
|
||||
Subject: [PATCH] Add support for musl
|
||||
|
||||
---
|
||||
Based on upstream 77ac9154440bcc216fda1092fd5bb51da62ae09c,
|
||||
modified slightly by dtzWill to apply to v0.9.1.
|
||||
|
||||
(drop whitespace change to a cmake "if (WITH_OPENSSL)",
|
||||
leave the other instance of that change since it applies)
|
||||
---
|
||||
|
||||
Co-authored-by: Guillaume Papin <guillaume.papin@epitech.eu>
|
||||
(cherry picked from commit 77ac9154440bcc216fda1092fd5bb51da62ae09c)
|
||||
---
|
||||
.github/workflows/quick-test.yml | 9 ++++++
|
||||
c++/CMakeLists.txt | 46 ++++++++++++++++++++++++++++-
|
||||
c++/cmake/CapnProtoConfig.cmake.in | 32 ++++++++++++++++++++
|
||||
c++/configure.ac | 47 ++++++++++++++++++++++++++++--
|
||||
c++/src/kj/CMakeLists.txt | 11 ++++++-
|
||||
5 files changed, 141 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/.github/workflows/quick-test.yml b/.github/workflows/quick-test.yml
|
||||
index c18ef6a6..773ff043 100644
|
||||
--- a/.github/workflows/quick-test.yml
|
||||
+++ b/.github/workflows/quick-test.yml
|
||||
@@ -10,6 +10,15 @@ on:
|
||||
- 'release-*'
|
||||
|
||||
jobs:
|
||||
+ Linux-musl:
|
||||
+ runs-on: ubuntu-latest
|
||||
+ container: alpine:latest
|
||||
+ steps:
|
||||
+ - uses: actions/checkout@v2
|
||||
+ - name: install dependencies
|
||||
+ run: apk add autoconf automake build-base cmake libtool libucontext-dev linux-headers openssl-dev
|
||||
+ - name: super-test
|
||||
+ run: ./super-test.sh quick
|
||||
Linux:
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
diff --git a/c++/CMakeLists.txt b/c++/CMakeLists.txt
|
||||
index 548dfd1f..5de7ab26 100644
|
||||
--- a/c++/CMakeLists.txt
|
||||
+++ b/c++/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 3.4)
|
||||
+cmake_minimum_required(VERSION 3.6)
|
||||
project("Cap'n Proto" CXX)
|
||||
set(VERSION 0.9.1)
|
||||
|
||||
@@ -64,6 +64,50 @@ elseif (WITH_OPENSSL)
|
||||
find_package(OpenSSL REQUIRED COMPONENTS Crypto SSL)
|
||||
endif()
|
||||
|
||||
+set(WITH_FIBERS "AUTO" CACHE STRING
|
||||
+ "Whether or not to build libkj-async with fibers")
|
||||
+# define list of values GUI will offer for the variable
|
||||
+set_property(CACHE WITH_FIBERS PROPERTY STRINGS AUTO ON OFF)
|
||||
+
|
||||
+# CapnProtoConfig.cmake.in needs this variable.
|
||||
+set(_WITH_LIBUCONTEXT OFF)
|
||||
+
|
||||
+if (WITH_FIBERS OR WITH_FIBERS STREQUAL "AUTO")
|
||||
+ set(_capnp_fibers_found OFF)
|
||||
+ if (WIN32 OR CYGWIN)
|
||||
+ set(_capnp_fibers_found ON)
|
||||
+ else()
|
||||
+ # Fibers need makecontext, setcontext, getcontext, swapcontext that may be in libc,
|
||||
+ # or in libucontext (e.g. for musl).
|
||||
+ # We assume that makecontext implies that the others are present.
|
||||
+ include(CheckLibraryExists)
|
||||
+ check_library_exists(c makecontext "" HAVE_UCONTEXT_LIBC)
|
||||
+ if (HAVE_UCONTEXT_LIBC)
|
||||
+ set(_capnp_fibers_found ON)
|
||||
+ else()
|
||||
+ # Try with libucontext
|
||||
+ find_package(PkgConfig)
|
||||
+ if (PKG_CONFIG_FOUND)
|
||||
+ pkg_check_modules(libucontext IMPORTED_TARGET libucontext)
|
||||
+ if (libucontext_FOUND)
|
||||
+ set(_WITH_LIBUCONTEXT ON)
|
||||
+ set(_capnp_fibers_found ON)
|
||||
+ endif()
|
||||
+ else()
|
||||
+ set(_capnp_fibers_found OFF)
|
||||
+ endif()
|
||||
+ endif()
|
||||
+ endif()
|
||||
+
|
||||
+ if (_capnp_fibers_found)
|
||||
+ set(WITH_FIBERS ON)
|
||||
+ elseif(WITH_FIBERS STREQUAL "AUTO")
|
||||
+ set(WITH_FIBERS OFF)
|
||||
+ else()
|
||||
+ message(FATAL_ERROR "Missing 'makecontext', 'getcontext', 'setcontext' or 'swapcontext' symbol in libc and no libucontext found: KJ won't be able to build with fibers. Disable fibers (-DWITH_FIBERS=OFF).")
|
||||
+ endif()
|
||||
+endif()
|
||||
+
|
||||
if(MSVC)
|
||||
# TODO(cleanup): Enable higher warning level in MSVC, but make sure to test
|
||||
# build with that warning level and clean out false positives.
|
||||
diff --git a/c++/cmake/CapnProtoConfig.cmake.in b/c++/cmake/CapnProtoConfig.cmake.in
|
||||
index 667f502f..0580b11a 100644
|
||||
--- a/c++/cmake/CapnProtoConfig.cmake.in
|
||||
+++ b/c++/cmake/CapnProtoConfig.cmake.in
|
||||
@@ -62,6 +62,38 @@ if (@WITH_OPENSSL@) # WITH_OPENSSL
|
||||
endif()
|
||||
endif()
|
||||
|
||||
+if (@_WITH_LIBUCONTEXT@) # _WITH_LIBUCONTEXT
|
||||
+ set(forwarded_config_flags)
|
||||
+ if(CapnProto_FIND_QUIETLY)
|
||||
+ list(APPEND forwarded_config_flags QUIET)
|
||||
+ endif()
|
||||
+ if(CapnProto_FIND_REQUIRED)
|
||||
+ list(APPEND forwarded_config_flags REQUIRED)
|
||||
+ endif()
|
||||
+ # If the consuming project called find_package(CapnProto) with the QUIET or REQUIRED flags, forward
|
||||
+ # them to calls to find_package(PkgConfig) and pkg_check_modules(). Note that find_dependency()
|
||||
+ # would do this for us in the former case, but there is no such forwarding wrapper for
|
||||
+ # pkg_check_modules().
|
||||
+
|
||||
+ find_package(PkgConfig ${forwarded_config_flags})
|
||||
+ if(NOT ${PkgConfig_FOUND})
|
||||
+ # If we're here, the REQUIRED flag must not have been passed, else we would have had a fatal
|
||||
+ # error. Nevertheless, a diagnostic for this case is probably nice.
|
||||
+ if(NOT CapnProto_FIND_QUIETLY)
|
||||
+ message(WARNING "pkg-config cannot be found")
|
||||
+ endif()
|
||||
+ set(CapnProto_FOUND OFF)
|
||||
+ return()
|
||||
+ endif()
|
||||
+
|
||||
+ if (CMAKE_VERSION VERSION_LESS 3.6)
|
||||
+ # CMake >= 3.6 required due to the use of IMPORTED_TARGET
|
||||
+ message(SEND_ERROR "libucontext support requires CMake >= 3.6.")
|
||||
+ endif()
|
||||
+
|
||||
+ pkg_check_modules(libucontext IMPORTED_TARGET ${forwarded_config_flags} libucontext)
|
||||
+endif()
|
||||
+
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/CapnProtoTargets.cmake")
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/CapnProtoMacros.cmake")
|
||||
|
||||
diff --git a/c++/configure.ac b/c++/configure.ac
|
||||
index 72fe8456..b627bec8 100644
|
||||
--- a/c++/configure.ac
|
||||
+++ b/c++/configure.ac
|
||||
@@ -32,6 +32,11 @@ AC_ARG_WITH([openssl],
|
||||
[build libkj-tls by linking against openssl @<:@default=check@:>@])],
|
||||
[],[with_openssl=check])
|
||||
|
||||
+AC_ARG_WITH([fibers],
|
||||
+ [AS_HELP_STRING([--with-fibers],
|
||||
+ [build libkj-async with fibers @<:@default=check@:>@])],
|
||||
+ [],[with_fibers=check])
|
||||
+
|
||||
AC_ARG_ENABLE([reflection], [
|
||||
AS_HELP_STRING([--disable-reflection], [
|
||||
compile Cap'n Proto in "lite mode", in which all reflection APIs (schema.h, dynamic.h, etc.)
|
||||
@@ -195,8 +200,46 @@ AS_IF([test "$with_openssl" != no], [
|
||||
])
|
||||
AM_CONDITIONAL([BUILD_KJ_TLS], [test "$with_openssl" != no])
|
||||
|
||||
-# CapnProtoConfig.cmake.in needs this variable.
|
||||
-AC_SUBST(WITH_OPENSSL, $with_openssl)
|
||||
+# Fibers need the symbols getcontext, setcontext, swapcontext and makecontext.
|
||||
+# We assume that makecontext implies the rest.
|
||||
+AS_IF([test "$with_fibers" != no], [
|
||||
+ libc_supports_fibers=yes
|
||||
+ AC_SEARCH_LIBS([makecontext], [], [], [
|
||||
+ libc_supports_fibers=no
|
||||
+ ])
|
||||
+
|
||||
+ AS_IF([test "$libc_supports_fibers" = yes], [
|
||||
+ with_fibers=yes
|
||||
+ ], [
|
||||
+ # If getcontext does not exist in libc, try with libucontext
|
||||
+ ucontext_supports_fibers=yes
|
||||
+ AC_CHECK_LIB(ucontext, [makecontext], [], [
|
||||
+ ucontext_supports_fibers=no
|
||||
+ ])
|
||||
+ AS_IF([test "$ucontext_supports_fibers" = yes], [
|
||||
+ ASYNC_LIBS="$ASYNC_LIBS -lucontext"
|
||||
+ with_fibers=yes
|
||||
+ ], [
|
||||
+ AS_IF([test "$with_fibers" = yes], [
|
||||
+ AC_MSG_ERROR([Missing symbols required for fibers (makecontext, setcontext, ...). Disable fibers (--without-fibers) or install libucontext])
|
||||
+ ], [
|
||||
+ AC_MSG_WARN([could not find required symbols (makecontext, setcontext, ...) -- won't build with fibers])
|
||||
+ with_fibers=no
|
||||
+ ])
|
||||
+ ])
|
||||
+ ])
|
||||
+])
|
||||
+AS_IF([test "$with_fibers" = yes], [
|
||||
+ CXXFLAGS="$CXXFLAGS -DKJ_USE_FIBERS"
|
||||
+], [
|
||||
+ CXXFLAGS="$CXXFLAGS -DKJ_USE_FIBERS=0"
|
||||
+])
|
||||
+
|
||||
+# CapnProtoConfig.cmake.in needs these variables,
|
||||
+# we force them to NO because we don't need the CMake dependency for them,
|
||||
+# the dependencies are provided by the .pc files.
|
||||
+AC_SUBST(WITH_OPENSSL, NO)
|
||||
+AC_SUBST(_WITH_LIBUCONTEXT, NO)
|
||||
|
||||
AM_CONDITIONAL([HAS_FUZZING_ENGINE], [test "x$LIB_FUZZING_ENGINE" != "x"])
|
||||
|
||||
diff --git a/c++/src/kj/CMakeLists.txt b/c++/src/kj/CMakeLists.txt
|
||||
index 813fac4d..f7b4dddf 100644
|
||||
--- a/c++/src/kj/CMakeLists.txt
|
||||
+++ b/c++/src/kj/CMakeLists.txt
|
||||
@@ -136,6 +136,15 @@ if(NOT CAPNP_LITE)
|
||||
add_library(kj-async ${kj-async_sources})
|
||||
add_library(CapnProto::kj-async ALIAS kj-async)
|
||||
target_link_libraries(kj-async PUBLIC kj)
|
||||
+ if(WITH_FIBERS)
|
||||
+ target_compile_definitions(kj-async PUBLIC KJ_USE_FIBERS)
|
||||
+ if(_WITH_LIBUCONTEXT)
|
||||
+ target_link_libraries(kj-async PUBLIC PkgConfig::libucontext)
|
||||
+ endif()
|
||||
+ else()
|
||||
+ target_compile_definitions(kj-async PUBLIC KJ_USE_FIBERS=0)
|
||||
+ endif()
|
||||
+
|
||||
if(UNIX)
|
||||
# external clients of this library need to link to pthreads
|
||||
target_compile_options(kj-async INTERFACE "-pthread")
|
||||
@@ -181,7 +190,7 @@ if(NOT CAPNP_LITE)
|
||||
add_library(kj-tls ${kj-tls_sources})
|
||||
add_library(CapnProto::kj-tls ALIAS kj-tls)
|
||||
target_link_libraries(kj-tls PUBLIC kj-async)
|
||||
- if (WITH_OPENSSL)
|
||||
+ if(WITH_OPENSSL)
|
||||
target_compile_definitions(kj-tls PRIVATE KJ_HAS_OPENSSL)
|
||||
target_link_libraries(kj-tls PRIVATE OpenSSL::SSL OpenSSL::Crypto)
|
||||
endif()
|
||||
--
|
||||
2.35.1
|
||||
|
||||
@ -0,0 +1,26 @@ |
||||
From 94c4768cd69b026e498d92133dd6c7d8589cf911 Mon Sep 17 00:00:00 2001
|
||||
From: Jiajie Chen <c@jia.je>
|
||||
Date: Sat, 25 Jun 2022 10:19:44 +0800
|
||||
Subject: [PATCH] Patch LDCXXSHARED for macOS along with LDSHARED
|
||||
|
||||
In Nixpkgs, we patched distutils to respect LDCXXSHARED environment, so
|
||||
the replacement should be taken on LDCXXSHARED as well.
|
||||
---
|
||||
cocotb_build_libs.py | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/cocotb_build_libs.py b/cocotb_build_libs.py
|
||||
index 66097ec2..d5555b36 100755
|
||||
--- a/cocotb_build_libs.py
|
||||
+++ b/cocotb_build_libs.py
|
||||
@@ -583,6 +583,7 @@ def get_ext():
|
||||
|
||||
if sys.platform == "darwin":
|
||||
cfg_vars["LDSHARED"] = cfg_vars["LDSHARED"].replace("-bundle", "-dynamiclib")
|
||||
+ cfg_vars["LDCXXSHARED"] = cfg_vars["LDCXXSHARED"].replace("-bundle", "-dynamiclib")
|
||||
|
||||
share_lib_dir = os.path.relpath(os.path.join(cocotb_share_dir, "lib"))
|
||||
include_dir = os.path.relpath(os.path.join(cocotb_share_dir, "include"))
|
||||
--
|
||||
2.36.1
|
||||
|
||||
@ -0,0 +1,24 @@ |
||||
{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook }: |
||||
|
||||
buildPythonPackage rec { |
||||
pname = "oscpy"; |
||||
version = "0.6.0"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "kivy"; |
||||
repo = "oscpy"; |
||||
rev = "v${version}"; |
||||
hash = "sha256-Luj36JLgU9xbBMydeobyf98U5zs5VwWQOPGV7TPXQwA="; |
||||
}; |
||||
|
||||
checkInputs = [ pytestCheckHook ]; |
||||
|
||||
pythonImportsCheck = [ "oscpy" ]; |
||||
|
||||
meta = with lib; { |
||||
description = "A modern implementation of OSC for python2/3"; |
||||
license = licenses.mit; |
||||
homepage = "https://github.com/kivy/oscpy"; |
||||
maintainers = [ maintainers.yurkobb ]; |
||||
}; |
||||
} |
||||
@ -0,0 +1,66 @@ |
||||
{ lib |
||||
, stdenv |
||||
, fetchFromGitHub |
||||
, copyDesktopItems |
||||
, jdk |
||||
, makeDesktopItem |
||||
, makeWrapper |
||||
}: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
pname = "graphwar"; |
||||
version = "1.0.0"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "catabriga"; |
||||
repo = "graphwar"; |
||||
rev = version; |
||||
sha256 = "sha256-t3Y576dXWp2Mj6OSQN5cm9FuNBWNqKq6xxkVRbjIBgE="; |
||||
}; |
||||
|
||||
nativeBuildInputs = [ copyDesktopItems makeWrapper ]; |
||||
buildInputs = [ jdk ]; |
||||
|
||||
buildPhase = '' |
||||
runHook preBuild |
||||
|
||||
mkdir -p out/ |
||||
javac -d out/ -sourcepath src/ -classpath out/ -encoding utf8 src/**/*.java |
||||
|
||||
runHook postBuild |
||||
''; |
||||
|
||||
installPhase = '' |
||||
runHook preInstall |
||||
|
||||
mkdir -p $out/lib/ |
||||
mv out $out/lib/graphwar |
||||
cp -r rsc $out/lib/graphwar/rsc |
||||
|
||||
makeWrapper ${jdk}/bin/java $out/bin/graphwar \ |
||||
--add-flags "-classpath $out/lib/graphwar Graphwar.Graphwar" |
||||
makeWrapper ${jdk}/bin/java $out/bin/graphwar-roomserver \ |
||||
--add-flags "-classpath $out/lib/graphwar RoomServer.RoomServer" |
||||
makeWrapper ${jdk}/bin/java $out/bin/graphwar-globalserver \ |
||||
--add-flags "-classpath $out/lib/graphwar GlobalServer.GlobalServer" |
||||
|
||||
runHook postInstall |
||||
''; |
||||
|
||||
desktopItems = [ |
||||
(makeDesktopItem { |
||||
name = "graphwar"; |
||||
exec = "graphwar"; |
||||
desktopName = "Graphwar"; |
||||
categories = [ "Game" ]; |
||||
}) |
||||
]; |
||||
|
||||
meta = with lib; { |
||||
homepage = "http://www.graphwar.com/"; |
||||
description = "An artillery game in which you must hit your enemies using mathematical functions"; |
||||
license = licenses.gpl3Plus; |
||||
platforms = jdk.meta.platforms; |
||||
maintainers = with maintainers; [ yrd ]; |
||||
}; |
||||
} |
||||
@ -0,0 +1,31 @@ |
||||
{ stdenv |
||||
, lib |
||||
, rustPlatform |
||||
, fetchFromGitHub |
||||
, DiskArbitration |
||||
, Foundation |
||||
}: |
||||
|
||||
# unstable was chosen because of an added Cargo.lock |
||||
# revert to stable for the version after 0.9.0 |
||||
let version = "unstable-2022-06-25"; |
||||
in |
||||
rustPlatform.buildRustPackage { |
||||
pname = "lnx"; |
||||
inherit version; |
||||
src = fetchFromGitHub { |
||||
owner = "lnx-search"; |
||||
repo = "lnx"; |
||||
rev = "2cb80f344c558bfe37f21ccfb83265bf351419d9"; |
||||
sha256 = "sha256-iwoZ6xRzEDArmhWYxIrbIXRTQjOizyTsXCvMdnUrs2g="; |
||||
}; |
||||
cargoSha256 = "sha256-JpsZ37u3+4+X8knTxoGmJisopTsPR221rv3Bu4DMZZI="; |
||||
buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation ]; |
||||
meta = with lib; { |
||||
description = "Insanely fast, Feature-rich searching. lnx is the adaptable, typo tollerant deployment of the tantivy search engine. Standing on the shoulders of giants. "; |
||||
homepage = "https://lnx.rs/"; |
||||
license = licenses.mit; |
||||
maintainers = with maintainers; [ happysalada ]; |
||||
platforms = platforms.unix; |
||||
}; |
||||
} |
||||
@ -1,7 +1,7 @@ |
||||
{ |
||||
"version": "0.15.1", |
||||
"serverSha256": "sha256-HHr9mG0AuI/86+EjODE/GT9lhl5DeNkzQ4k077b7ICU=", |
||||
"serverCargoSha256": "sha256-ErMNsyHfBiYZA4gjaxPHO+fQseUVIKy/928oGqw+Adg=", |
||||
"uiSha256": "sha256-Al6Q1xXkjqIb2v2S4JbmlQAAFCKwzkAW924uolC0tu8=", |
||||
"uiYarnDepsSha256": "sha256-Zadp74ZHmbxCHxpDAYOa6Ot2kWujIj8ZzrSaIEsYgMY=" |
||||
"version": "0.16.4", |
||||
"serverSha256": "sha256-xbxavlmRm7QTbrAjw6IMgQq8rEgyEHdcj11EhsOY+j0=", |
||||
"serverCargoSha256": "sha256-vDIaLpw0C6fnv0quH20qRN0I38Br338+MS9YzVfNizU=", |
||||
"uiSha256": "sha256-GZH/fSYLbxwigrr5LwAzxH4ElDVjTs8Tqqq+xYDFNCU", |
||||
"uiYarnDepsSha256": "sha256-BQs9UXUT/CcxJ7CdLksYGvGPGAaW7FLUAShLsbPC0jw=" |
||||
} |
||||
|
||||
@ -0,0 +1,39 @@ |
||||
{ lib |
||||
, makeWrapper |
||||
, buildGoModule |
||||
, fetchFromGitHub |
||||
, gopass |
||||
}: |
||||
|
||||
buildGoModule rec { |
||||
pname = "gopass-hibp"; |
||||
version = "1.14.3"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "gopasspw"; |
||||
repo = pname; |
||||
rev = "v${version}"; |
||||
sha256 = "sha256-JwZZ2VaSD9xkLny5sFeku5rN4FitI1dyW56JSWPMagM="; |
||||
}; |
||||
|
||||
vendorSha256 = "sha256-YySkVWdfGIT5qz0jTGlLEHoO0vGY0iNZ/oG9IZCjwRE="; |
||||
|
||||
subPackages = [ "." ]; |
||||
|
||||
nativeBuildInputs = [ makeWrapper ]; |
||||
|
||||
ldflags = [ |
||||
"-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" |
||||
]; |
||||
|
||||
postFixup = '' |
||||
wrapProgram $out/bin/gopass-hibp --prefix PATH : "${lib.makeBinPath [ gopass ]}" |
||||
''; |
||||
|
||||
meta = with lib; { |
||||
description = "Gopass haveibeenpwnd.com integration"; |
||||
homepage = "https://www.gopass.pw/"; |
||||
license = licenses.mit; |
||||
maintainers = with maintainers; [ sikmir ]; |
||||
}; |
||||
} |
||||
Loading…
Reference in new issue