sternenseemann
2 years ago
commit
60c9963d40
@ -0,0 +1,25 @@ |
||||
From b2935ed7e2962d73f3b493c38c0bb1e8659c0a60 Mon Sep 17 00:00:00 2001
|
||||
From: toonn <toonn@toonn.io>
|
||||
Date: Tue, 8 Mar 2022 23:59:19 +0100
|
||||
Subject: [PATCH 1/2] Use command -v in favor of which
|
||||
|
||||
---
|
||||
Makerules | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makerules b/Makerules
|
||||
index 0fdaecb..6d52cca 100644
|
||||
--- a/Makerules
|
||||
+++ b/Makerules
|
||||
@@ -145,7 +145,7 @@ else ifeq ($(OS),MACOS)
|
||||
LD = xcrun ld
|
||||
RANLIB = xcrun ranlib
|
||||
|
||||
- ifeq (, $(shell which pkg-config))
|
||||
+ ifeq (, $(shell command -v pkg-config))
|
||||
$(warning "No pkg-config found, install it for proper integration of libcrypto")
|
||||
else
|
||||
HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)
|
||||
--
|
||||
2.17.2 (Apple Git-113)
|
||||
|
||||
@ -0,0 +1,57 @@ |
||||
From 0f0ccfc01cfe72d96eafee57ec6c5107f09c7238 Mon Sep 17 00:00:00 2001
|
||||
From: toonn <toonn@toonn.io>
|
||||
Date: Wed, 9 Mar 2022 00:08:28 +0100
|
||||
Subject: [PATCH 2/2] Add Darwin deps
|
||||
|
||||
---
|
||||
Makerules | 34 ++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 34 insertions(+)
|
||||
|
||||
diff --git a/Makerules b/Makerules
|
||||
index 6d52cca..a6bd0ed 100644
|
||||
--- a/Makerules
|
||||
+++ b/Makerules
|
||||
@@ -153,6 +153,40 @@ else ifeq ($(OS),MACOS)
|
||||
LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
|
||||
LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
|
||||
endif
|
||||
+ # Required for mupdf-gl
|
||||
+ ifeq ($(shell pkg-config --exists harfbuzz && echo yes),yes)
|
||||
+ SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz)
|
||||
+ SYS_HARFBUZZ_LIBS := $(shell pkg-config --libs harfbuzz)
|
||||
+ endif
|
||||
+ ifeq ($(shell pkg-config --exists libopenjp2 && echo yes),yes)
|
||||
+ SYS_OPENJPEG_CFLAGS := $(shell pkg-config --cflags libopenjp2)
|
||||
+ SYS_OPENJPEG_LIBS := $(shell pkg-config --libs libopenjp2)
|
||||
+ endif
|
||||
+ ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
|
||||
+ SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
|
||||
+ SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2)
|
||||
+ endif
|
||||
+ ifeq ($(shell pkg-config --exists gumbo && echo yes),yes)
|
||||
+ SYS_GUMBO_CFLAGS := $(shell pkg-config --cflags gumbo)
|
||||
+ SYS_GUMBO_LIBS := $(shell pkg-config --libs gumbo)
|
||||
+ endif
|
||||
+ # Required for mupdf-x11
|
||||
+ HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes)
|
||||
+ ifeq ($(HAVE_X11),yes)
|
||||
+ X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
|
||||
+ X11_LIBS := $(shell pkg-config --libs x11 xext)
|
||||
+ endif
|
||||
+ # Required for mupdf-x11-curl
|
||||
+ HAVE_SYS_CURL := $(shell pkg-config --exists libcurl && echo yes)
|
||||
+ ifeq ($(HAVE_SYS_CURL),yes)
|
||||
+ SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
|
||||
+ SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
|
||||
+ endif
|
||||
+ HAVE_PTHREAD := yes
|
||||
+ ifeq ($(HAVE_PTHREAD),yes)
|
||||
+ PTHREAD_CFLAGS :=
|
||||
+ PTHREAD_LIBS := -lpthread
|
||||
+ endif
|
||||
endif
|
||||
|
||||
else ifeq ($(OS),Linux)
|
||||
--
|
||||
2.17.2 (Apple Git-113)
|
||||
|
||||
@ -1,35 +1,32 @@ |
||||
{ lib, stdenv, fetchgit, sqlite, wxGTK30, gettext, wrapGAppsHook }: |
||||
{ lib, stdenv, fetchFromGitHub, sqlite, wxGTK30, gettext, wrapGAppsHook }: |
||||
|
||||
|
||||
let |
||||
stdenv.mkDerivation rec { |
||||
pname = "money-manager-ex"; |
||||
version = "1.3.3"; |
||||
in |
||||
stdenv.mkDerivation { |
||||
pname = "money-manager-ex"; |
||||
inherit version; |
||||
|
||||
src = fetchgit { |
||||
url = "https://github.com/moneymanagerex/moneymanagerex.git"; |
||||
rev = "refs/tags/v${version}"; |
||||
sha256 = "0r4n93z3scv0i0zqflsxwv7j4yl8jy3gr0m4l30y1q8qv0zj9n74"; |
||||
}; |
||||
src = fetchFromGitHub { |
||||
owner = "moneymanagerex"; |
||||
repo = "moneymanagerex"; |
||||
rev = "refs/tags/v${version}"; |
||||
sha256 = "sha256-5NgkP9gY4eDBoKSC/IaXiHoiz+ZdU4c/iGAzPf5IlmQ="; |
||||
}; |
||||
|
||||
nativeBuildInputs = [ |
||||
wrapGAppsHook |
||||
]; |
||||
nativeBuildInputs = [ |
||||
wrapGAppsHook |
||||
]; |
||||
|
||||
buildInputs = [ |
||||
gettext |
||||
sqlite |
||||
wxGTK30 |
||||
wxGTK30.gtk |
||||
]; |
||||
buildInputs = [ |
||||
gettext |
||||
sqlite |
||||
wxGTK30 |
||||
wxGTK30.gtk |
||||
]; |
||||
|
||||
meta = { |
||||
description = "Easy-to-use personal finance software"; |
||||
homepage = "https://www.moneymanagerex.org/"; |
||||
license = lib.licenses.gpl2Plus; |
||||
maintainers = with lib.maintainers; [viric]; |
||||
platforms = with lib.platforms; linux; |
||||
}; |
||||
} |
||||
meta = { |
||||
description = "Easy-to-use personal finance software"; |
||||
homepage = "https://www.moneymanagerex.org/"; |
||||
license = lib.licenses.gpl2Plus; |
||||
maintainers = with lib.maintainers; [viric]; |
||||
platforms = with lib.platforms; linux; |
||||
}; |
||||
} |
||||
|
||||
@ -0,0 +1,52 @@ |
||||
{ lib |
||||
, poetry-core |
||||
, buildPythonPackage |
||||
, fetchFromGitHub |
||||
, pythonOlder |
||||
, importlib-metadata |
||||
, packaging |
||||
, pytestCheckHook |
||||
}: |
||||
|
||||
buildPythonPackage rec { |
||||
pname = "dunamai"; |
||||
version = "1.10.0"; |
||||
format = "pyproject"; |
||||
|
||||
disabled = pythonOlder "3.7"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "mtkennerly"; |
||||
repo = "dunamai"; |
||||
rev = "v${version}"; |
||||
sha256 = "sha256-Sp0yfNkFwNc2qR9aSPteBqZcqRokM9whOVmduXVK3CI="; |
||||
}; |
||||
|
||||
nativeBuildInputs = [ |
||||
poetry-core |
||||
]; |
||||
|
||||
propagatedBuildInputs = [ |
||||
packaging |
||||
] ++ lib.optionals (pythonOlder "3.8") [ |
||||
importlib-metadata |
||||
]; |
||||
|
||||
# needs to be able to run dunami from PATH |
||||
preCheck = '' |
||||
export PATH=$PATH:$out/bin |
||||
''; |
||||
|
||||
checkInputs = [ |
||||
pytestCheckHook |
||||
]; |
||||
|
||||
pythonImportsCheck = [ "dunamai" ]; |
||||
|
||||
meta = with lib; { |
||||
description = "Dynamic version generation"; |
||||
homepage = "https://github.com/mtkennerly/dunamai"; |
||||
license = licenses.mit; |
||||
maintainers = with maintainers; [ jmgilman ]; |
||||
}; |
||||
} |
||||
@ -1,37 +1,65 @@ |
||||
{ stdenv, lib, buildPythonPackage, fetchFromGitHub, python, pkg-config, pango, cython, AppKit, pytestCheckHook }: |
||||
{ lib |
||||
, stdenv |
||||
, buildPythonPackage |
||||
, fetchFromGitHub |
||||
, python |
||||
, pkg-config |
||||
, pango |
||||
, cython |
||||
, AppKit |
||||
, pytestCheckHook |
||||
, pythonOlder |
||||
}: |
||||
|
||||
buildPythonPackage rec { |
||||
pname = "manimpango"; |
||||
version = "0.4.0.post2"; |
||||
version = "0.4.1"; |
||||
format = "setuptools"; |
||||
|
||||
disabled = pythonOlder "3.7"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "ManimCommunity"; |
||||
repo = pname; |
||||
rev = "v${version}"; |
||||
sha256 = "sha256-BMRlEdvJJOUbsvKEoZx2qJqHSbL475dhBthUpnsXkn4="; |
||||
hash = "sha256-ourSUYBAFONdupdsjo/PtwRQpXS7HqLxrHj0Ejr/Wdw="; |
||||
}; |
||||
|
||||
postPatch = '' |
||||
substituteInPlace setup.cfg --replace "--cov --no-cov-on-fail" "" |
||||
''; |
||||
nativeBuildInputs = [ |
||||
pkg-config |
||||
]; |
||||
|
||||
buildInputs = [ |
||||
pango |
||||
] ++ lib.optionals stdenv.isDarwin [ |
||||
AppKit |
||||
]; |
||||
|
||||
nativeBuildInputs = [ pkg-config ]; |
||||
buildInputs = [ pango ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; |
||||
propagatedBuildInputs = [ |
||||
cython |
||||
]; |
||||
|
||||
checkInputs = [ |
||||
pytestCheckHook |
||||
]; |
||||
|
||||
postPatch = '' |
||||
substituteInPlace setup.cfg \ |
||||
--replace "--cov --no-cov-on-fail" "" |
||||
''; |
||||
|
||||
preBuild = '' |
||||
${python.interpreter} setup.py build_ext --inplace |
||||
''; |
||||
|
||||
checkInputs = [ pytestCheckHook ]; |
||||
pythonImportsCheck = [ "manimpango" ]; |
||||
pythonImportsCheck = [ |
||||
"manimpango" |
||||
]; |
||||
|
||||
meta = with lib; { |
||||
description = "Binding for Pango"; |
||||
homepage = "https://github.com/ManimCommunity/ManimPango"; |
||||
license = licenses.mit; |
||||
description = "Binding for Pango"; |
||||
maintainers = [ maintainers.emilytrau ]; |
||||
maintainers = with maintainers; [ emilytrau ]; |
||||
}; |
||||
} |
||||
|
||||
@ -1,31 +1,38 @@ |
||||
{ lib |
||||
, buildGoPackage |
||||
, buildGoModule |
||||
, fetchFromGitHub |
||||
}: |
||||
|
||||
buildGoPackage rec { |
||||
buildGoModule rec { |
||||
pname = "tfsec"; |
||||
version = "1.2.1"; |
||||
version = "1.13.0"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "aquasecurity"; |
||||
repo = pname; |
||||
rev = "v${version}"; |
||||
sha256 = "sha256-KIS2o2pLus5aohRYsabWRxZs4KfYM6PXSNp0JZhhlZk="; |
||||
sha256 = "sha256-/N8p/tw97sDW4I1ysfJ2QXACGsSc5nRFSu6jHwQvPU4="; |
||||
}; |
||||
|
||||
goPackagePath = "github.com/aquasecurity/tfsec"; |
||||
|
||||
ldflags = [ |
||||
"-w" |
||||
"-s" |
||||
"-X ${goPackagePath}/version.Version=${version}" |
||||
"-s" "-w" |
||||
"-X github.com/aquasecurity/tfsec/version.Version=${version}" |
||||
## not sure if this is needed (https://github.com/aquasecurity/tfsec/blob/master/.goreleaser.yml#L6) |
||||
# "-extldflags '-fno-PIC -static'" |
||||
]; |
||||
|
||||
vendorSha256 = "sha256-nTma96kT84mpJHRA9+/sZQVvwtz9arv/OHY9lgWJDFc="; |
||||
|
||||
subPackages = [ |
||||
"cmd/tfsec" |
||||
"cmd/tfsec-docs" |
||||
"cmd/tfsec-checkgen" |
||||
]; |
||||
|
||||
meta = with lib; { |
||||
description = "Static analysis powered security scanner for terraform code"; |
||||
homepage = "https://github.com/aquasecurity/tfsec"; |
||||
license = licenses.mit; |
||||
maintainers = with maintainers; [ fab marsam ]; |
||||
maintainers = with maintainers; [ fab marsam peterromfeldhk ]; |
||||
}; |
||||
} |
||||
|
||||
@ -1,15 +1,15 @@ |
||||
{ lib, buildGoPackage, fetchgit }: |
||||
{ lib, buildGoPackage, fetchFromGitHub }: |
||||
|
||||
buildGoPackage rec { |
||||
pname = "gotags"; |
||||
version = "20150803-${lib.strings.substring 0 7 rev}"; |
||||
rev = "be986a34e20634775ac73e11a5b55916085c48e7"; |
||||
version = "unstable-2015-08-03"; |
||||
|
||||
goPackagePath = "github.com/jstemmer/gotags"; |
||||
|
||||
src = fetchgit { |
||||
inherit rev; |
||||
url = "https://github.com/jstemmer/gotags"; |
||||
sha256 = "071wyq90b06xlb3bb0l4qjz1gf4nnci4bcngiddfcxf2l41w1vja"; |
||||
src = fetchFromGitHub { |
||||
owner = "jstemmer"; |
||||
repo = "gotags"; |
||||
rev = "be986a34e20634775ac73e11a5b55916085c48e7"; |
||||
sha256 = "sha256-Su7AA6HCdeZai8+yRSKzlrgXvsSEgrXGot2ABRL2PBw="; |
||||
}; |
||||
} |
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue