github-actions[bot]
2 years ago
committed by
GitHub
commit
a993c6ae0e
@ -1,5 +1,5 @@ |
||||
import ./make-test-python.nix ({ pkgs, ... }: { |
||||
name = "grafana-mimir"; |
||||
name = "mimir"; |
||||
nodes = { |
||||
server = { ... }: { |
||||
environment.systemPackages = [ pkgs.jq ]; |
||||
@ -1,13 +1,13 @@ |
||||
{ |
||||
"version": "0.1.6", |
||||
"version": "0.1.7", |
||||
"assets": { |
||||
"x86_64-darwin": { |
||||
"asset": "scala-cli-x86_64-apple-darwin.gz", |
||||
"sha256": "1wcm47x0w4gdhkqrqjn0qvgnn36c707mz9m260pdnnffja203vyr" |
||||
"sha256": "1sly3s9y742nms8kqwh2cikjkcnbkkafsql8sw2w2zr53z28g10v" |
||||
}, |
||||
"x86_64-linux": { |
||||
"asset": "scala-cli-x86_64-pc-linux.gz", |
||||
"sha256": "1jwv67p2r6kxqlz8p2zvk5g5jdswl8cymj822b88lbp78a497kc6" |
||||
"sha256": "1lgcbxzhwqfnj6n81w1ssdcrn1j0c93chqgh0zzqi08w8wk3x4j5" |
||||
} |
||||
} |
||||
} |
||||
|
||||
@ -0,0 +1,26 @@ |
||||
{ stdenv, lib, fetchFromGitHub, buildGoModule }: |
||||
|
||||
buildGoModule rec { |
||||
pname = "goresym"; |
||||
version = "1.2"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "mandiant"; |
||||
repo = pname; |
||||
rev = "v${version}"; |
||||
sha256 = "sha256-XDy6qALE2xuOVQHuuvU/gOyTRZ/6CWpyjN3i7VmznoI="; |
||||
}; |
||||
|
||||
subPackages = [ "." ]; |
||||
|
||||
vendorSha256 = "sha256-dnQ/tP4RS6WkACobfW7jTTJSHbLrdlZDy1fmO65743Q="; |
||||
|
||||
doCheck = true; |
||||
|
||||
meta = with lib; { |
||||
description = "Go symbol recovery tool"; |
||||
homepage = "https://github.com/mandiant/GoReSym"; |
||||
license = licenses.mit; |
||||
maintainers = with maintainers; [ mrhedgehog ]; |
||||
}; |
||||
} |
||||
@ -1,23 +1,23 @@ |
||||
{ fetchurl, fetchzip }: |
||||
{ |
||||
x86_64-darwin = fetchzip { |
||||
sha256 = "sha256-vUOdHDyvVg+8GhctW925WfjONi7TnPRfVfXmehOweB4="; |
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.6/AdGuardHome_darwin_amd64.zip"; |
||||
sha256 = "sha256-z7QFnx414sdGazUZIenAVA+7LcSZT0tTb/ldv1SGV3Q="; |
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.7/AdGuardHome_darwin_amd64.zip"; |
||||
}; |
||||
aarch64-darwin = fetchzip { |
||||
sha256 = "sha256-3JmMvxd317Qmyrv7vWyfQsLol+yPuKBXHByt5YRrbX8="; |
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.6/AdGuardHome_darwin_arm64.zip"; |
||||
sha256 = "sha256-Pbl7YaDVxdER/ubOiPq54ASB4ILnH0B3GiQlQBe7gFs="; |
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.7/AdGuardHome_darwin_arm64.zip"; |
||||
}; |
||||
i686-linux = fetchurl { |
||||
sha256 = "sha256-A6IsDRbRHyU0+IUKkrudKvlKiJkVNNs12MrKQ6RlpMQ="; |
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.6/AdGuardHome_linux_386.tar.gz"; |
||||
sha256 = "sha256-P2PsSdpW5i2hwBPUKb+viYewlVHTER/eBkwPp3koawo="; |
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.7/AdGuardHome_linux_386.tar.gz"; |
||||
}; |
||||
x86_64-linux = fetchurl { |
||||
sha256 = "sha256-nPcqAk0m1e9izkylBuNcatHESgvSewR+MKmVdz+HBec="; |
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.6/AdGuardHome_linux_amd64.tar.gz"; |
||||
sha256 = "sha256-cbTlVBlGdFgEz2b6pb0SJ7yUf4wFXnZwLCkmvX75FzU="; |
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.7/AdGuardHome_linux_amd64.tar.gz"; |
||||
}; |
||||
aarch64-linux = fetchurl { |
||||
sha256 = "sha256-ITkZdVU03FG9AUAMgD6nlCyioPJX357wB9m1jYdPlS4="; |
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.6/AdGuardHome_linux_arm64.tar.gz"; |
||||
sha256 = "sha256-TKZ3bOM5oq30GtLn9ifNyY6+2Li4nf1+r2L0ExG/10c="; |
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.7/AdGuardHome_linux_arm64.tar.gz"; |
||||
}; |
||||
} |
||||
|
||||
@ -0,0 +1,29 @@ |
||||
{ lib, buildGoModule, fetchFromGitLab }: |
||||
|
||||
buildGoModule rec { |
||||
pname = "bluewalker"; |
||||
version = "0.3.0"; |
||||
|
||||
src = fetchFromGitLab { |
||||
owner = "jtaimisto"; |
||||
repo = pname; |
||||
rev = "v${version}"; |
||||
sha256 = "sha256-spuJRiNiaBV4EsetUq8vUfR6ejUNZxLhVzS3AZZyrrQ="; |
||||
}; |
||||
|
||||
vendorSha256 = "189qs6vmx63vwsjmc4qgf1y8xjsi7x6l1f5c3kd8j8jnagl26z4h"; |
||||
|
||||
ldflags = [ |
||||
"-w" |
||||
"-s" |
||||
]; |
||||
|
||||
meta = with lib; { |
||||
description = "Simple command line Bluetooth LE scanner"; |
||||
homepage = "https://gitlab.com/jtaimisto/bluewalker"; |
||||
changelog = "https://gitlab.com/jtaimisto/bluewalker/-/tags/v${version}"; |
||||
license = licenses.bsd2; |
||||
maintainers = with maintainers; [ cimm ]; |
||||
platforms = platforms.linux; |
||||
}; |
||||
} |
||||
@ -0,0 +1,98 @@ |
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 9aa25bd5..c7c0437b 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -185,6 +185,30 @@ AC_ARG_ENABLE(
|
||||
]
|
||||
)
|
||||
|
||||
+AC_ARG_WITH(
|
||||
+ [mount-helper],
|
||||
+ [AS_HELP_STRING([--with-mount-helper=BIN],[use the specified binary as mount helper @<:@default=/sbin/mount@:>@])],
|
||||
+ [mount_helper="$withval"],
|
||||
+ [mount_helper="/sbin/mount"]
|
||||
+)
|
||||
+AC_DEFINE_UNQUOTED([MOUNT_HELPER], ["$mount_helper"], [Binary used as mount helper.])
|
||||
+
|
||||
+AC_ARG_WITH(
|
||||
+ [umount-helper],
|
||||
+ [AS_HELP_STRING([--with-umount-helper=BIN],[use the specified binary as umount helper @<:@default=/sbin/umount@:>@])],
|
||||
+ [umount_helper="$withval"],
|
||||
+ [umount_helper="/sbin/umount"]
|
||||
+)
|
||||
+AC_DEFINE_UNQUOTED([UMOUNT_HELPER], ["$umount_helper"], [Binary used as umount helper.])
|
||||
+
|
||||
+AC_ARG_WITH(
|
||||
+ [modprobe-helper],
|
||||
+ [AS_HELP_STRING([--with-modprobe-helper=BIN],[use the specified binary as modprobe helper @<:@default=/sbin/modprobe@:>@])],
|
||||
+ [modprobe_helper="$withval"],
|
||||
+ [modprobe_helper="/sbin/modprobe"]
|
||||
+)
|
||||
+AC_DEFINE_UNQUOTED([MODPROBE_HELPER], ["$modprobe_helper"], [Binary used as modprobe helper.])
|
||||
+
|
||||
# pthread_rwlock_t requires _GNU_SOURCE
|
||||
AC_GNU_SOURCE
|
||||
|
||||
diff --git a/libfuse-lite/mount_util.c b/libfuse-lite/mount_util.c
|
||||
index 8b317224..ee75ace6 100644
|
||||
--- a/libfuse-lite/mount_util.c
|
||||
+++ b/libfuse-lite/mount_util.c
|
||||
@@ -89,10 +89,10 @@ int fuse_mnt_add_mount(const char *progname, const char *fsname,
|
||||
exit(1);
|
||||
}
|
||||
rmdir(tmp);
|
||||
- execle("/sbin/mount", "/sbin/mount", "-F", type, "-o", opts,
|
||||
+ execle(MOUNT_HELPER, MOUNT_HELPER, "-F", type, "-o", opts,
|
||||
fsname, mnt, NULL, &env);
|
||||
- fprintf(stderr, "%s: failed to execute /sbin/mount: %s\n", progname,
|
||||
- strerror(errno));
|
||||
+ fprintf(stderr, "%s: failed to execute %s: %s\n", progname,
|
||||
+ MOUNT_HELPER, strerror(errno));
|
||||
exit(1);
|
||||
}
|
||||
res = waitpid(res, &status, 0);
|
||||
@@ -126,14 +126,14 @@ int fuse_mnt_umount(const char *progname, const char *mnt, int lazy)
|
||||
|
||||
setuid(geteuid());
|
||||
if (lazy) {
|
||||
- execle("/sbin/umount", "/sbin/umount", mnt,
|
||||
+ execle(UMOUNT_HELPER, UMOUNT_HELPER, mnt,
|
||||
NULL, &env);
|
||||
} else {
|
||||
- execle("/sbin/umount", "/sbin/umount", "-f", mnt,
|
||||
+ execle(UMOUNT_HELPER, UMOUNT_HELPER, "-f", mnt,
|
||||
NULL, &env);
|
||||
}
|
||||
- fprintf(stderr, "%s: failed to execute /sbin/umount: %s\n", progname,
|
||||
- strerror(errno));
|
||||
+ fprintf(stderr, "%s: failed to execute %s: %s\n", progname,
|
||||
+ UMOUNT_HELPER, strerror(errno));
|
||||
exit(1);
|
||||
}
|
||||
res = waitpid(res, &status, 0);
|
||||
diff --git a/src/lowntfs-3g.c b/src/lowntfs-3g.c
|
||||
index 9330500c..dd18a93f 100644
|
||||
--- a/src/lowntfs-3g.c
|
||||
+++ b/src/lowntfs-3g.c
|
||||
@@ -4463,7 +4463,7 @@ static fuse_fstype load_fuse_module(void)
|
||||
int i;
|
||||
struct stat st;
|
||||
pid_t pid;
|
||||
- const char *cmd = "/sbin/modprobe";
|
||||
+ const char *cmd = MODPROBE_HELPER;
|
||||
char *env = (char*)NULL;
|
||||
struct timespec req = { 0, 100000000 }; /* 100 msec */
|
||||
fuse_fstype fstype;
|
||||
diff --git a/src/ntfs-3g.c b/src/ntfs-3g.c
|
||||
index d8227e71..f5d77252 100644
|
||||
--- a/src/ntfs-3g.c
|
||||
+++ b/src/ntfs-3g.c
|
||||
@@ -4171,7 +4171,7 @@ static fuse_fstype load_fuse_module(void)
|
||||
int i;
|
||||
struct stat st;
|
||||
pid_t pid;
|
||||
- const char *cmd = "/sbin/modprobe";
|
||||
+ const char *cmd = MODPROBE_HELPER;
|
||||
char *env = (char*)NULL;
|
||||
struct timespec req = { 0, 100000000 }; /* 100 msec */
|
||||
fuse_fstype fstype;
|
||||
@ -0,0 +1,48 @@ |
||||
diff --git a/ntfsprogs/Makefile.am b/ntfsprogs/Makefile.am
|
||||
index 08228322..a390d8c7 100644
|
||||
--- a/ntfsprogs/Makefile.am
|
||||
+++ b/ntfsprogs/Makefile.am
|
||||
@@ -165,7 +165,7 @@ extras: libs $(EXTRA_PROGRAMS)
|
||||
|
||||
if ENABLE_MOUNT_HELPER
|
||||
install-exec-hook:
|
||||
- $(INSTALL) -d $(DESTDIR)/$(sbindir)
|
||||
+ $(INSTALL) -d $(DESTDIR)$(sbindir)
|
||||
$(LN_S) -f $(sbindir)/mkntfs $(DESTDIR)$(sbindir)/mkfs.ntfs
|
||||
|
||||
install-data-hook:
|
||||
@@ -173,7 +173,7 @@ install-data-hook:
|
||||
$(LN_S) -f mkntfs.8 $(DESTDIR)$(man8dir)/mkfs.ntfs.8
|
||||
|
||||
uninstall-local:
|
||||
- $(RM) -f $(DESTDIR)/sbin/mkfs.ntfs
|
||||
+ $(RM) -f $(DESTDIR)$(sbindir)/mkfs.ntfs
|
||||
$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ntfs.8
|
||||
endif
|
||||
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index 8d984083..ea407067 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -66,9 +66,9 @@ endif
|
||||
|
||||
if ENABLE_MOUNT_HELPER
|
||||
install-exec-local: install-rootbinPROGRAMS
|
||||
- $(MKDIR_P) "$(DESTDIR)/sbin"
|
||||
- $(LN_S) -f "$(rootbindir)/ntfs-3g" "$(DESTDIR)/sbin/mount.ntfs-3g"
|
||||
- $(LN_S) -f "$(rootbindir)/lowntfs-3g" "$(DESTDIR)/sbin/mount.lowntfs-3g"
|
||||
+ $(MKDIR_P) "$(DESTDIR)$(rootsbindir)"
|
||||
+ $(LN_S) -f "$(rootbindir)/ntfs-3g" "$(DESTDIR)$(rootsbindir)/mount.ntfs-3g"
|
||||
+ $(LN_S) -f "$(rootbindir)/lowntfs-3g" "$(DESTDIR)$(rootsbindir)/mount.lowntfs-3g"
|
||||
|
||||
install-data-local: install-man8
|
||||
$(LN_S) -f ntfs-3g.8 "$(DESTDIR)$(man8dir)/mount.ntfs-3g.8"
|
||||
@@ -76,7 +76,7 @@ install-data-local: install-man8
|
||||
|
||||
uninstall-local:
|
||||
$(RM) -f "$(DESTDIR)$(man8dir)/mount.ntfs-3g.8"
|
||||
- $(RM) -f "$(DESTDIR)/sbin/mount.ntfs-3g" "$(DESTDIR)/sbin/mount.lowntfs-3g"
|
||||
+ $(RM) -f "$(DESTDIR)$(rootsbindir)/mount.ntfs-3g" "$(DESTDIR)$(rootsbindir)/mount.lowntfs-3g"
|
||||
endif
|
||||
|
||||
endif # ENABLE_NTFS_3G
|
||||
Loading…
Reference in new issue