push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,75 @@
{
stdenv,
lib,
rustPlatform,
fetchFromGitHub,
installShellFiles,
rust-jemalloc-sys,
testers,
fd,
}:
rustPlatform.buildRustPackage rec {
pname = "fd";
version = "10.3.0";
src = fetchFromGitHub {
owner = "sharkdp";
repo = "fd";
rev = "v${version}";
hash = "sha256-rUoR8LHtzwGQBwJGEsWpMYKG6HcGKcktcyF7TxTDJs8=";
};
cargoHash = "sha256-yiR23t48I0USD21tnFZzmTmO0D8kWNzP9Ff3QM9GitU=";
nativeBuildInputs = [ installShellFiles ];
buildInputs = [ rust-jemalloc-sys ];
# skip flaky test
checkFlags = [
"--skip=test_owner_current_group"
# Fails if the filesystem performs UTF-8 validation (such as ZFS with utf8only=on)
"--skip=test_exec_invalid_utf8"
"--skip=test_invalid_utf8"
];
postInstall = ''
installManPage doc/fd.1
''
+ lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd fd \
--bash <($out/bin/fd --gen-completions bash) \
--fish <($out/bin/fd --gen-completions fish)
installShellCompletion --zsh contrib/completion/_fd
'';
passthru.tests.version = testers.testVersion {
package = fd;
};
meta = {
description = "Simple, fast and user-friendly alternative to find";
longDescription = ''
`fd` is a simple, fast and user-friendly alternative to `find`.
While it does not seek to mirror all of `find`'s powerful functionality,
it provides sensible (opinionated) defaults for 80% of the use cases.
'';
homepage = "https://github.com/sharkdp/fd";
changelog = "https://github.com/sharkdp/fd/blob/v${version}/CHANGELOG.md";
license = with lib.licenses; [
asl20 # or
mit
];
maintainers = with lib.maintainers; [
dywedir
figsoda
globin
ma27
zowoq
matthiasbeyer
];
mainProgram = "fd";
};
}

View File

@@ -0,0 +1,42 @@
{
lib,
stdenv,
autoreconfHook,
fetchFromGitHub,
pkg-config,
fdk_aac,
}:
stdenv.mkDerivation rec {
pname = "fdkaac";
version = "1.0.6";
src = fetchFromGitHub {
owner = "nu774";
repo = "fdkaac";
rev = "v${version}";
hash = "sha256-nVVeYk7t4+n/BsOKs744stsvgJd+zNnbASk3bAgFTpk=";
};
nativeBuildInputs = [
autoreconfHook
pkg-config
];
buildInputs = [ fdk_aac ];
doCheck = true;
meta = with lib; {
description = "Command line encoder frontend for libfdk-aac encoder";
mainProgram = "fdkaac";
longDescription = ''
fdkaac reads linear PCM audio in either WAV, raw PCM, or CAF format,
and encodes it into either M4A / AAC file.
'';
homepage = "https://github.com/nu774/fdkaac";
license = licenses.zlib;
platforms = platforms.all;
maintainers = [ maintainers.lunik1 ];
};
}

View File

@@ -0,0 +1,33 @@
{
lib,
stdenv,
fetchurl,
exampleSupport ? false, # Example encoding program
}:
stdenv.mkDerivation rec {
pname = "fdk-aac";
version = "2.0.3";
src = fetchurl {
url = "mirror://sourceforge/opencore-amr/fdk-aac/${pname}-${version}.tar.gz";
sha256 = "sha256-gptrie7zgkCc2mhX/YKvhPq7Y0F7CO3p6npVP4Ect54=";
};
outputs = [
"out"
"dev"
];
enableParallelBuilding = true;
configureFlags = lib.optional exampleSupport "--enable-example";
meta = with lib; {
description = "High-quality implementation of the AAC codec from Android";
homepage = "https://sourceforge.net/projects/opencore-amr/";
license = licenses.fraunhofer-fdk;
maintainers = with maintainers; [ codyopel ];
platforms = platforms.all;
};
}

View File

@@ -0,0 +1,48 @@
{
lib,
stdenv,
fetchFromGitHub,
autoreconfHook,
openssl,
tdb,
zlib,
flex,
bison,
}:
stdenv.mkDerivation rec {
pname = "fdm";
version = "2.2";
src = fetchFromGitHub {
owner = "nicm";
repo = "fdm";
rev = version;
hash = "sha256-Gqpz+N1ELU5jQpPJAG9s8J9UHWOJNhkT+s7+xuQazd0=";
};
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [
openssl
tdb
zlib
flex
bison
];
postInstall = ''
install fdm-sanitize $out/bin
mkdir -p $out/share/doc/fdm
install -m644 MANUAL $out/share/doc/fdm
cp -R examples $out/share/doc/fdm
'';
meta = with lib; {
description = "Mail fetching and delivery tool - should do the job of getmail and procmail";
maintainers = with maintainers; [ raskin ];
platforms = with platforms; linux ++ darwin;
homepage = "https://github.com/nicm/fdm";
downloadPage = "https://github.com/nicm/fdm/releases";
license = licenses.isc;
};
}

View File

@@ -0,0 +1,36 @@
{
lib,
buildGoModule,
fetchFromGitHub,
android-tools,
}:
buildGoModule (finalAttrs: {
pname = "fdroidcl";
version = "0.8.1";
src = fetchFromGitHub {
owner = "Hoverth";
repo = "fdroidcl";
tag = "v${finalAttrs.version}";
hash = "sha256-SmPtMNHxktyhc0/izWmAzcfCXqF2BpPNJjsrqRlU1K0=";
};
vendorHash = "sha256-PNj5gkFj+ruxv1I4SezJxebDO2e1qGTYp3ZgekRLNt0=";
postPatch = ''
substituteInPlace adb/{server,device}.go \
--replace 'exec.Command("adb"' 'exec.Command("${android-tools}/bin/adb"'
'';
# TestScript/search attempts to connect to fdroid
doCheck = false;
meta = {
description = "F-Droid command line interface written in Go";
mainProgram = "fdroidcl";
homepage = "https://github.com/Hoverth/fdroidcl";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ aleksana ];
};
})

View File

@@ -0,0 +1,112 @@
{
lib,
fetchFromGitLab,
python3Packages,
python3,
fetchPypi,
apksigner,
installShellFiles,
}:
python3Packages.buildPythonApplication rec {
pname = "fdroidserver";
version = "2.4.2";
pyproject = true;
src = fetchFromGitLab {
owner = "fdroid";
repo = "fdroidserver";
tag = version;
hash = "sha256-26D+nnytLOsEAWNj2XvKM2O00epGtvJaJhUw+yoBl9Y=";
};
pythonRelaxDeps = [
"androguard"
"pyasn1"
"pyasn1-modules"
];
pythonRemoveDeps = [
"puremagic" # Only used as a fallback when magic is not installed
];
postPatch = ''
substituteInPlace fdroidserver/common.py \
--replace-fail "FDROID_PATH = os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))" "FDROID_PATH = '$out/bin'"
'';
preConfigure = ''
${python3.pythonOnBuildForHost.interpreter} setup.py compile_catalog
'';
postInstall = ''
patchShebangs gradlew-fdroid
install -m 0755 gradlew-fdroid $out/bin
installShellCompletion --cmd fdroid \
--bash completion/bash-completion
'';
nativeBuildInputs = [ installShellFiles ];
build-system = with python3Packages; [
setuptools
babel
];
dependencies = with python3Packages; [
androguard
biplist
clint
defusedxml
gitpython
libcloud
libvirt
magic
mwclient
oscrypto
paramiko
pillow
platformdirs
pyasn1
pyasn1-modules
pycountry
python-vagrant
pyyaml
qrcode
requests
(ruamel-yaml.overrideAttrs (old: {
src = fetchPypi {
pname = "ruamel.yaml";
version = "0.17.21";
hash = "sha256-i3zml6LyEnUqNcGsQURx3BbEJMlXO+SSa1b/P10jt68=";
};
}))
sdkmanager
yamllint
];
makeWrapperArgs = [
"--prefix"
"PATH"
":"
"${lib.makeBinPath [ apksigner ]}"
];
# no tests
doCheck = false;
pythonImportsCheck = [ "fdroidserver" ];
meta = {
homepage = "https://gitlab.com/fdroid/fdroidserver";
changelog = "https://gitlab.com/fdroid/fdroidserver/-/blob/${version}/CHANGELOG.md";
description = "Server and tools for F-Droid, the Free Software repository system for Android";
license = lib.licenses.agpl3Plus;
maintainers = with lib.maintainers; [
linsui
jugendhacker
];
mainProgram = "fdroid";
};
}

View File

@@ -0,0 +1,223 @@
diff -Naur misc/fdtools-2020.05.04/src/check_exit_exec.c misc-new/fdtools-2020.05.04/src/check_exit_exec.c
--- misc/fdtools-2020.05.04/src/check_exit_exec.c 2015-03-16 04:55:56.000000000 +0100
+++ misc-new/fdtools-2020.05.04/src/check_exit_exec.c 2021-01-22 10:50:25.529955213 +0100
@@ -2,6 +2,7 @@
#include <unistd.h>
#include <errno.h>
+#include <skalibs/exec.h>
#include <skalibs/stddjb.h>
#include "prjlibs-c/constants.h"
#include "prjlibs-c/diewarn.h"
@@ -14,7 +15,7 @@
if (str_equal(arg, ":")) {
++argv;
- pathexec0((char const**)argv);
+ mexec0((char const**)argv);
DIE1(exec, argv[0]);
}
}
diff -Naur misc/fdtools-2020.05.04/src/grabconsole.c misc-new/fdtools-2020.05.04/src/grabconsole.c
--- misc/fdtools-2020.05.04/src/grabconsole.c 2020-04-24 06:01:22.000000000 +0200
+++ misc-new/fdtools-2020.05.04/src/grabconsole.c 2021-01-22 10:43:27.887754936 +0100
@@ -4,6 +4,7 @@
#include <errno.h>
#include <skalibs/stddjb.h>
+#include <skalibs/exec.h>
#include "prjlibs-c/constants.h"
#include "prjlibs-c/diewarn.h"
#include "prjlibs-c/types.h"
@@ -26,6 +27,6 @@
if (fd_grabconsole(fd)!=0) DIE0(tioccons);
argv+=2;
- pathexec0((char const**)argv);
+ mexec0((char const**)argv);
DIE1(exec, argv[0]);
}
diff -Naur misc/fdtools-2020.05.04/src/pipecycle.c misc-new/fdtools-2020.05.04/src/pipecycle.c
--- misc/fdtools-2020.05.04/src/pipecycle.c 2015-03-16 04:55:56.000000000 +0100
+++ misc-new/fdtools-2020.05.04/src/pipecycle.c 2021-01-22 10:47:58.033220790 +0100
@@ -4,6 +4,7 @@
#include <unistd.h>
#include <signal.h>
+#include <skalibs/exec.h>
#include <skalibs/stddjb.h>
#include "prjlibs-c/diewarn.h"
#include "prjlibs-c/types.h"
@@ -56,7 +57,7 @@
if (fd_shuffle(2, current, wanted)!=0) DIE0(dup);
}
read(start[0], &j, 1);
- pathexec(args);
+ mexec(args);
DIE1(exec, args[0]);
}
diff -Naur misc/fdtools-2020.05.04/src/recvfd.c misc-new/fdtools-2020.05.04/src/recvfd.c
--- misc/fdtools-2020.05.04/src/recvfd.c 2020-04-28 09:35:05.000000000 +0200
+++ misc-new/fdtools-2020.05.04/src/recvfd.c 2021-01-22 10:47:14.180994779 +0100
@@ -7,6 +7,7 @@
#include <limits.h>
#include <skalibs/stddjb.h>
+#include <skalibs/exec.h>
#include "prjlibs-c/diewarn.h"
#include "prjlibs-c/types.h"
#include "fdtools.h"
@@ -69,9 +70,9 @@
named_fd=duped;
}
buf[int_fmt(buf, named_fd)]='\0';
- if (pathexec_env(argv[i]+1, buf)==0) DIE0(alloc);
+ if (env_mexec(argv[i]+1, buf)==0) DIE0(alloc);
}
argv+=nfds+1;
- pathexec0((char const**)argv);
+ mexec0((char const**)argv);
DIE1(exec, argv[0]);
}
diff -Naur misc/fdtools-2020.05.04/src/sendfd.c misc-new/fdtools-2020.05.04/src/sendfd.c
--- misc/fdtools-2020.05.04/src/sendfd.c 2015-03-16 06:48:39.000000000 +0100
+++ misc-new/fdtools-2020.05.04/src/sendfd.c 2021-01-22 10:43:07.207634214 +0100
@@ -7,6 +7,7 @@
#include <limits.h>
#include <skalibs/stddjb.h>
+#include <skalibs/exec.h>
#include "prjlibs-c/diewarn.h"
#include "prjlibs-c/types.h"
#include "fdtools.h"
@@ -40,6 +41,6 @@
argv+=nfds;
if (*argv==NULL) _exit(0);
++argv;
- pathexec0((char const**)argv);
+ mexec0((char const**)argv);
DIE1(exec, argv[0]);
}
diff -Naur misc/fdtools-2020.05.04/src/setstate.c misc-new/fdtools-2020.05.04/src/setstate.c
--- misc/fdtools-2020.05.04/src/setstate.c 2020-05-04 10:04:21.000000000 +0200
+++ misc-new/fdtools-2020.05.04/src/setstate.c 2021-01-22 10:45:05.084304318 +0100
@@ -8,6 +8,7 @@
#include <errno.h>
#include <skalibs/stddjb.h>
+#include <skalibs/exec.h>
#include "prjlibs-c/constants.h"
#include "prjlibs-c/intattr.h"
#include "prjlibs-c/diewarn.h"
@@ -167,6 +168,6 @@
}
argv+=2;
- pathexec_run(argv[0], (char const**)argv, (char const**)environ);
+ mexec_ae(argv[0], (char const**)argv, (char const**)environ);
DIE1(exec, argv[0]);
}
diff -Naur misc/fdtools-2020.05.04/src/statfile.c misc-new/fdtools-2020.05.04/src/statfile.c
--- misc/fdtools-2020.05.04/src/statfile.c 2015-03-22 00:33:44.000000000 +0100
+++ misc-new/fdtools-2020.05.04/src/statfile.c 2021-01-22 10:48:23.673351183 +0100
@@ -6,6 +6,7 @@
#include <errno.h>
#include <skalibs/stddjb.h>
+#include <skalibs/exec.h>
#include "prjlibs-c/constants.h"
#include "prjlibs-c/diewarn.h"
#include "prjlibs-c/warn.h"
@@ -15,7 +16,7 @@
char const* PROG="statfile";
static void set(char const* const var, char const* const val) {
- if (pathexec_env(var, val)==0) DIE0(alloc);
+ if (env_mexec(var, val)==0) DIE0(alloc);
}
static void set64n(char const* const var, time_t t, unsigned int nsec) {
@@ -178,6 +179,6 @@
}
argv+=3;
- pathexec((char const**)argv);
+ mexec((char const**)argv);
DIE1(exec, argv[0]);
}
diff -Naur misc/fdtools-2020.05.04/src/vc-get-linux.c misc-new/fdtools-2020.05.04/src/vc-get-linux.c
--- misc/fdtools-2020.05.04/src/vc-get-linux.c 2020-04-28 07:04:49.000000000 +0200
+++ misc-new/fdtools-2020.05.04/src/vc-get-linux.c 2021-01-22 10:47:34.649100757 +0100
@@ -10,6 +10,7 @@
#include <sys/sysmacros.h>
#include <skalibs/stddjb.h>
+#include <skalibs/exec.h>
#include "prjlibs-c/constants.h"
#include "prjlibs-c/diewarn.h"
#include "prjlibs-c/types.h"
@@ -38,7 +39,7 @@
errno=0;
if (ioctl(fd, VT_OPENQRY, &vtnum)<0 || vtnum==-1) DIE0(vt_qry);
bufnum[ulong_fmt(bufnum, vtnum)]='\0';
- if (pathexec_env("TTY", buf)==0) DIE0(alloc);
+ if (env_mexec("TTY", buf)==0) DIE0(alloc);
}
fd_close(fd);
@@ -50,12 +51,12 @@
if (fstat(fd, &statbuf)!=0) DIE1(stat, buf);
buf[ulong_fmt(buf, minor(statbuf.st_rdev))]='\0';
}
- if (pathexec_env("VCNUM", buf)==0) DIE0(alloc);
+ if (env_mexec("VCNUM", buf)==0) DIE0(alloc);
buf[ulong_fmt(buf, fd)]='\0';
- if (pathexec_env("VCFD", buf)==0) DIE0(alloc);
+ if (env_mexec("VCFD", buf)==0) DIE0(alloc);
}
- pathexec((char const**)argv+2);
+ mexec((char const**)argv+2);
DIE1(exec, argv[2]);
}
diff -Naur misc/fdtools-2020.05.04/src/vc-lock-linux.c misc-new/fdtools-2020.05.04/src/vc-lock-linux.c
--- misc/fdtools-2020.05.04/src/vc-lock-linux.c 2015-03-20 05:59:42.000000000 +0100
+++ misc-new/fdtools-2020.05.04/src/vc-lock-linux.c 2021-01-22 10:48:36.857417751 +0100
@@ -8,6 +8,7 @@
#include <sys/ioctl.h>
#include <sys/vt.h>
+#include <skalibs/exec.h>
#include <skalibs/stddjb.h>
#include "prjlibs-c/constants.h"
#include "prjlibs-c/diewarn.h"
@@ -79,7 +80,7 @@
WARN0(fork);
} else if (pid==0) {
sigprocmask(SIG_SETMASK, &old_set, NULLP);
- pathexec((char const**)argv);
+ mexec((char const**)argv);
DIE1(exec, *argv);
} else {
int status;
diff -Naur misc/fdtools-2020.05.04/src/vc-switch-linux.c misc-new/fdtools-2020.05.04/src/vc-switch-linux.c
--- misc/fdtools-2020.05.04/src/vc-switch-linux.c 2020-04-28 07:14:04.000000000 +0200
+++ misc-new/fdtools-2020.05.04/src/vc-switch-linux.c 2021-01-22 10:42:41.259480648 +0100
@@ -10,6 +10,7 @@
#include <sys/sysmacros.h>
#include <skalibs/stddjb.h>
+#include <skalibs/exec.h>
#include "prjlibs-c/constants.h"
#include "prjlibs-c/diewarn.h"
#include "prjlibs-c/types.h"
@@ -36,6 +37,6 @@
if (ioctl(fd, VT_ACTIVATE, ttyno)<0) DIE0(vt_act);
if (!scan) fd_close(fd);
- pathexec0((char const**)argv+3);
+ mexec0((char const**)argv+3);
DIE1(exec, argv[3]);
}

View File

@@ -0,0 +1,101 @@
{
stdenv,
lib,
fetchurl,
skawarePackages,
}:
let
pname = "fdtools";
# When you update, check whether we can drop the skalibs pin.
version = "2020.05.04";
sha256 = "0lnafcp4yipi0dl8gh33zjs8wlpz0mim8mwmiz9s49id0b0fmlla";
skalibs = skawarePackages.skalibs_2_10;
in
stdenv.mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://code.dogmap.org/fdtools/releases/fdtools-${version}.tar.bz2";
inherit sha256;
};
patches = [ ./new-skalibs.patch ];
outputs = [
"bin"
"lib"
"dev"
"doc"
"out"
];
buildInputs = [
# temporary, until fdtools catches up to skalibs
skalibs
];
configurePhase = ''
cd fdtools-${version}
sed -e 's|gcc|$CC|' \
conf-compile/defaults/host_link.sh \
> conf-compile/host_link.sh
sed -e 's|gcc|$CC|' \
conf-compile/defaults/host_compile.sh \
> conf-compile/host_compile.sh
echo "${skalibs.lib}/lib/skalibs/sysdeps" \
> conf-compile/depend_skalibs_sysdeps
'';
buildPhase = ''
bash package/build
'';
installPhase = ''
mkdir -p $bin/bin
tools=( grabconsole multitee pipecycle recvfd seek0 sendfd setblock setstate statfile vc-get vc-lock vc-switch )
for t in "''${tools[@]}"; do
mv "command/$t" "$bin/bin/$t"
done
mkdir -p $lib/lib
mkdir -p $dev/include
docdir=$doc/share/doc/fdtools
mkdir -p $docdir
mv library/fdtools.a $lib/lib/fdtools.a
mv include/fdtools.h $dev/include/fdtools.h
${
skawarePackages.cleanPackaging.commonFileActions {
noiseFiles = [
"conf-compile/**/*"
"src/**/*"
"src/.**/*"
"compile/**/*"
"package/{build,check,compile,elsewhere,install,install_commands,own,run,sharing,upgrade,upgrade_version,url_src,url_src_latest,versions}"
];
docFiles = [
"package/INSTALL"
"package/LICENSE"
"package/README"
];
}
} $docdir
${skawarePackages.cleanPackaging.checkForRemainingFiles}
# we dont use this, but nixpkgs requires it
touch $out
'';
meta = {
homepage = "https://code.dogmap.org/fdtools/";
description = "Set of utilities for working with file descriptors";
license = lib.licenses.gpl2Only;
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.Profpatsch ];
};
}

View File

@@ -0,0 +1,46 @@
{
lib,
stdenv,
fetchFromGitHub,
autoreconfHook,
pkg-config,
ncurses,
pcre2,
sqlite,
}:
stdenv.mkDerivation rec {
pname = "fdupes";
version = "2.4.0";
src = fetchFromGitHub {
owner = "adrianlopezroche";
repo = "fdupes";
rev = "v${version}";
hash = "sha256-epregz+i2mML5zCQErQDJFUFUxnUoqcBlUPGPJ4tcmc=";
};
nativeBuildInputs = [
autoreconfHook
pkg-config
];
buildInputs = [
ncurses
pcre2
sqlite
];
meta = with lib; {
description = "Identifies duplicate files residing within specified directories";
longDescription = ''
fdupes searches the given path for duplicate files.
Such files are found by comparing file sizes and MD5 signatures,
followed by a byte-by-byte comparison.
'';
homepage = "https://github.com/adrianlopezroche/fdupes";
license = licenses.mit;
platforms = platforms.all;
maintainers = [ maintainers.maggesi ];
mainProgram = "fdupes";
};
}