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,13 @@
diff --git a/ulauncher/api/server/ExtensionRunner.py b/ulauncher/api/server/ExtensionRunner.py
index 22042bf..f7b31c8 100644
--- a/ulauncher/api/server/ExtensionRunner.py
+++ b/ulauncher/api/server/ExtensionRunner.py
@@ -79,7 +79,7 @@ class ExtensionRunner:
cmd = [sys.executable, os.path.join(self.extensions_dir, extension_id, 'main.py')]
env = os.environ.copy()
env['ULAUNCHER_WS_API'] = self.extension_server.generate_ws_url(extension_id)
- env['PYTHONPATH'] = ':'.join(filter(bool, [ULAUNCHER_APP_DIR, os.getenv('PYTHONPATH')]))
+ env['PYTHONPATH'] = ':'.join([ULAUNCHER_APP_DIR] + sys.path)
if self.verbose:
env['VERBOSE'] = '1'

View File

@@ -0,0 +1,12 @@
diff --git a/setup.py b/setup.py
index 3616104..e9bbfda 100755
--- a/setup.py
+++ b/setup.py
@@ -94,7 +94,7 @@
# Root is undefined if not installing into an alternate root
root = self.root or "/"
target_data = '/' + os.path.relpath(self.install_data, root) + '/'
- target_pkgdata = target_data + 'share/ulauncher/'
+ target_pkgdata = '@out@/share/ulauncher/'
target_scripts = '/' + os.path.relpath(self.install_scripts,
root) + '/'

View File

@@ -0,0 +1,155 @@
{
lib,
fetchurl,
fetchpatch,
nix-update-script,
python3Packages,
gdk-pixbuf,
glib,
adwaita-icon-theme,
gobject-introspection,
gtk3,
wrapGAppsHook3,
webkitgtk_4_1,
libnotify,
keybinder3,
libappindicator,
intltool,
wmctrl,
xvfb-run,
librsvg,
libX11,
copyDesktopItems,
makeDesktopItem,
}:
python3Packages.buildPythonApplication rec {
pname = "ulauncher";
version = "5.15.7";
pyproject = true;
src = fetchurl {
url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz";
hash = "sha256-YgOw3Gyy/o8qorWAnAlQrAZ2ZTnyP3PagLs2Qkdg788=";
};
nativeBuildInputs = [
gobject-introspection
intltool
wrapGAppsHook3
gdk-pixbuf
copyDesktopItems
];
buildInputs = [
glib
adwaita-icon-theme
gtk3
keybinder3
libappindicator
libnotify
librsvg
webkitgtk_4_1
wmctrl
];
build-system = with python3Packages; [
setuptools
distutils-extra
];
dependencies = with python3Packages; [
mock
dbus-python
pygobject3
pyinotify
levenshtein
pyxdg
pycairo
requests
semver
websocket-client
];
nativeCheckInputs = with python3Packages; [
mock
pytest
pytest-mock
xvfb-run
];
patches = [
./fix-path.patch
./fix-extensions.patch
(fetchpatch {
name = "support-gir1.2-webkit2-4.1.patch";
url = "https://src.fedoraproject.org/rpms/ulauncher/raw/rawhide/f/support-gir1.2-webkit2-4.1.patch";
hash = "sha256-w1c+Yf6SA3fyMrMn1LXzCXf5yuynRYpofkkUqZUKLS8=";
})
];
postPatch = ''
substituteInPlace setup.py --subst-var out
patchShebangs bin/ulauncher-toggle
substituteInPlace bin/ulauncher-toggle \
--replace-fail wmctrl ${wmctrl}/bin/wmctrl
'';
# https://github.com/Ulauncher/Ulauncher/issues/390
doCheck = false;
preCheck = ''
export PYTHONPATH=$PYTHONPATH:$out/${python3Packages.python.sitePackages}
'';
# Simple translation of
# - https://github.com/Ulauncher/Ulauncher/blob/f5a601bdca75198a6a31b9d84433496b63530e74/test
checkPhase = ''
runHook preCheck
# skip tests in invocation that handle paths that
# aren't nix friendly (i think)
xvfb-run -s '-screen 0 1024x768x16' \
pytest -k 'not TestPath and not test_handle_key_press_event' tests
runHook postCheck
'';
pythonImportsCheck = [ "ulauncher" ];
# do not double wrap
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=(
"''${gappsWrapperArgs[@]}"
--prefix PATH : "${lib.makeBinPath [ wmctrl ]}"
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libX11 ]}"
--prefix WEBKIT_DISABLE_COMPOSITING_MODE : "1"
)
'';
passthru = {
updateScript = nix-update-script { };
};
desktopItems = [
(makeDesktopItem {
name = "ulauncher";
desktopName = "Ulauncher";
exec = "ulauncher";
categories = [ "Utility" ];
icon = "ulauncher";
})
];
meta = with lib; {
description = "Fast application launcher for Linux, written in Python, using GTK";
homepage = "https://ulauncher.io/";
license = licenses.gpl3;
platforms = platforms.linux;
mainProgram = "ulauncher";
maintainers = with maintainers; [
aaronjanse
];
};
}

View File

@@ -0,0 +1,38 @@
{
lib,
buildGoModule,
fetchFromGitHub,
}:
buildGoModule rec {
pname = "ulid";
version = "2.1.1";
src = fetchFromGitHub {
owner = "oklog";
repo = "ulid";
rev = "v${version}";
hash = "sha256-kPNLaZMGwGc7ngPCivf/n4Bis219yOkGAaa6mt7+yTY=";
};
vendorHash = "sha256-s1YkEwFxE1zpUUCgwOAl8i6/9HB2rcGG+4kqnixTit0=";
ldflags = [
"-s"
"-w"
];
checkFlags = [
# skip flaky test
"-skip=TestMonotonicSafe"
];
meta = with lib; {
description = "Universally Unique Lexicographically Sortable Identifier (ULID) in Go";
homepage = "https://github.com/oklog/ulid";
changelog = "https://github.com/oklog/ulid/blob/${src.rev}/CHANGELOG.md";
license = licenses.asl20;
maintainers = with maintainers; [ figsoda ];
mainProgram = "ulid";
};
}

View File

@@ -0,0 +1,101 @@
{
stdenv,
lib,
fetchurl,
libnetfilter_acct,
libnetfilter_conntrack,
libnetfilter_log,
libmnl,
libnfnetlink,
automake,
autoconf,
autogen,
libtool,
libpq,
libmysqlclient,
sqlite,
pkg-config,
libpcap,
linuxdoc-tools,
autoreconfHook,
nixosTests,
}:
stdenv.mkDerivation (finalAttrs: {
version = "2.0.9";
pname = "ulogd";
src = fetchurl {
url = "https://www.netfilter.org/pub/ulogd/ulogd-${finalAttrs.version}.tar.xz";
hash = "sha256-UjplH+Cp8lsM2H1dNfw32Tgufuz89h5I1VBf88+A7aU=";
};
outputs = [
"out"
"doc"
"man"
];
postPatch = ''
substituteInPlace ulogd.8 --replace-fail "/usr/share/doc" "$doc/share/doc"
'';
postBuild = ''
pushd doc/
linuxdoc --backend=txt --filter ulogd.sgml
linuxdoc --backend=html --split=0 ulogd.sgml
popd
'';
postInstall = ''
install -Dm444 -t $out/share/doc/ulogd ulogd.conf doc/ulogd.txt doc/ulogd.html README doc/*table
install -Dm444 -t $out/share/doc/ulogd-mysql doc/mysql*.sql
install -Dm444 -t $out/share/doc/ulogd-pgsql doc/pgsql*.sql
'';
buildInputs = [
libnetfilter_acct
libnetfilter_conntrack
libnetfilter_log
libmnl
libnfnetlink
libpcap
libpq
libmysqlclient
sqlite
];
nativeBuildInputs = [
autoreconfHook
pkg-config
automake
autoconf
autogen
libtool
linuxdoc-tools
];
passthru.tests = { inherit (nixosTests) ulogd; };
meta = {
description = "Userspace logging daemon for netfilter/iptables";
mainProgram = "ulogd";
longDescription = ''
Logging daemon that reads event messages coming from the Netfilter
connection tracking, the Netfilter packet logging subsystem and from the
Netfilter accounting subsystem. You have to enable support for connection
tracking event delivery; ctnetlink and the NFLOG target in your Linux
kernel 2.6.x or load their respective modules. The deprecated ULOG target
(which has been superseded by NFLOG) is also supported.
The received messages can be logged into files or into a MySQL, SQLite3
or PostgreSQL database. IPFIX and Graphite output are also supported.
'';
homepage = "https://www.netfilter.org/projects/ulogd/index.html";
license = lib.licenses.gpl2Only;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ p-h ];
};
})

View File

@@ -0,0 +1,33 @@
{
lib,
stdenvNoCC,
fetchzip,
}:
stdenvNoCC.mkDerivation rec {
pname = "ultimate-oldschool-pc-font-pack";
version = "2.2";
src = fetchzip {
url = "https://int10h.org/oldschool-pc-fonts/download/oldschool_pc_font_pack_v${version}_linux.zip";
stripRoot = false;
hash = "sha256-54U8tZzvivTSOgmGesj9QbIgkSTm9w4quMhsuEc0Xy4=";
};
installPhase = ''
runHook preInstall
mkdir -p $out/share/fonts/truetype
cp */*.ttf $out/share/fonts/truetype
runHook postInstall
'';
meta = with lib; {
description = "Ultimate Oldschool PC Font Pack (TTF Fonts)";
homepage = "https://int10h.org/oldschool-pc-fonts/";
changelog = "https://int10h.org/oldschool-pc-fonts/readme/#history";
license = licenses.cc-by-sa-40;
maintainers = [ maintainers.endgame ];
};
}

View File

@@ -0,0 +1,47 @@
{
lib,
stdenv,
fetchurl,
SDL,
libGLU,
libGL,
SDL_image,
freealut,
openal,
libvorbis,
pkg-config,
}:
stdenv.mkDerivation rec {
pname = "ultimate-stunts";
version = "0.7.7.1";
src = fetchurl {
url = "mirror://sourceforge/ultimatestunts/ultimatestunts-srcdata-${
lib.replaceStrings [ "." ] [ "" ] version
}.tar.gz";
sha256 = "sha256-/MBuSi/yxcG9k3ZwrNsHkUDzzg798AV462VZog67JtM=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [
SDL
libGLU
libGL
SDL_image
freealut
openal
libvorbis
];
postPatch = ''
sed -e '1i#include <unistd.h>' -i $(find . -name '*.c' -o -name '*.cpp')
'';
meta = {
homepage = "https://www.ultimatestunts.nl/";
description = "Remake of the popular racing DOS-game Stunts";
license = lib.licenses.gpl2Plus;
maintainers = [ ];
platforms = with lib.platforms; linux;
};
}

View File

@@ -0,0 +1,33 @@
{
lib,
fetchFromGitHub,
buildGoModule,
}:
buildGoModule rec {
pname = "ultrablue-server";
version = "unstable-fosdem2023";
src = fetchFromGitHub {
owner = "ANSSI-FR";
repo = "ultrablue";
# Do not use a more recent
rev = "tags/fosdem-2023";
hash = "sha256-rnUbgZI+SycYCDUoSziOy+WxRFvyM3XJWJnk3+t0eb4=";
# rev = "6de04af6e353e38c030539c5678e5918f64be37e";
};
sourceRoot = "${src.name}/server";
vendorHash = "sha256-249LWguTHIF0HNIo8CsE/HWpAtBw4P46VPvlTARLTpw=";
doCheck = false;
meta = with lib; {
description = "User-friendly Lightweight TPM Remote Attestation over Bluetooth";
mainProgram = "ultrablue-server";
homepage = "https://github.com/ANSSI-FR/ultrablue";
license = licenses.asl20;
platforms = platforms.linux;
maintainers = with maintainers; [ raitobezarius ];
};
}

View File

@@ -0,0 +1,27 @@
{
lib,
buildGoModule,
fetchFromGitHub,
}:
buildGoModule rec {
pname = "ultralist";
version = "1.7.0";
src = fetchFromGitHub {
owner = "ultralist";
repo = "ultralist";
rev = version;
sha256 = "sha256-GGBW6rpwv1bVbLTD//cU8jNbq/27Ls0su7DymCJTSmY=";
};
vendorHash = null;
meta = with lib; {
description = "Simple GTD-style todo list for the command line";
homepage = "https://ultralist.io";
license = licenses.mit;
maintainers = with maintainers; [ uvnikita ];
mainProgram = "ultralist";
};
}

View File

@@ -0,0 +1,89 @@
{
lib,
stdenv,
autoreconfHook,
fetchFromGitHub,
pkg-config,
lua,
fpc,
portaudio,
freetype,
libpng,
SDL2,
SDL2_image,
SDL2_gfx,
SDL2_mixer,
SDL2_net,
SDL2_ttf,
ffmpeg,
sqlite,
zlib,
libX11,
libGLU,
libGL,
}:
let
sharedLibs = [
portaudio
freetype
SDL2
SDL2_image
SDL2_gfx
SDL2_mixer
SDL2_net
SDL2_ttf
sqlite
lua
zlib
libX11
libGLU
libGL
ffmpeg
];
in
stdenv.mkDerivation rec {
pname = "ultrastardx";
version = "2025.10.0";
src = fetchFromGitHub {
owner = "UltraStar-Deluxe";
repo = "USDX";
rev = "v${version}";
hash = "sha256-rJhPVq6rheAtPHkDi8zPb1OGKHP56rl7jG9sKVDEqUw=";
};
nativeBuildInputs = [
pkg-config
autoreconfHook
];
buildInputs = [
fpc
libpng
]
++ sharedLibs;
preBuild =
let
items = lib.concatMapStringsSep " " (x: "-rpath ${lib.getLib x}/lib") sharedLibs;
in
''
export NIX_LDFLAGS="$NIX_LDFLAGS ${items}"
'';
# dlopened libgcc requires the rpath not to be shrinked
dontPatchELF = true;
meta = with lib; {
homepage = "https://usdx.eu/";
description = "Free and open source karaoke game";
mainProgram = "ultrastardx";
license = licenses.gpl2Plus;
maintainers = with maintainers; [
diogotcorreia
Profpatsch
];
platforms = platforms.linux;
};
}