Frederik Rietdijk
2 years ago
commit
25c014324b
@ -0,0 +1,32 @@ |
||||
{ config, lib, pkgs, ... }: |
||||
|
||||
with lib; |
||||
|
||||
let |
||||
cfg = config.services.sslmate-agent; |
||||
|
||||
in { |
||||
meta.maintainers = with maintainers; [ wolfangaukang ]; |
||||
|
||||
options = { |
||||
services.sslmate-agent = { |
||||
enable = mkEnableOption "sslmate-agent, a daemon for managing SSL/TLS certificates on a server"; |
||||
}; |
||||
}; |
||||
|
||||
config = mkIf cfg.enable { |
||||
environment.systemPackages = with pkgs; [ sslmate-agent ]; |
||||
|
||||
systemd = { |
||||
packages = [ pkgs.sslmate-agent ]; |
||||
services.sslmate-agent = { |
||||
wantedBy = [ "multi-user.target" ]; |
||||
serviceConfig = { |
||||
ConfigurationDirectory = "sslmate-agent"; |
||||
LogsDirectory = "sslmate-agent"; |
||||
StateDirectory = "sslmate-agent"; |
||||
}; |
||||
}; |
||||
}; |
||||
}; |
||||
} |
||||
@ -0,0 +1,60 @@ |
||||
{ lib |
||||
, stdenv |
||||
, fetchurl |
||||
, autoPatchelfHook |
||||
, dpkg |
||||
, alsa-lib |
||||
, freetype |
||||
, libglvnd |
||||
, mesa |
||||
, curl |
||||
, libXcursor |
||||
, libXinerama |
||||
, libXrandr |
||||
, libXrender |
||||
, libjack2 |
||||
}: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
pname = "tonelib-metal"; |
||||
version = "1.1.0"; |
||||
|
||||
src = fetchurl { |
||||
url = "https://www.tonelib.net/download/220218/ToneLib-Metal-amd64.deb"; |
||||
sha256 = "sha256-F5EKwNQ9f/kdZLFI+QDZHvwevV/vDnxMdSmT/vnX6ug="; |
||||
}; |
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook dpkg ]; |
||||
|
||||
buildInputs = [ |
||||
stdenv.cc.cc.lib |
||||
alsa-lib |
||||
freetype |
||||
libglvnd |
||||
mesa |
||||
] ++ runtimeDependencies; |
||||
|
||||
runtimeDependencies = map lib.getLib [ |
||||
curl |
||||
libXcursor |
||||
libXinerama |
||||
libXrandr |
||||
libXrender |
||||
libjack2 |
||||
]; |
||||
|
||||
unpackCmd = "dpkg -x $curSrc source"; |
||||
|
||||
installPhase = '' |
||||
mv usr $out |
||||
substituteInPlace $out/share/applications/ToneLib-Metal.desktop --replace /usr/ $out/ |
||||
''; |
||||
|
||||
meta = with lib; { |
||||
description = "ToneLib Metal – Guitar amp simulator targeted at metal players"; |
||||
homepage = "https://tonelib.net/"; |
||||
license = licenses.unfree; |
||||
maintainers = with maintainers; [ dan4ik605743 ]; |
||||
platforms = [ "x86_64-linux" ]; |
||||
}; |
||||
} |
||||
@ -0,0 +1,27 @@ |
||||
{ lib, fetchFromGitHub }: |
||||
|
||||
let |
||||
pname = "dancing-script"; |
||||
version = "2.0"; |
||||
in fetchFromGitHub { |
||||
name = "${pname}-${version}"; |
||||
|
||||
owner = "impallari"; |
||||
repo = "DancingScript"; |
||||
rev = "f7f54bc1b8836601dae8696666bfacd306f77e34"; |
||||
sha256 = "dfFvh8h+oMhAQL9XKMrNr07VUkdQdxAsA8+q27KWWCA="; |
||||
|
||||
postFetch = '' |
||||
tar xf $downloadedFile --strip=1 |
||||
install -m444 -Dt $out/share/fonts/truetype fonts/ttf/*.ttf |
||||
''; |
||||
|
||||
meta = with lib; { |
||||
description = "Dancing Script"; |
||||
longDescription = "A lively casual script where the letters bounce and change size slightly."; |
||||
homepage = "https://github.com/impallari/DancingScript"; |
||||
license = licenses.ofl; |
||||
platforms = platforms.all; |
||||
maintainers = with maintainers; [ wdavidw ]; |
||||
}; |
||||
} |
||||
@ -1,21 +1,45 @@ |
||||
{ lib, fetchPypi, buildPythonApplication, editorconfig, pytest, six }: |
||||
{ lib |
||||
, fetchPypi |
||||
, buildPythonApplication |
||||
, editorconfig |
||||
, pytestCheckHook |
||||
, pythonOlder |
||||
, six |
||||
}: |
||||
|
||||
buildPythonApplication rec { |
||||
pname = "jsbeautifier"; |
||||
version = "1.14.0"; |
||||
version = "1.14.1"; |
||||
format = "setuptools"; |
||||
|
||||
propagatedBuildInputs = [ six editorconfig ]; |
||||
checkInputs = [ pytest ]; |
||||
disabled = pythonOlder "3.7"; |
||||
|
||||
src = fetchPypi { |
||||
inherit pname version; |
||||
sha256 = "84fdb008d8af89619269a6aca702288b48f837a99427a0f529aa57ecfb36ee3c"; |
||||
hash = "sha256-ZfT3dLDkywIutJmbRc1ndi92Qnxe80CCq6VLwdjvI+s="; |
||||
}; |
||||
|
||||
propagatedBuildInputs = [ |
||||
editorconfig |
||||
six |
||||
]; |
||||
|
||||
checkInputs = [ |
||||
pytestCheckHook |
||||
]; |
||||
|
||||
pythonImportsCheck = [ |
||||
"jsbeautifier" |
||||
]; |
||||
|
||||
pytestFlagsArray = [ |
||||
"jsbeautifier/tests/testindentation.py" |
||||
]; |
||||
|
||||
meta = with lib; { |
||||
homepage = "http://jsbeautifier.org"; |
||||
description = "JavaScript unobfuscator and beautifier."; |
||||
license = licenses.mit; |
||||
description = "JavaScript unobfuscator and beautifier"; |
||||
homepage = "http://jsbeautifier.org"; |
||||
license = licenses.mit; |
||||
maintainers = with maintainers; [ apeyroux ]; |
||||
}; |
||||
} |
||||
|
||||
@ -0,0 +1,19 @@ |
||||
diff --git a/sipbuild/project.py b/sipbuild/project.py
|
||||
--- a/sipbuild/project.py
|
||||
+++ b/sipbuild/project.py
|
||||
@@ -336,13 +336,13 @@ class Project(AbstractProject, Configurable):
|
||||
# We expect a two part tag so leave anything else unchanged.
|
||||
parts = platform_tag.split('-')
|
||||
if len(parts) == 2:
|
||||
- if self.minimum_glibc_version > (2, 17):
|
||||
+ if self.minimum_glibc_version > (2, 17) or parts[1] not in {"x86_64", "i686", "aarch64", "armv7l", "ppc64", "ppc64le", "s390x"}:
|
||||
# PEP 600.
|
||||
parts[0] = 'manylinux'
|
||||
parts.insert(1,
|
||||
'{}.{}'.format(self.minimum_glibc_version[0],
|
||||
self.minimum_glibc_version[1]))
|
||||
- elif self.minimum_glibc_version > (2, 12):
|
||||
+ elif self.minimum_glibc_version > (2, 12) or parts[1] not in {"x86_64", "i686"}:
|
||||
# PEP 599.
|
||||
parts[0] = 'manylinux2014'
|
||||
elif self.minimum_glibc_version > (2, 5):
|
||||
@ -0,0 +1,40 @@ |
||||
{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook }: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
pname = "sslmate-agent"; |
||||
version = "1.99.11"; |
||||
|
||||
src = fetchurl { |
||||
url = "https://packages.sslmate.com/debian/pool/sslmate2/s/sslmate-client/${pname}_${version}-1_amd64.deb"; |
||||
sha256 = "sha256-LBiZI0pGAFWnvTigEhtkhHq4FGdbYiMzjLheMuP0YTU="; |
||||
}; |
||||
|
||||
nativeBuildInputs = [ |
||||
dpkg |
||||
autoPatchelfHook |
||||
]; |
||||
|
||||
unpackCmd = '' |
||||
dpkg-deb -x ${src} ./sslmate-agent-${pname} |
||||
''; |
||||
|
||||
installPhase = '' |
||||
runHook preInstall |
||||
|
||||
# Not moving etc because it only contains init.rd setttings |
||||
mv usr $out |
||||
mv lib $out |
||||
|
||||
substituteInPlace $out/lib/systemd/system/sslmate-agent.service \ |
||||
--replace "/usr/s" "$out/" |
||||
|
||||
runHook postInstall |
||||
''; |
||||
|
||||
meta = with lib; { |
||||
description = "Daemon for managing SSL/TLS certificates on a server"; |
||||
homepage = "https://sslmate.com/"; |
||||
license = licenses.unfree; |
||||
maintainers = with maintainers; [ wolfangaukang ]; |
||||
}; |
||||
} |
||||
@ -1,42 +0,0 @@ |
||||
diff --git a/Makefile b/Makefile
|
||||
index 955f737..2c9532c 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -80,7 +80,7 @@ REGRESS_ARGS += "--parse-no-autolink"
|
||||
REGRESS_ARGS += "--parse-no-cmark"
|
||||
REGRESS_ARGS += "--parse-no-deflists"
|
||||
|
||||
-all: lowdown lowdown-diff lowdown.pc
|
||||
+all: lowdown lowdown-diff liblowdown.so lowdown.pc
|
||||
|
||||
www: $(HTMLS) $(PDFS) $(THUMBS) lowdown.tar.gz lowdown.tar.gz.sha512
|
||||
|
||||
@@ -101,6 +101,10 @@ lowdown-diff: lowdown
|
||||
liblowdown.a: $(OBJS) $(COMPAT_OBJS)
|
||||
$(AR) rs $@ $(OBJS) $(COMPAT_OBJS)
|
||||
|
||||
+%.o: CFLAGS += -fPIC
|
||||
+liblowdown.so: $(OBJS) $(COMPAT_OBJS)
|
||||
+ $(CC) -shared -o $@ $(OBJS) $(COMPAT_OBJS) $(LDFLAGS)
|
||||
+
|
||||
install: all
|
||||
mkdir -p $(DESTDIR)$(BINDIR)
|
||||
mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
|
||||
@@ -111,7 +114,7 @@ install: all
|
||||
$(INSTALL_DATA) lowdown.pc $(DESTDIR)$(LIBDIR)/pkgconfig
|
||||
$(INSTALL_PROGRAM) lowdown $(DESTDIR)$(BINDIR)
|
||||
$(INSTALL_PROGRAM) lowdown-diff $(DESTDIR)$(BINDIR)
|
||||
- $(INSTALL_LIB) liblowdown.a $(DESTDIR)$(LIBDIR)
|
||||
+ $(INSTALL_LIB) liblowdown.so $(DESTDIR)$(LIBDIR)
|
||||
$(INSTALL_DATA) lowdown.h $(DESTDIR)$(INCLUDEDIR)
|
||||
for f in $(MANS) ; do \
|
||||
name=`basename $$f .html` ; \
|
||||
@@ -199,7 +202,7 @@ main.o: lowdown.h
|
||||
|
||||
clean:
|
||||
rm -f $(OBJS) $(COMPAT_OBJS) main.o
|
||||
- rm -f lowdown lowdown-diff liblowdown.a lowdown.pc
|
||||
+ rm -f lowdown lowdown-diff liblowdown.so lowdown.pc
|
||||
rm -f index.xml diff.xml diff.diff.xml README.xml lowdown.tar.gz.sha512 lowdown.tar.gz
|
||||
rm -f $(PDFS) $(HTMLS) $(THUMBS)
|
||||
|
||||
Loading…
Reference in new issue