mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 23:03:40 +01:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
75a11d85b8
38 changed files with 124 additions and 417 deletions
|
|
@ -14082,6 +14082,13 @@
|
|||
githubId = 13000278;
|
||||
name = "Maksim Bronsky";
|
||||
};
|
||||
plusgut = {
|
||||
name = "Carlo Jeske";
|
||||
email = "carlo.jeske+nixpkgs@webentwickler2-0.de";
|
||||
github = "plusgut";
|
||||
githubId = 277935;
|
||||
matrix = "@plusgut5:matrix.org";
|
||||
};
|
||||
PlushBeaver = {
|
||||
name = "Dmitry Kozlyuk";
|
||||
email = "dmitry.kozliuk+nixpkgs@gmail.com";
|
||||
|
|
|
|||
|
|
@ -402,6 +402,9 @@
|
|||
|
||||
- `zfs` was updated from 2.1.x to 2.2.0, [enabling newer kernel support and adding new features](https://github.com/openzfs/zfs/releases/tag/zfs-2.2.0).
|
||||
|
||||
- Elixir now defaults to version
|
||||
[v1.15](https://elixir-lang.org/blog/2023/06/19/elixir-v1-15-0-released/).
|
||||
|
||||
- A new option was added to the virtualisation module that enables specifying explicitly named network interfaces in QEMU VMs. The existing `virtualisation.vlans` is still supported for cases where the name of the network interface is irrelevant.
|
||||
|
||||
- DocBook option documentation is no longer supported, all module documentation now uses markdown.
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ in
|
|||
environmentFile = lib.mkOption {
|
||||
type = with lib.types; coercedTo path (f: [ f ]) (listOf path);
|
||||
default = [ ];
|
||||
example = "/root/woodpecker-server.env";
|
||||
example = [ "/root/woodpecker-server.env" ];
|
||||
description = lib.mdDoc ''
|
||||
File to load environment variables
|
||||
from. This is helpful for specifying secrets.
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ let
|
|||
# Erlang/Elixir uses a somewhat special format for IP addresses
|
||||
erlAddr = addr: fileContents
|
||||
(pkgs.runCommand addr {
|
||||
nativeBuildInputs = with pkgs; [ elixir ];
|
||||
nativeBuildInputs = [ cfg.package.elixirPackage ];
|
||||
code = ''
|
||||
case :inet.parse_address('${addr}') do
|
||||
{:ok, addr} -> IO.inspect addr
|
||||
|
|
@ -96,7 +96,7 @@ let
|
|||
passAsFile = [ "code" ];
|
||||
} ''elixir "$codePath" >"$out"'');
|
||||
|
||||
format = pkgs.formats.elixirConf { };
|
||||
format = pkgs.formats.elixirConf { elixir = cfg.package.elixirPackage; };
|
||||
configFile = format.generate "config.exs"
|
||||
(replaceSec
|
||||
(attrsets.updateManyAttrsByPath [{
|
||||
|
|
@ -146,7 +146,7 @@ let
|
|||
|
||||
initSecretsScript = writeShell {
|
||||
name = "akkoma-init-secrets";
|
||||
runtimeInputs = with pkgs; [ coreutils elixir ];
|
||||
runtimeInputs = with pkgs; [ coreutils cfg.package.elixirPackage ];
|
||||
text = let
|
||||
key-base = web.secret_key_base;
|
||||
jwt-signer = ex.":joken".":default_signer";
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ let
|
|||
user = "mobilizon";
|
||||
group = "mobilizon";
|
||||
|
||||
settingsFormat = pkgs.formats.elixirConf { elixir = pkgs.elixir_1_14; };
|
||||
settingsFormat = pkgs.formats.elixirConf { elixir = cfg.package.elixirPackage; };
|
||||
|
||||
configFile = settingsFormat.generate "mobilizon-config.exs" cfg.settings;
|
||||
|
||||
|
|
@ -309,7 +309,7 @@ in
|
|||
genCookie = "IO.puts(Base.encode32(:crypto.strong_rand_bytes(32)))";
|
||||
|
||||
evalElixir = str: ''
|
||||
${pkgs.elixir_1_14}/bin/elixir --eval '${str}'
|
||||
${cfg.package.elixirPackage}/bin/elixir --eval '${str}'
|
||||
'';
|
||||
in
|
||||
''
|
||||
|
|
|
|||
|
|
@ -18,12 +18,3 @@ Detected by _FORTIFY_SOURCE=3:
|
|||
extern unsigned char SPCRAM[65472];
|
||||
unsigned char *SPCState = SPCRAM;
|
||||
|
||||
@@ -1456,7 +1456,7 @@ void clearmem()
|
||||
memset(pal16b, 0, 1024);
|
||||
memset(pal16bcl, 0, 1024);
|
||||
memset(pal16bclha, 0, 1024);
|
||||
- for (i=0 ; i<1024 ; i+=4)
|
||||
+ for (i=0 ; i<1024-4 ; i+=4)
|
||||
{
|
||||
memset(pal16bxcl+i, 255, 2);
|
||||
memset(pal16bxcl+i+2, 0, 2);
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ydict";
|
||||
version = "2.2.1";
|
||||
version = "2.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TimothyYe";
|
||||
repo = "ydict";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qrGOrqI+PXsDNCmgcCPDNn6qUYu2emhYSkYsz4sj27M=";
|
||||
sha256 = "sha256-FcrkfWE1m5OveK4YPgVmUbL/jkh2NEs9bfeCHm2H9P8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-c5nQVQd4n978kFAAKcx5mX2Jz16ZOhS8iL/oxS1o5xs=";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kyverno";
|
||||
version = "1.10.3";
|
||||
version = "1.10.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyverno";
|
||||
repo = "kyverno";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-SRDabFN0ITXwHzvE5m3pIAk42kQa2yINpT64x+k3r3g=";
|
||||
sha256 = "sha256-Qcy+LGvoDJZ+zpIJvC8P0c5pl6GpiDuq7sWdrdMojmg=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
|
@ -18,7 +18,7 @@ buildGoModule rec {
|
|||
"-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-YFlf0lqG4vWn9d5RAvi12ti/wV+qvsHWn123hhfmxRU=";
|
||||
vendorHash = "sha256-6JM5r/MUETmlMB/8Z82mpUe8bAym9ekb1HL24ik2OlE=";
|
||||
|
||||
subPackages = [ "cmd/cli/kubectl-kyverno" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
, fetchurl
|
||||
, python3
|
||||
, dropbox
|
||||
, gtk3
|
||||
, gtk4
|
||||
, gnome
|
||||
, gdk-pixbuf
|
||||
, gobject-introspection
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2020.03.04";
|
||||
version = "2023.09.06";
|
||||
dropboxd = "${dropbox}/bin/dropbox";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
|
@ -23,16 +23,12 @@ stdenv.mkDerivation {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://linux.dropbox.com/packages/nautilus-dropbox-${version}.tar.bz2";
|
||||
sha256 = "1jjc835n2j61d23kvygdb4n4jsrw33r9mbwxrm4fqin6x01l2w7k";
|
||||
hash = "sha256-kZMwj8Fn8Hf58C57wE025TlmiSs5TaKMGEzvb2QjgSw=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
patches = [
|
||||
# Fix extension for Nautilus 43
|
||||
# https://github.com/dropbox/nautilus-dropbox/pull/105
|
||||
./nautilus-43.patch
|
||||
|
||||
(substituteAll {
|
||||
src = ./fix-cli-paths.patch;
|
||||
inherit dropboxd;
|
||||
|
|
@ -54,12 +50,12 @@ stdenv.mkDerivation {
|
|||
|
||||
buildInputs = [
|
||||
python3
|
||||
gtk3
|
||||
gtk4
|
||||
gnome.nautilus
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--with-nautilus-extension-dir=${placeholder "nautilusExtension"}/lib/nautilus/extensions-3.0"
|
||||
"--with-nautilus-extension-dir=${placeholder "nautilusExtension"}/lib/nautilus/extension-4"
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
|
|
@ -70,6 +66,8 @@ stdenv.mkDerivation {
|
|||
homepage = "https://www.dropbox.com";
|
||||
description = "Command line client for the dropbox daemon";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
mainProgram = "dropbox";
|
||||
maintainers = with lib.maintainers; [ eclairevoyant ];
|
||||
# NOTE: Dropbox itself only works on linux, so this is ok.
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ assert lib.elem stdenv.hostPlatform.system platforms;
|
|||
# Dropbox client to bootstrap installation.
|
||||
# The client is self-updating, so the actual version may be newer.
|
||||
let
|
||||
version = "111.3.447";
|
||||
version = "185.4.6054";
|
||||
|
||||
arch = {
|
||||
x86_64-linux = "x86_64";
|
||||
|
|
@ -84,7 +84,7 @@ buildFHSEnv {
|
|||
description = "Online stored folders (daemon version)";
|
||||
homepage = "http://www.dropbox.com/";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ ttuegel ];
|
||||
maintainers = with maintainers; [ eclairevoyant ttuegel ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
mainProgram = "dropbox";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,195 +0,0 @@
|
|||
diff --git a/configure.ac b/configure.ac
|
||||
index 025289c..42b49fa 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -12,7 +12,7 @@ AM_CONFIG_HEADER(config.h)
|
||||
#AC_PROG_INTLTOOL([0.29])
|
||||
|
||||
# Dependency checks
|
||||
-NAUTILUS_REQUIRED=2.16.0
|
||||
+NAUTILUS_REQUIRED=43.rc
|
||||
GLIB_REQUIRED=2.14.0
|
||||
|
||||
# Used programs
|
||||
@@ -26,8 +26,11 @@ if test "x$HAVE_PKGCONFIG" = "xno"; then
|
||||
AC_MSG_ERROR(you need to have pkgconfig installed !)
|
||||
fi
|
||||
|
||||
-PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED)
|
||||
+PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension-4 >= $NAUTILUS_REQUIRED)
|
||||
PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
|
||||
+PKG_CHECK_MODULES(GTK, gtk4 >= 4.6.0)
|
||||
+
|
||||
+AC_SUBST(GTK_CFLAGS)
|
||||
|
||||
AC_PATH_PROG([PYTHON3], [python3])
|
||||
|
||||
@@ -84,10 +87,10 @@ AC_MSG_CHECKING([for nautilus extension directory])
|
||||
if test -n "$with_nautilus_extension_dir"; then
|
||||
NAUTILUS_EXTENSION_DIR=$with_nautilus_extension_dir
|
||||
else
|
||||
- NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension`
|
||||
+ NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension-4`
|
||||
fi
|
||||
if test -z "$NAUTILUS_EXTENSION_DIR"; then
|
||||
- NAUTILUS_EXTENSION_DIR='${exec_prefix}/lib/nautilus/extension-1.0'
|
||||
+ NAUTILUS_EXTENSION_DIR='${exec_prefix}/lib/nautilus/extension-4'
|
||||
fi
|
||||
|
||||
AC_MSG_RESULT([${NAUTILUS_EXTENSION_DIR}])
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index 15d6687..c521ec5 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -13,6 +13,7 @@ libnautilus_dropbox_la_CFLAGS = \
|
||||
$(WARN_CFLAGS) \
|
||||
$(DISABLE_DEPRECATED_CFLAGS) \
|
||||
$(NAUTILUS_CFLAGS) \
|
||||
+ $(GTK_CFLAGS) \
|
||||
$(GLIB_CFLAGS)
|
||||
|
||||
if DEBUG
|
||||
diff --git a/src/dropbox.c b/src/dropbox.c
|
||||
index 0d59559..8162aa9 100644
|
||||
--- a/src/dropbox.c
|
||||
+++ b/src/dropbox.c
|
||||
@@ -27,9 +27,6 @@
|
||||
|
||||
#include <glib-object.h>
|
||||
|
||||
-#include <gdk/gdk.h>
|
||||
-#include <gtk/gtk.h>
|
||||
-
|
||||
#include "nautilus-dropbox.h"
|
||||
|
||||
static GType type_list[1];
|
||||
@@ -41,9 +38,6 @@ nautilus_module_initialize (GTypeModule *module) {
|
||||
nautilus_dropbox_register_type (module);
|
||||
type_list[0] = NAUTILUS_TYPE_DROPBOX;
|
||||
|
||||
- dropbox_use_nautilus_submenu_workaround
|
||||
- = (NAUTILUS_VERSION_MAJOR < 2 ||
|
||||
- (NAUTILUS_VERSION_MAJOR == 2 && NAUTILUS_VERSION_MINOR <= 22));
|
||||
dropbox_use_operation_in_progress_workaround = TRUE;
|
||||
}
|
||||
|
||||
diff --git a/src/nautilus-dropbox.c b/src/nautilus-dropbox.c
|
||||
index c75ccbf..b9c10b4 100644
|
||||
--- a/src/nautilus-dropbox.c
|
||||
+++ b/src/nautilus-dropbox.c
|
||||
@@ -37,9 +37,7 @@
|
||||
#include <glib-object.h>
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
-#include <libnautilus-extension/nautilus-extension-types.h>
|
||||
-#include <libnautilus-extension/nautilus-menu-provider.h>
|
||||
-#include <libnautilus-extension/nautilus-info-provider.h>
|
||||
+#include <nautilus-extension.h>
|
||||
|
||||
#include "g-util.h"
|
||||
#include "dropbox-command-client.h"
|
||||
@@ -49,7 +47,7 @@
|
||||
static char *emblems[] = {"dropbox-uptodate", "dropbox-syncing", "dropbox-unsyncable"};
|
||||
gchar *DEFAULT_EMBLEM_PATHS[2] = { EMBLEMDIR , NULL };
|
||||
|
||||
-gboolean dropbox_use_nautilus_submenu_workaround;
|
||||
+
|
||||
gboolean dropbox_use_operation_in_progress_workaround;
|
||||
|
||||
static GType dropbox_type = 0;
|
||||
@@ -630,13 +628,6 @@ nautilus_dropbox_parse_menu(gchar **options,
|
||||
g_object_set_property (G_OBJECT(item), "sensitive", &sensitive);
|
||||
}
|
||||
|
||||
- /* taken from nautilus-file-repairer (http://repairer.kldp.net/):
|
||||
- * this code is a workaround for a bug of nautilus
|
||||
- * See: http://bugzilla.gnome.org/show_bug.cgi?id=508878 */
|
||||
- if (dropbox_use_nautilus_submenu_workaround) {
|
||||
- toret = g_list_append(toret, item);
|
||||
- }
|
||||
-
|
||||
g_object_unref(item);
|
||||
g_string_free(new_action_string, TRUE);
|
||||
ret++;
|
||||
@@ -661,7 +652,6 @@ get_file_items_callback(GHashTable *response, gpointer ud)
|
||||
|
||||
static GList *
|
||||
nautilus_dropbox_get_file_items(NautilusMenuProvider *provider,
|
||||
- GtkWidget *window,
|
||||
GList *files)
|
||||
{
|
||||
/*
|
||||
@@ -778,14 +768,13 @@ add_emblem_paths(GHashTable* emblem_paths_response)
|
||||
|
||||
gchar **emblem_paths_list;
|
||||
int i;
|
||||
-
|
||||
- GtkIconTheme *theme = gtk_icon_theme_get_default();
|
||||
+ GtkIconTheme *theme = gtk_icon_theme_get_for_display (gdk_display_get_default ());
|
||||
|
||||
if (emblem_paths_response &&
|
||||
(emblem_paths_list = g_hash_table_lookup(emblem_paths_response, "path"))) {
|
||||
for (i = 0; emblem_paths_list[i] != NULL; i++) {
|
||||
if (emblem_paths_list[i][0])
|
||||
- gtk_icon_theme_append_search_path(theme, emblem_paths_list[i]);
|
||||
+ gtk_icon_theme_add_search_path(theme, emblem_paths_list[i]);
|
||||
}
|
||||
}
|
||||
g_hash_table_unref(emblem_paths_response);
|
||||
@@ -804,15 +793,14 @@ remove_emblem_paths(GHashTable* emblem_paths_response)
|
||||
goto exit;
|
||||
|
||||
// We need to remove the old paths.
|
||||
- GtkIconTheme * icon_theme = gtk_icon_theme_get_default();
|
||||
gchar ** paths;
|
||||
- gint path_count;
|
||||
+ GtkIconTheme *theme = gtk_icon_theme_get_for_display (gdk_display_get_default ());
|
||||
|
||||
- gtk_icon_theme_get_search_path(icon_theme, &paths, &path_count);
|
||||
+ paths = gtk_icon_theme_get_search_path(theme);
|
||||
|
||||
gint i, j, out = 0;
|
||||
gboolean found = FALSE;
|
||||
- for (i = 0; i < path_count; i++) {
|
||||
+ for (i = 0; paths[i] != NULL; i++) {
|
||||
gboolean keep = TRUE;
|
||||
for (j = 0; emblem_paths_list[j] != NULL; j++) {
|
||||
if (emblem_paths_list[j][0]) {
|
||||
@@ -834,7 +822,7 @@ remove_emblem_paths(GHashTable* emblem_paths_response)
|
||||
accomodate the changes */
|
||||
if (found) {
|
||||
paths[out] = NULL; /* Clear the last one */
|
||||
- gtk_icon_theme_set_search_path(icon_theme, (const gchar **)paths, out);
|
||||
+ gtk_icon_theme_set_search_path(theme, (const gchar **)paths);
|
||||
}
|
||||
|
||||
g_strfreev(paths);
|
||||
@@ -888,13 +876,13 @@ on_disconnect(NautilusDropbox *cvs) {
|
||||
|
||||
|
||||
static void
|
||||
-nautilus_dropbox_menu_provider_iface_init (NautilusMenuProviderIface *iface) {
|
||||
+nautilus_dropbox_menu_provider_iface_init (NautilusMenuProviderInterface *iface) {
|
||||
iface->get_file_items = nautilus_dropbox_get_file_items;
|
||||
return;
|
||||
}
|
||||
|
||||
static void
|
||||
-nautilus_dropbox_info_provider_iface_init (NautilusInfoProviderIface *iface) {
|
||||
+nautilus_dropbox_info_provider_iface_init (NautilusInfoProviderInterface *iface) {
|
||||
iface->update_file_info = nautilus_dropbox_update_file_info;
|
||||
iface->cancel_update = nautilus_dropbox_cancel_update;
|
||||
return;
|
||||
diff --git a/src/nautilus-dropbox.h b/src/nautilus-dropbox.h
|
||||
index 65734be..44faa27 100644
|
||||
--- a/src/nautilus-dropbox.h
|
||||
+++ b/src/nautilus-dropbox.h
|
||||
@@ -27,7 +27,7 @@
|
||||
#include <glib.h>
|
||||
#include <glib-object.h>
|
||||
|
||||
-#include <libnautilus-extension/nautilus-info-provider.h>
|
||||
+#include <nautilus-extension.h>
|
||||
|
||||
#include "dropbox-command-client.h"
|
||||
#include "nautilus-dropbox-hooks.h"
|
||||
|
|
@ -26,8 +26,6 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-Vbxc6a6CK+wrBfs15dtjfRa1LJDKKyHMrg8tqsF7EX4=";
|
||||
};
|
||||
|
||||
patches = [ ./fix-strlcpy-usage.patch ];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -1,89 +0,0 @@
|
|||
strlcpy is now part of glibc, so there's absolutely no reason for a custom implementation, especially
|
||||
one with printf debugging. Hence, removing all of that.
|
||||
|
||||
See also https://hydra.nixos.org/build/230546596
|
||||
See glibc commit 454a20c8756c9c1d55419153255fc7692b3d2199
|
||||
|
||||
diff --git a/external/misc/strlcpy.c b/external/misc/strlcpy.c
|
||||
index ff18800..b1cb443 100644
|
||||
--- a/external/misc/strlcpy.c
|
||||
+++ b/external/misc/strlcpy.c
|
||||
@@ -56,65 +56,3 @@
|
||||
|
||||
#include "textcolor.h"
|
||||
|
||||
-/*
|
||||
- * Copy src to string dst of size siz. At most siz-1 characters
|
||||
- * will be copied. Always NUL terminates (unless siz == 0).
|
||||
- * Returns strlen(src); if retval >= siz, truncation occurred.
|
||||
- */
|
||||
-
|
||||
-#if DEBUG_STRL
|
||||
-size_t strlcpy_debug(char *__restrict__ dst, const char *__restrict__ src, size_t siz, const char *file, const char *func, int line)
|
||||
-#else
|
||||
-size_t strlcpy_debug(char *__restrict__ dst, const char *__restrict__ src, size_t siz)
|
||||
-#endif
|
||||
-{
|
||||
- char *d = dst;
|
||||
- const char *s = src;
|
||||
- size_t n = siz;
|
||||
- size_t retval;
|
||||
-
|
||||
-#if DEBUG_STRL
|
||||
- if (dst == NULL) {
|
||||
- text_color_set (DW_COLOR_ERROR);
|
||||
- dw_printf ("ERROR: strlcpy dst is NULL. (%s %s %d)\n", file, func, line);
|
||||
- return (0);
|
||||
- }
|
||||
- if (src == NULL) {
|
||||
- text_color_set (DW_COLOR_ERROR);
|
||||
- dw_printf ("ERROR: strlcpy src is NULL. (%s %s %d)\n", file, func, line);
|
||||
- return (0);
|
||||
- }
|
||||
- if (siz == 1 || siz == 4) {
|
||||
- text_color_set (DW_COLOR_ERROR);
|
||||
- dw_printf ("Suspicious strlcpy siz. Is it using sizeof a pointer variable? (%s %s %d)\n", file, func, line);
|
||||
- }
|
||||
-#endif
|
||||
-
|
||||
- /* Copy as many bytes as will fit */
|
||||
- if (n != 0 && --n != 0) {
|
||||
- do {
|
||||
- if ((*d++ = *s++) == 0)
|
||||
- break;
|
||||
- } while (--n != 0);
|
||||
- }
|
||||
-
|
||||
- /* Not enough room in dst, add NUL and traverse rest of src */
|
||||
- if (n == 0) {
|
||||
- if (siz != 0)
|
||||
- *d = '\0'; /* NUL-terminate dst */
|
||||
- while (*s++)
|
||||
- ;
|
||||
- }
|
||||
-
|
||||
- retval = s - src - 1; /* count does not include NUL */
|
||||
-
|
||||
-#if DEBUG_STRL
|
||||
- if (retval >= siz) {
|
||||
- text_color_set (DW_COLOR_ERROR);
|
||||
- dw_printf ("WARNING: strlcpy result length %d exceeds maximum length %d. (%s %s %d)\n",
|
||||
- (int)retval, (int)(siz-1), file, func, line);
|
||||
- }
|
||||
-#endif
|
||||
- return (retval);
|
||||
-}
|
||||
-
|
||||
diff --git a/src/direwolf.h b/src/direwolf.h
|
||||
index 69b0952..6f9ec1a 100644
|
||||
--- a/src/direwolf.h
|
||||
+++ b/src/direwolf.h
|
||||
@@ -328,7 +328,7 @@ char *strcasestr(const char *S, const char *FIND);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
-#define DEBUG_STRL 1 // Extra Debug version when using our own strlcpy, strlcat.
|
||||
+#define DEBUG_STRL 0 // Extra Debug version when using our own strlcpy, strlcat.
|
||||
// Should be ignored if not supplying our own.
|
||||
|
||||
#ifndef HAVE_STRLCPY // Need to supply our own.
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
, ninja
|
||||
, pkg-config
|
||||
, python3
|
||||
, ffmpeg_5
|
||||
, ffmpeg
|
||||
, freefont_ttf
|
||||
, freetype
|
||||
, libass
|
||||
|
|
@ -159,7 +159,7 @@ in stdenv'.mkDerivation (finalAttrs: {
|
|||
++ lib.optionals waylandSupport [ wayland-scanner ];
|
||||
|
||||
buildInputs = [
|
||||
ffmpeg_5
|
||||
ffmpeg
|
||||
freetype
|
||||
libass
|
||||
libpthreadstubs
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "dbip-country-lite";
|
||||
version = "2023-10";
|
||||
version = "2023-11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz";
|
||||
hash = "sha256-PQn8dyx4l3r7N52rv/Woth6J61+WvVL+SHKMkVVtFsw=";
|
||||
hash = "sha256-Nyje7hf5UdCMHbqZoLpHclDDa4pz+BAyqJcsmPBfSG8=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
let
|
||||
generator = pkgsBuildBuild.buildGoModule rec {
|
||||
pname = "v2ray-domain-list-community";
|
||||
version = "20231030084219";
|
||||
version = "20231031055637";
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "domain-list-community";
|
||||
rev = version;
|
||||
hash = "sha256-5FVHjK68weGWjla8MBS1D/Ks5PjzBKLv/TeyjBSgYFw=";
|
||||
hash = "sha256-wdWmpWsWroA7ecNRSVh3hEUSXz/MW+9kYDWhThWL44k=";
|
||||
};
|
||||
vendorHash = "sha256-6167kRAC5m5FlBr7uk+qKUcjWsb45P5Vvovyb6hHSVQ=";
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ let
|
|||
elvis-erlang = callPackage ./elvis-erlang { };
|
||||
|
||||
# BEAM-based languages.
|
||||
elixir = elixir_1_14;
|
||||
elixir = elixir_1_15;
|
||||
|
||||
elixir_1_15 = lib'.callElixir ../interpreters/elixir/1.15.nix {
|
||||
inherit erlang;
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
description =
|
||||
"A systems programming language designed to be simple, stable, and robust";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = [ lib.maintainers.AndersonTorres ];
|
||||
maintainers = [ ];
|
||||
inherit (harec.meta) platforms badPlatforms;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -34,9 +34,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
homepage = "http://harelang.org/";
|
||||
description = "Bootstrapping Hare compiler written in C for POSIX systems";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = [ lib.maintainers.AndersonTorres ];
|
||||
maintainers = [ ];
|
||||
# The upstream developers do not like proprietary operating systems; see
|
||||
# https://harelang.org/platforms/
|
||||
# UPDATE: https://github.com/hshq/harelang provides a MacOS port
|
||||
platforms = with lib.platforms;
|
||||
lib.intersectLists (freebsd ++ linux) (aarch64 ++ x86_64 ++ riscv64);
|
||||
badPlatforms = lib.platforms.darwin;
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "faudio";
|
||||
version = "23.10";
|
||||
version = "23.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FNA-XNA";
|
||||
repo = "FAudio";
|
||||
rev = version;
|
||||
sha256 = "sha256-h4wPUUYG8IZr2jHUlKFO2K3QKGiX9AzyLc2Ma5hR8Tk=";
|
||||
sha256 = "sha256-iK0cjhq16DU/77p0cM3SMk+gE1PQV0zd96a3kxwXNLk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [cmake];
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "edk2-pytool-library";
|
||||
version = "0.19.2";
|
||||
version = "0.19.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "tianocore";
|
||||
repo = "edk2-pytool-library";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-EoBv7mxdT6G1n9as0V8Ad5QckMkqgC2GvcjRDc1+RzA=";
|
||||
hash = "sha256-7pTi3pDD7245hbWqINchZNImv53a4afzaydE7vTtbVw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ buildDotnetModule rec {
|
|||
'';
|
||||
homepage = "https://github.com/artempyanykh/marksman";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ stasjok ];
|
||||
maintainers = with maintainers; [ stasjok plusgut ];
|
||||
platforms = dotnet-sdk.meta.platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "typos";
|
||||
version = "1.16.21";
|
||||
version = "1.16.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crate-ci";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tXrkKDrWqhckb0TS/wvx1L5aGYRltPIJIPLKvbQk2l8=";
|
||||
hash = "sha256-twOgVIdqbOKmrAWNL8uRb+8cVSJXnvNF4rM109ymCz8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Zcrx/HSYhHFgDmlbaVy1L7sCbRUeG8XgDWE0OrQdajs=";
|
||||
cargoHash = "sha256-Gk3gAd5u3PgkV2hf3dzWeTuiiIqLMZ3gZcLIKsvxvCY=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Source code spell checker";
|
||||
|
|
|
|||
|
|
@ -172,6 +172,10 @@ beamPackages.mixRelease rec {
|
|||
passthru = {
|
||||
tests = with nixosTests; { inherit akkoma akkoma-confined; };
|
||||
inherit mixNixDeps;
|
||||
|
||||
# Used to make sure the service uses the same version of elixir as
|
||||
# the package
|
||||
elixirPackage = beamPackages.elixir;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "homeassistant-stubs";
|
||||
version = "2023.10.5";
|
||||
version = "2023.11.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = python.version != home-assistant.python.version;
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "KapJI";
|
||||
repo = "homeassistant-stubs";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-QCdNvEs2LFF43lWLLFX+9VMfQFg1oWUCh/cgxdBQV8w=";
|
||||
hash = "sha256-/yiTNsr22X8orQ8sni50/FeWWZL9OyVZvTngeaGv5SI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
, cmake
|
||||
, nixosTests
|
||||
, mobilizon-frontend
|
||||
, ...
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -126,6 +127,7 @@ mixRelease rec {
|
|||
${mix2nix}/bin/mix2nix $SRC/mix.lock > pkgs/servers/mobilizon/mix.nix
|
||||
cat $SRC/js/package.json > pkgs/servers/mobilizon/package.json
|
||||
'';
|
||||
elixirPackage = beamPackages.elixir;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -22,13 +22,13 @@
|
|||
|
||||
buildNimPackage rec {
|
||||
pname = "nitter";
|
||||
version = "unstable-2023-08-08";
|
||||
version = "unstable-2023-10-31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zedeus";
|
||||
repo = "nitter";
|
||||
rev = "d7ca353a55ea3440a2ec1f09155951210a374cc7";
|
||||
hash = "sha256-nlpUzbMkDzDk1n4X+9Wk7+qQk+KOfs5ID6euIfHBoa8=";
|
||||
rev = "b62d73dbd373f08af07c7a79efcd790d3bc1a49c";
|
||||
hash = "sha256-yCD7FbqWZMY0fyFf9Q3Ka06nw5Ha7jYLpmPONAhEVIM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "redis";
|
||||
version = "7.2.2";
|
||||
version = "7.2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.redis.io/releases/redis-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-ypmb4IgA7cbSZTecTHqvrZLw7kAGkuTi1pgpq0tMPQg=";
|
||||
hash = "sha256-PisZbW603bnnQwiL/CkVzLtC1A9aij7djLaccW7DS+c=";
|
||||
};
|
||||
|
||||
patches = lib.optionals useSystemJemalloc [
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
, fetchFromGitHub
|
||||
, nodejs
|
||||
, nixosTests
|
||||
, ...
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
diff --git a/setup.py b/setup.py
|
||||
index 04eedbc..ee0b495 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -35,4 +35,9 @@ setup(
|
||||
"Programming Language :: Python :: 3.10",
|
||||
],
|
||||
keywords="rhasspy wyoming whisper",
|
||||
+ entry_points={
|
||||
+ 'console_scripts': [
|
||||
+ 'wyoming-faster-whisper = wyoming_faster_whisper:__main__.run'
|
||||
+ ]
|
||||
+ }
|
||||
)
|
||||
diff --git a/wyoming_faster_whisper/__main__.py b/wyoming_faster_whisper/__main__.py
|
||||
index 8a5039f..bd1e7b6 100755
|
||||
--- a/wyoming_faster_whisper/__main__.py
|
||||
+++ b/wyoming_faster_whisper/__main__.py
|
||||
@@ -131,8 +131,12 @@ async def main() -> None:
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
+def run():
|
||||
+ asyncio.run(main())
|
||||
+
|
||||
+
|
||||
if __name__ == "__main__":
|
||||
try:
|
||||
- asyncio.run(main())
|
||||
+ run()
|
||||
except KeyboardInterrupt:
|
||||
pass
|
||||
|
|
@ -1,31 +1,39 @@
|
|||
{ lib
|
||||
, python3
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "wyoming-faster-whisper";
|
||||
version = "1.0.1";
|
||||
format = "setuptools";
|
||||
version = "1.0.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "wyoming_faster_whisper";
|
||||
inherit version;
|
||||
hash = "sha256-wo62m8gIP9hXihkd8j2haVvz3TlJv3m5WWthTPFwesk=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rhasspy";
|
||||
repo = "wyoming-faster-whisper";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-mKnWab3i6lEnCBbO3ucNmWIxaaWwQagzfDhaD1U3qow=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./faster-whisper-entrypoint.patch
|
||||
# add wyoming-faster-whisper executable
|
||||
(fetchpatch {
|
||||
url = "https://github.com/rhasspy/wyoming-faster-whisper/commit/a5715197abab34253d2864ed8cf406210834b4ec.patch";
|
||||
hash = "sha256-a9gmXMngwXo9ZJDbxl/pPzm6WSy5XeGbz/Xncj7bOog=";
|
||||
})
|
||||
|
||||
# fix model retrieval on python3.11+
|
||||
(fetchpatch {
|
||||
url = "https://github.com/rhasspy/rhasspy3/commit/ea55a309e55384e6fd8c9f19534622968f8ed95b.patch";
|
||||
hash = "sha256-V9WXKE3+34KGubBS23vELTHjqU2RCTk3sX8GTjmH+AA=";
|
||||
stripLen = 4;
|
||||
url = "https://github.com/rhasspy/wyoming-faster-whisper/commit/d5229df2c3af536013bc931c1ed7cc239b618208.patch";
|
||||
hash = "sha256-CMpOJ1qSPcdtX2h2ecGmQ/haus/gaSH8r/PCFsMChRY=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
ctranslate2
|
||||
tokenizers
|
||||
|
|
@ -41,7 +49,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Wyoming Server for Faster Whisper";
|
||||
homepage = "https://pypi.org/project/wyoming-faster-whisper/";
|
||||
homepage = "https://github.com/rhasspy/wyoming-faster-whisper";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,26 +1,18 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, fuse, util-linux, lz4, zlib
|
||||
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fuse, util-linux, lz4, zlib
|
||||
, fuseSupport ? stdenv.isLinux
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "erofs-utils";
|
||||
version = "1.7";
|
||||
version = "1.7.1";
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
"https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-${version}.tar.gz";
|
||||
hash = "sha256-tutSm7Qj6y3XecnanCYyhVSItLkeI1U6Mc4j8Rycziw=";
|
||||
hash = "sha256-GWCD1j5eIx+1eZ586GqUS7ylZNqrzj3pIlqKyp3K/xU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fixes #261394. Can be dropped with the next erofs version.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/erofs/erofs-utils/commit/8cbc205185a18b9510f4c1fbd54957354f696321.patch";
|
||||
hash = "sha256-CQ5hxav5+HGnBVJW66St9FaVgkuqhkv89rjC/4cmXLs=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
buildInputs = [ util-linux lz4 zlib ]
|
||||
++ lib.optionals fuseSupport [ fuse ];
|
||||
|
|
@ -32,6 +24,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/about/";
|
||||
description = "Userspace utilities for linux-erofs file system";
|
||||
changelog = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/tree/ChangeLog?h=v${version}";
|
||||
license = with licenses; [ gpl2Plus ];
|
||||
maintainers = with maintainers; [ ehmry nikstur ];
|
||||
platforms = platforms.unix;
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildGo121Module
|
||||
, buildGoModule
|
||||
}:
|
||||
buildGo121Module rec {
|
||||
buildGoModule rec {
|
||||
pname = "hysteria";
|
||||
version = "2.1.1";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "apernet";
|
||||
repo = pname;
|
||||
rev = "app/v${version}";
|
||||
hash = "sha256-CvhDOtXyGxnTy8m7qN5lmQxOxwkExfW+1ZT3LrLjsmo=";
|
||||
hash = "sha256-v9W1/1AIcYKYxVnFFXZdwQC50FWJCMQ0OXCmlfmXWQk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Io7EN+Cza7drMLB9JF4nRDxq+eVxW5sYj45WWvXtDsY=";
|
||||
vendorHash = "sha256-/lFDCOkwkBKq1GJA1F7Lyhw++X1G1pld6JXNEdKue/E=";
|
||||
proxyVendor = true;
|
||||
|
||||
ldflags = [
|
||||
|
|
|
|||
|
|
@ -30,16 +30,16 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "netbird";
|
||||
version = "0.24.0";
|
||||
version = "0.24.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbirdio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tRezJzHlcJOGqHIV19ZAV58F1RVLQTz2PoYiLwXGBpQ=";
|
||||
hash = "sha256-/gSQiBlcOeQQud8rXPIjY88+jjC0/6S+OTmFqhQxQVM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Wocd15Uva74Fy3nCwWfoH+80lF5ugvX3itpm9bTIL7c=";
|
||||
vendorHash = "sha256-mSK5qQqPd6pTDLIBUa2MK8nNdi1VzNRU+GEaW+lGLpY=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nexttrace";
|
||||
version = "1.2.2.2";
|
||||
version = "1.2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nxtrace";
|
||||
repo = "NTrace-core";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-a9l6nsrbgwmk6cq/rPBwPwZ8yhH35VxKmn9x5PgcqGI=";
|
||||
sha256 = "sha256-uY3Cjemv+iFOrWm7lXzRprIljqHCLWOF6DyDURrH39g=";
|
||||
};
|
||||
vendorHash = "sha256-YAmGvmHkR1G2MLlDja5aPJqX2F3etogebasqD72YJ3M=";
|
||||
vendorHash = "sha256-sugEN7sKBwEKsfX1MBwOiyH1aq1995HL+Yv7Q8XaPAo=";
|
||||
|
||||
doCheck = false; # Tests require a network connection.
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubernetes-polaris";
|
||||
version = "8.5.1";
|
||||
version = "8.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FairwindsOps";
|
||||
repo = "polaris";
|
||||
rev = version;
|
||||
sha256 = "sha256-cfasYaZvUF5Ptc/BDVhafQ8wP6FA5msY+2IaeqmOvD8=";
|
||||
sha256 = "sha256-k4t/qCRLUMoFmALt++1sA127D4tacYoDb/fWfoudOc8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZWetW+Xar4BXXlR0iG+O/NRqYk41x+PPVCGis2W2Nkk=";
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nmap-formatter";
|
||||
version = "2.1.3";
|
||||
version = "2.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vdjagilev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tc946SAWBeKSNgLJZSkEoygxyXm3xbQm3cinIK1uOoY=";
|
||||
hash = "sha256-M0IV7pgJyCxwfWRnJeMevFFsvaXTRfjXoGRsMngt7Pk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-c2n8GlaD6q21gWUqr31UOioZRxO0s0tSpVRKl/YHXZU=";
|
||||
vendorHash = "sha256-Wx07tSHr5LKPdO3BQ3tGMxzxYP9jBnH3JQ8/yrvwX1U=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool that allows you to convert nmap output";
|
||||
|
|
|
|||
|
|
@ -740,7 +740,9 @@ with pkgs;
|
|||
inherit (darwin) DarwinTools;
|
||||
};
|
||||
|
||||
mix2nix = callPackage ../development/tools/mix2nix { };
|
||||
mix2nix = callPackage ../development/tools/mix2nix {
|
||||
elixir = elixir_1_14;
|
||||
};
|
||||
|
||||
n98-magerun = callPackage ../development/tools/misc/n98-magerun { };
|
||||
|
||||
|
|
@ -1546,7 +1548,10 @@ with pkgs;
|
|||
|
||||
adminer = callPackage ../servers/adminer { };
|
||||
|
||||
akkoma = callPackage ../servers/akkoma { };
|
||||
akkoma = callPackage ../servers/akkoma {
|
||||
elixir = elixir_1_14;
|
||||
beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_14; });
|
||||
};
|
||||
akkoma-frontends = recurseIntoAttrs {
|
||||
akkoma-fe = callPackage ../servers/akkoma/akkoma-fe { };
|
||||
admin-fe = callPackage ../servers/akkoma/admin-fe { };
|
||||
|
|
@ -3995,6 +4000,7 @@ with pkgs;
|
|||
|
||||
livebook = callPackage ../servers/web-apps/livebook {
|
||||
elixir = elixir_1_15;
|
||||
beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_15; });
|
||||
};
|
||||
|
||||
lsix = callPackage ../tools/graphics/lsix { };
|
||||
|
|
@ -4099,7 +4105,10 @@ with pkgs;
|
|||
|
||||
play-with-mpv = callPackage ../tools/video/play-with-mpv { };
|
||||
|
||||
plausible = callPackage ../servers/web-apps/plausible { };
|
||||
plausible = callPackage ../servers/web-apps/plausible {
|
||||
elixir = elixir_1_14;
|
||||
beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_14; });
|
||||
};
|
||||
|
||||
pam-reattach = callPackage ../os-specific/darwin/pam-reattach { };
|
||||
|
||||
|
|
@ -6023,6 +6032,8 @@ with pkgs;
|
|||
moar = callPackage ../tools/misc/moar { };
|
||||
|
||||
mobilizon = callPackage ../servers/mobilizon {
|
||||
elixir = elixir_1_14;
|
||||
beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_14; });
|
||||
mobilizon-frontend = callPackage ../servers/mobilizon/frontend.nix { };
|
||||
};
|
||||
|
||||
|
|
@ -12148,7 +12159,10 @@ with pkgs;
|
|||
|
||||
tautulli = python3Packages.callPackage ../servers/tautulli { };
|
||||
|
||||
pleroma = callPackage ../servers/pleroma { };
|
||||
pleroma = callPackage ../servers/pleroma {
|
||||
elixir = elixir_1_14;
|
||||
beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_14; });
|
||||
};
|
||||
|
||||
plfit = callPackage ../tools/misc/plfit {
|
||||
python = null;
|
||||
|
|
@ -35359,7 +35373,10 @@ with pkgs;
|
|||
|
||||
wavebox = libsForQt5.callPackage ../applications/networking/instant-messengers/wavebox { };
|
||||
|
||||
sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { };
|
||||
sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi {
|
||||
elixir = elixir_1_14;
|
||||
beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_14; });
|
||||
};
|
||||
|
||||
stag = callPackage ../applications/misc/stag {
|
||||
curses = ncurses;
|
||||
|
|
|
|||
Loading…
Reference in a new issue