github-actions[bot]
2 years ago
committed by
GitHub
commit
774062c10e
@ -1,32 +0,0 @@ |
||||
{ lib, buildGoPackage, fetchFromGitHub, fetchpatch }: |
||||
|
||||
buildGoPackage rec { |
||||
pname = "mqtt-bench"; |
||||
version = "0.3.0"; |
||||
rev = "v${version}"; |
||||
|
||||
goPackagePath = "github.com/takanorig/mqtt-bench"; |
||||
|
||||
src = fetchFromGitHub { |
||||
inherit rev; |
||||
owner = "takanorig"; |
||||
repo = "mqtt-bench"; |
||||
sha256 = "03b9ak2j303iwq6abd7j10f2cs2ianwnbflwmyx9g96i7zd74f5m"; |
||||
}; |
||||
|
||||
patches = [ |
||||
(fetchpatch { |
||||
url = "https://patch-diff.githubusercontent.com/raw/takanorig/mqtt-bench/pull/13.patch"; |
||||
name = "mqtt-paho-changes.patch"; |
||||
sha256 = "17c8ajrp5dmbsasj6njxrlhy0x08b65fignzm3yccqbhb4ijcvha"; |
||||
}) |
||||
]; |
||||
|
||||
goDeps = ./deps.nix; |
||||
|
||||
meta = with lib; { |
||||
description = "Mosquitto benchmark tool"; |
||||
homepage = "https://github.com/takanorig/mqtt-bench"; |
||||
maintainers = with maintainers; [ disassembler ]; |
||||
}; |
||||
} |
||||
@ -1,21 +0,0 @@ |
||||
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 |
||||
[ |
||||
{ |
||||
goPackagePath = "github.com/eclipse/paho.mqtt.golang"; |
||||
fetch = { |
||||
type = "git"; |
||||
url = "https://github.com/eclipse/paho.mqtt.golang"; |
||||
rev = "65f43bda5f7edbbf6b7533d3a5a13b2c67cf3545"; |
||||
sha256 = "1ad136xf78br599ya43j45f8dycjip1k0hkplayy1slg8ckwrhdr"; |
||||
}; |
||||
} |
||||
{ |
||||
goPackagePath = "golang.org/x/net"; |
||||
fetch = { |
||||
type = "git"; |
||||
url = "https://go.googlesource.com/net"; |
||||
rev = "8351a756f30f1297fe94bbf4b767ec589c6ea6d0"; |
||||
sha256 = "0b6m579i3wrx1m69mqkdng5gjfssprxx0pg45kzrdi68sh0zr5d1"; |
||||
}; |
||||
} |
||||
] |
||||
@ -1,43 +1,56 @@ |
||||
{ lib, buildGoPackage, fetchFromGitHub, ronn, installShellFiles }: |
||||
{ lib, buildGoModule, fetchFromGitHub, ronn, installShellFiles, git, testers, git-lfs }: |
||||
|
||||
buildGoPackage rec { |
||||
buildGoModule rec { |
||||
pname = "git-lfs"; |
||||
version = "3.2.0"; |
||||
|
||||
src = fetchFromGitHub { |
||||
rev = "v${version}"; |
||||
owner = "git-lfs"; |
||||
repo = "git-lfs"; |
||||
rev = "v${version}"; |
||||
sha256 = "sha256-3gVUPfZs5GViEA3D7Zm5NdxhuEz9DhwPLoQqHFdGCrI="; |
||||
leaveDotGit = true; |
||||
}; |
||||
|
||||
goPackagePath = "github.com/git-lfs/git-lfs"; |
||||
vendorSha256 = null; |
||||
|
||||
nativeBuildInputs = [ ronn installShellFiles ]; |
||||
|
||||
ldflags = [ "-s" "-w" "-X ${goPackagePath}/config.Vendor=${version}" "-X ${goPackagePath}/config.GitCommit=${src.rev}" ]; |
||||
ldflags = [ |
||||
"-s" |
||||
"-w" |
||||
"-X github.com/git-lfs/git-lfs/v${lib.versions.major version}/config.Vendor=${version}" |
||||
]; |
||||
|
||||
subPackages = [ "." ]; |
||||
|
||||
preBuild = '' |
||||
pushd go/src/github.com/git-lfs/git-lfs |
||||
go generate ./commands |
||||
popd |
||||
go generate ./commands |
||||
''; |
||||
|
||||
postBuild = '' |
||||
make -C go/src/${goPackagePath} man |
||||
make man |
||||
''; |
||||
|
||||
checkInputs = [ git ]; |
||||
|
||||
preCheck = '' |
||||
unset subPackages |
||||
''; |
||||
|
||||
postInstall = '' |
||||
installManPage go/src/${goPackagePath}/man/man*/* |
||||
installManPage man/man*/* |
||||
''; |
||||
|
||||
passthru.tests.version = testers.testVersion { |
||||
package = git-lfs; |
||||
}; |
||||
|
||||
meta = with lib; { |
||||
description = "Git extension for versioning large files"; |
||||
homepage = "https://git-lfs.github.com/"; |
||||
changelog = "https://github.com/git-lfs/git-lfs/raw/v${version}/CHANGELOG.md"; |
||||
license = [ licenses.mit ]; |
||||
maintainers = [ maintainers.twey maintainers.marsam ]; |
||||
homepage = "https://git-lfs.github.com/"; |
||||
changelog = "https://github.com/git-lfs/git-lfs/raw/v${version}/CHANGELOG.md"; |
||||
license = licenses.mit; |
||||
maintainers = with maintainers; [ twey marsam ]; |
||||
}; |
||||
} |
||||
|
||||
@ -1,29 +0,0 @@ |
||||
diff -Naur fluent-bit.old/cmake/luajit.cmake fluent-bit.new/cmake/luajit.cmake
|
||||
--- fluent-bit.old/cmake/luajit.cmake
|
||||
+++ fluent-bit.new/cmake/luajit.cmake
|
||||
@@ -12,15 +12,7 @@
|
||||
set(LUAJIT_DEST ${CMAKE_CURRENT_BINARY_DIR})
|
||||
|
||||
if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
|
||||
- set(CFLAGS "${CFLAGS} -isysroot ${CMAKE_OSX_SYSROOT} -fno-stack-check")
|
||||
- if (CMAKE_HOST_SYSTEM_VERSION VERSION_GREATER_EQUAL 20
|
||||
- AND CMAKE_HOST_SYSTEM_VERSION VERSION_LESS 21)
|
||||
- set(DEPLOYMENT_TARGET "MACOSX_DEPLOYMENT_TARGET=11.0")
|
||||
- else()
|
||||
- set(DEPLOYMENT_TARGET "MACOSX_DEPLOYMENT_TARGET=10.15")
|
||||
- endif()
|
||||
-else()
|
||||
- set(DEPLOYMENT_TARGET "")
|
||||
+ set(CFLAGS "${CFLAGS} -fno-stack-check")
|
||||
endif()
|
||||
|
||||
# luajit (UNIX)
|
||||
@@ -30,7 +22,7 @@
|
||||
EXCLUDE_FROM_ALL TRUE
|
||||
SOURCE_DIR ${LUAJIT_SRC}
|
||||
CONFIGURE_COMMAND ./configure
|
||||
- BUILD_COMMAND $(MAKE) CROSS=${CROSS_PREFIX} CFLAGS=${CFLAGS} BUILD_MODE=static "XCFLAGS=-fPIC" ${DEPLOYMENT_TARGET}
|
||||
+ BUILD_COMMAND $(MAKE) DEFAULT_CC=cc CROSS=${CROSS_PREFIX} CFLAGS=${CFLAGS} BUILD_MODE=static "XCFLAGS=-fPIC"
|
||||
INSTALL_COMMAND cp src/libluajit.a "${LUAJIT_DEST}/lib/libluajit.a")
|
||||
|
||||
# luajit (Windows)
|
||||
Loading…
Reference in new issue