mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-03 13:30:36 +00:00
Merge release-24.05 into staging-next-24.05
This commit is contained in:
@@ -67,16 +67,16 @@ let
|
||||
inherit (cfg.provision) organizations users;
|
||||
});
|
||||
|
||||
provisioningScript = pkgs.writeShellScript "post-start-provision" ''
|
||||
set -euo pipefail
|
||||
export INFLUX_HOST="http://"${escapeShellArg (
|
||||
influxHost = "http://${escapeShellArg (
|
||||
if ! hasAttr "http-bind-address" cfg.settings
|
||||
|| hasInfix "0.0.0.0" cfg.settings.http-bind-address
|
||||
then "localhost:8086"
|
||||
else cfg.settings.http-bind-address
|
||||
)}
|
||||
)}";
|
||||
|
||||
# Wait for the influxdb server to come online
|
||||
waitUntilServiceIsReady = pkgs.writeShellScript "wait-until-service-is-ready" ''
|
||||
set -euo pipefail
|
||||
export INFLUX_HOST=${influxHost}
|
||||
count=0
|
||||
while ! influx ping &>/dev/null; do
|
||||
if [ "$count" -eq 300 ]; then
|
||||
@@ -92,6 +92,11 @@ let
|
||||
sleep 0.1
|
||||
count=$((count++))
|
||||
done
|
||||
'';
|
||||
|
||||
provisioningScript = pkgs.writeShellScript "post-start-provision" ''
|
||||
set -euo pipefail
|
||||
export INFLUX_HOST=${influxHost}
|
||||
|
||||
# Do the initial database setup. Pass /dev/null as configs-path to
|
||||
# avoid saving the token as the active config.
|
||||
@@ -447,11 +452,13 @@ in
|
||||
"admin-token:${cfg.provision.initialSetup.tokenFile}"
|
||||
];
|
||||
|
||||
ExecStartPost = mkIf cfg.provision.enable (
|
||||
ExecStartPost = [
|
||||
waitUntilServiceIsReady
|
||||
] ++ (lib.optionals cfg.provision.enable (
|
||||
[provisioningScript] ++
|
||||
# Only the restarter runs with elevated privileges
|
||||
optional anyAuthDefined "+${restarterScript}"
|
||||
);
|
||||
));
|
||||
};
|
||||
|
||||
path = [
|
||||
|
||||
@@ -88,7 +88,7 @@
|
||||
, withWebP ? lib.versionAtLeast version "29"
|
||||
, withX ? !(stdenv.isDarwin || noGui || withPgtk)
|
||||
, withXinput2 ? withX && lib.versionAtLeast version "29"
|
||||
, withXwidgets ? !stdenv.isDarwin && !noGui && (withGTK3 || withPgtk)
|
||||
, withXwidgets ? !stdenv.hostPlatform.isDarwin && !noGui && (withGTK3 || withPgtk) && (lib.versionOlder version "30") # XXX: upstream bug 66068 precludes newer versions of webkit2gtk (https://lists.gnu.org/archive/html/bug-gnu-emacs/2024-09/msg00695.html)
|
||||
, withSmallJaDic ? false
|
||||
, withCompressInstall ? true
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
, runCommandWith
|
||||
, writeShellScript
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nixosTests
|
||||
|
||||
, freetype
|
||||
@@ -114,11 +115,27 @@ in stdenv.mkDerivation {
|
||||
repo = "darling";
|
||||
rev = "25afbc76428c39c3909e9efcf5caef1140425211";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-T0g38loUFv3jHvUu3R3QH9hwP8JVe2al4g4VhXnBDMc=";
|
||||
hash = "sha256-z9IMgc5hH2Upn8wHl1OgP42q9HTSkeHnxB3N812A+Kc=";
|
||||
# Remove 500MB of dependency test files to get under Hydra output limit
|
||||
postFetch = ''
|
||||
rm -r $out/src/external/openjdk/test
|
||||
rm -r $out/src/external/libmalloc/tests
|
||||
rm -r $out/src/external/libarchive/libarchive/tar/test
|
||||
'';
|
||||
};
|
||||
|
||||
outputs = [ "out" "sdk" ];
|
||||
|
||||
patches = [
|
||||
# Fix 'clang: error: no such file or directory: .../signal/mach_excUser.c'
|
||||
# https://github.com/darlinghq/darling/issues/1511
|
||||
# https://github.com/darlinghq/darling/commit/f46eb721c11d32addd807f092f4b3a6ea515bb6d
|
||||
(fetchpatch {
|
||||
url = "https://github.com/darlinghq/darling/commit/f46eb721c11d32addd807f092f4b3a6ea515bb6d.patch?full_index=1";
|
||||
hash = "sha256-FnLcHnK4cNto+E3OQSxE3iK+FHSU8y459FcpMvrzd6o=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# We have to be careful - Patching everything indiscriminately
|
||||
# would affect Darwin scripts as well
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, buildMozillaMach
|
||||
, nixosTests
|
||||
, python311
|
||||
@@ -8,7 +9,7 @@
|
||||
|
||||
((buildMozillaMach rec {
|
||||
pname = "floorp";
|
||||
packageVersion = "11.17.5";
|
||||
packageVersion = "11.18.1";
|
||||
applicationName = "Floorp";
|
||||
binaryName = "floorp";
|
||||
branding = "browser/branding/official";
|
||||
@@ -16,14 +17,14 @@
|
||||
allowAddonSideload = true;
|
||||
|
||||
# Must match the contents of `browser/config/version.txt` in the source tree
|
||||
version = "128.1.0";
|
||||
version = "128.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Floorp-Projects";
|
||||
repo = "Floorp";
|
||||
fetchSubmodules = true;
|
||||
rev = "v${packageVersion}";
|
||||
hash = "sha256-8uONEMQI801c9txDa1ZmHQE8xQCViAJbTkxtgYRmUDE=";
|
||||
hash = "sha256-w7b3s8/ekDzGbjbdqK/9W9S5e79fbE9ftJkSsz2sQtA=";
|
||||
};
|
||||
|
||||
extraConfigureFlags = [
|
||||
@@ -68,4 +69,12 @@
|
||||
}).overrideAttrs (prev: {
|
||||
MOZ_DATA_REPORTING = "";
|
||||
MOZ_TELEMETRY_REPORTING = "";
|
||||
|
||||
# Upstream already includes some of the bugfix patches that are applied by
|
||||
# `buildMozillaMach`. Pick out only the relevant ones for Floorp and override
|
||||
# the list here.
|
||||
patches = [
|
||||
../firefox/env_var_for_system_dir-ff111.patch
|
||||
../firefox/no-buildconfig-ffx121.patch
|
||||
];
|
||||
})
|
||||
|
||||
@@ -1,12 +1,35 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gtk3, ncurses
|
||||
, libcpuid, pciutils, procps, wrapGAppsHook3, nasm, makeWrapper
|
||||
, opencl-headers, ocl-icd
|
||||
, vulkan-headers, vulkan-loader, glfw
|
||||
, libXdmcp, pcre, util-linux
|
||||
, libselinux, libsepol
|
||||
, libthai, libdatrie, libxkbcommon, libepoxy
|
||||
, dbus, at-spi2-core
|
||||
, libXtst
|
||||
{
|
||||
lib,
|
||||
testers,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
gtk3,
|
||||
ncurses,
|
||||
libcpuid,
|
||||
pciutils,
|
||||
procps,
|
||||
wrapGAppsHook3,
|
||||
nasm,
|
||||
opencl-headers,
|
||||
ocl-icd,
|
||||
vulkan-headers,
|
||||
vulkan-loader,
|
||||
glfw,
|
||||
libXdmcp,
|
||||
pcre,
|
||||
util-linux,
|
||||
libselinux,
|
||||
libsepol,
|
||||
libthai,
|
||||
libdatrie,
|
||||
libxkbcommon,
|
||||
libepoxy,
|
||||
dbus,
|
||||
at-spi2-core,
|
||||
libXtst,
|
||||
gtkmm3,
|
||||
}:
|
||||
|
||||
# Known issues:
|
||||
@@ -14,41 +37,69 @@
|
||||
# registered in /etc/shells. The nix's bash is not in there when running
|
||||
# cpu-x from nixpkgs.
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cpu-x";
|
||||
version = "5.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "X0rg";
|
||||
repo = "CPU-X";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8jJP0gxH3B6qLrhKNa4P9ZfSjxaXTeBB1+UuadflLQo=";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-8jJP0gxH3B6qLrhKNa4P9ZfSjxaXTeBB1+UuadflLQo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 nasm makeWrapper ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
wrapGAppsHook3
|
||||
nasm
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3 ncurses libcpuid pciutils procps
|
||||
vulkan-headers vulkan-loader glfw
|
||||
opencl-headers ocl-icd
|
||||
libXdmcp pcre util-linux
|
||||
libselinux libsepol
|
||||
libthai libdatrie libxkbcommon libepoxy
|
||||
dbus at-spi2-core
|
||||
gtk3
|
||||
gtkmm3
|
||||
ncurses
|
||||
libcpuid
|
||||
pciutils
|
||||
procps
|
||||
vulkan-headers
|
||||
vulkan-loader
|
||||
glfw
|
||||
opencl-headers
|
||||
ocl-icd
|
||||
libXdmcp
|
||||
pcre
|
||||
util-linux
|
||||
libselinux
|
||||
libsepol
|
||||
libthai
|
||||
libdatrie
|
||||
libxkbcommon
|
||||
libepoxy
|
||||
dbus
|
||||
at-spi2-core
|
||||
libXtst
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/cpu-x \
|
||||
--prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} \
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix PATH : ${lib.makeBinPath [ stdenv.cc ]}
|
||||
--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib
|
||||
)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
passthru = {
|
||||
tests = {
|
||||
version = testers.testVersion { package = finalAttrs.finalPackage; };
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Free software that gathers information on CPU, motherboard and more";
|
||||
mainProgram = "cpu-x";
|
||||
homepage = "https://thetumultuousunicornofdarkness.github.io/CPU-X";
|
||||
license = licenses.gpl3Plus;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ viraptor ];
|
||||
maintainers = with lib.maintainers; [ viraptor ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
70
pkgs/by-name/lg/lgogdownloader/package.nix
Normal file
70
pkgs/by-name/lg/lgogdownloader/package.nix
Normal file
@@ -0,0 +1,70 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
curl,
|
||||
boost,
|
||||
liboauth,
|
||||
jsoncpp,
|
||||
htmlcxx,
|
||||
rhash,
|
||||
tinyxml-2,
|
||||
help2man,
|
||||
html-tidy,
|
||||
libsForQt5,
|
||||
testers,
|
||||
lgogdownloader,
|
||||
|
||||
enableGui ? true,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lgogdownloader";
|
||||
version = "3.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Sude-";
|
||||
repo = "lgogdownloader";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-h2N5pRwwZZ3jAvRrT4Ebk4N5WO9tQjDrp8KRqriwUi4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
help2man
|
||||
html-tidy
|
||||
] ++ lib.optional enableGui libsForQt5.wrapQtAppsHook;
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
boost
|
||||
curl
|
||||
htmlcxx
|
||||
jsoncpp
|
||||
liboauth
|
||||
rhash
|
||||
tinyxml-2
|
||||
]
|
||||
++ lib.optionals enableGui [
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtwebengine
|
||||
];
|
||||
|
||||
cmakeFlags = lib.optional enableGui "-DUSE_QT_GUI=ON";
|
||||
|
||||
passthru.tests = {
|
||||
version = testers.testVersion { package = lgogdownloader; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Unofficial downloader to GOG.com for Linux users. It uses the same API as the official GOGDownloader";
|
||||
mainProgram = "lgogdownloader";
|
||||
homepage = "https://github.com/Sude-/lgogdownloader";
|
||||
license = lib.licenses.wtfpl;
|
||||
maintainers = with lib.maintainers; [ _0x4A6F ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
123
pkgs/by-name/ma/matrix-gtk-theme/package.nix
Normal file
123
pkgs/by-name/ma/matrix-gtk-theme/package.nix
Normal file
@@ -0,0 +1,123 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
gnome,
|
||||
sassc,
|
||||
gnome-themes-extra,
|
||||
gtk-engine-murrine,
|
||||
unstableGitUpdater,
|
||||
colorVariants ? [ ],
|
||||
sizeVariants ? [ ],
|
||||
themeVariants ? [ ],
|
||||
tweakVariants ? [ ],
|
||||
iconVariants ? [ ],
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "matrix-gtk-theme";
|
||||
colorVariantList = [
|
||||
"dark"
|
||||
"light"
|
||||
];
|
||||
sizeVariantList = [
|
||||
"compact"
|
||||
"standard"
|
||||
];
|
||||
themeVariantList = [
|
||||
"default"
|
||||
"green"
|
||||
"grey"
|
||||
"orange"
|
||||
"pink"
|
||||
"purple"
|
||||
"red"
|
||||
"teal"
|
||||
"yellow"
|
||||
"all"
|
||||
];
|
||||
tweakVariantList = [
|
||||
"neo"
|
||||
"trinity"
|
||||
"black"
|
||||
"float"
|
||||
"outline"
|
||||
"macos"
|
||||
];
|
||||
iconVariantList = [
|
||||
"Dark"
|
||||
"Light"
|
||||
"Sweet"
|
||||
];
|
||||
in
|
||||
lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib.checkListOfEnum
|
||||
"${pname}: sizeVariants"
|
||||
sizeVariantList
|
||||
sizeVariants
|
||||
lib.checkListOfEnum
|
||||
"${pname}: themeVariants"
|
||||
themeVariantList
|
||||
themeVariants
|
||||
lib.checkListOfEnum
|
||||
"${pname}: tweakVariants"
|
||||
tweakVariantList
|
||||
tweakVariants
|
||||
lib.checkListOfEnum
|
||||
"${pname}: iconVariants"
|
||||
iconVariantList
|
||||
iconVariants
|
||||
|
||||
stdenvNoCC.mkDerivation
|
||||
{
|
||||
inherit pname;
|
||||
version = "0-unstable-2024-07-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "D3vil0p3r";
|
||||
repo = "Matrix-GTK-Theme";
|
||||
rev = "f453093dffa0f46596b325c6a760afd6ea6cd810";
|
||||
hash = "sha256-DfM4nsJZvcNyUUn0opu3OM46sxhsjeeyuUuliQPrU0I=";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gnome.gnome-shell
|
||||
sassc
|
||||
];
|
||||
buildInputs = [ gnome-themes-extra ];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs themes/install.sh
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/themes
|
||||
cd themes
|
||||
./install.sh -n Matrix \
|
||||
${lib.optionalString (colorVariants != [ ]) "-c " + toString colorVariants} \
|
||||
${lib.optionalString (sizeVariants != [ ]) "-s " + toString sizeVariants} \
|
||||
${lib.optionalString (themeVariants != [ ]) "-t " + toString themeVariants} \
|
||||
${lib.optionalString (tweakVariants != [ ]) "--tweaks " + toString tweakVariants} \
|
||||
-d "$out/share/themes"
|
||||
cd ../icons
|
||||
${lib.optionalString (iconVariants != [ ]) ''
|
||||
mkdir -p $out/share/icons
|
||||
cp -a ${toString (map (v: "Matrix-${v}") iconVariants)} $out/share/icons/
|
||||
''}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "GTK theme based on the Matrix colour palette";
|
||||
homepage = "https://github.com/D3vil0p3r/Matrix-GTK-Theme";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ d3vil0p3r ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "rcu";
|
||||
version = "2024.001p";
|
||||
version = "2024.001q";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = let
|
||||
src-tarball = requireFile {
|
||||
name = "rcu-d${version}-source.tar.gz";
|
||||
sha256 = "15559537bjrviq5n87yz4q6n3y3l3bwip8rxg34zf0w9zmr4zmqn";
|
||||
hash = "sha256-Ywk28gJBMSSQL6jEcHE8h253KOsXIGwVOag6PBWs8kg=";
|
||||
url = "http://www.davisr.me/projects/rcu/";
|
||||
};
|
||||
in runCommand "${src-tarball.name}-unpacked" {} ''
|
||||
@@ -149,5 +149,6 @@ python3Packages.buildPythonApplication rec {
|
||||
homepage = "http://www.davisr.me/projects/rcu/";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ OPNA2608 ];
|
||||
hydraPlatforms = [ ]; # requireFile used as src
|
||||
};
|
||||
}
|
||||
|
||||
1966
pkgs/by-name/sm/smtp4dev/deps.nix
generated
Normal file
1966
pkgs/by-name/sm/smtp4dev/deps.nix
generated
Normal file
File diff suppressed because it is too large
Load Diff
58
pkgs/by-name/sm/smtp4dev/package.nix
Normal file
58
pkgs/by-name/sm/smtp4dev/package.nix
Normal file
@@ -0,0 +1,58 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildDotnetModule,
|
||||
fetchFromGitHub,
|
||||
nodejs,
|
||||
npmHooks,
|
||||
fetchNpmDeps,
|
||||
dotnetCorePackages,
|
||||
}:
|
||||
let
|
||||
version = "3.3.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rnwood";
|
||||
repo = "smtp4dev";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ARq5OpFJ4o9KdBXvzOx7QLB8GNfmXWjO0RR4jKP8qRI=";
|
||||
};
|
||||
npmRoot = "Rnwood.Smtp4dev/ClientApp";
|
||||
in
|
||||
buildDotnetModule {
|
||||
inherit version src npmRoot;
|
||||
pname = "smtp4dev";
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
nodejs.python
|
||||
npmHooks.npmConfigHook
|
||||
stdenv.cc # c compiler is needed for compiling npm-deps
|
||||
];
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
src = "${src}/${npmRoot}";
|
||||
hash = "sha256-VBcfRKYe/uPf6urWuLI5TrnX9bgiKiZKo+N4zL7O3SM=";
|
||||
};
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_8_0;
|
||||
dotnet-runtime = dotnetCorePackages.aspnetcore_8_0;
|
||||
projectFile = "Rnwood.Smtp4dev/Rnwood.Smtp4dev.csproj";
|
||||
nugetDeps = ./deps.nix;
|
||||
executables = [ "Rnwood.Smtp4dev" ];
|
||||
|
||||
postFixup = ''
|
||||
mv $out/bin/Rnwood.Smtp4dev $out/bin/smtp4dev
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Fake smtp email server for development and testing";
|
||||
homepage = "https://github.com/rnwood/smtp4dev";
|
||||
license = lib.licenses.bsd3;
|
||||
mainProgram = "smtp4dev";
|
||||
maintainers = with lib.maintainers; [
|
||||
rucadi
|
||||
jchw
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
@@ -678,9 +678,15 @@ in
|
||||
doCheck = true;
|
||||
nativeCheckInputs = [ final.plenary-nvim neovim-unwrapped ];
|
||||
|
||||
# the plugin loads the library from either the LIBSQLITE env
|
||||
# or the vim.g.sqlite_clib_path variable.
|
||||
postPatch = ''
|
||||
substituteInPlace lua/sqlite/defs.lua \
|
||||
--replace-fail "path = vim.g.sqlite_clib_path" 'path = vim.g.sqlite_clib_path or "${sqlite.out}/lib/libsqlite3${stdenv.hostPlatform.extensions.sharedLibrary}"'
|
||||
'';
|
||||
|
||||
# we override 'luarocks test' because otherwise neovim doesn't find/load the plenary plugin
|
||||
checkPhase = ''
|
||||
export LIBSQLITE="${sqlite.out}/lib/libsqlite3${stdenv.hostPlatform.extensions.sharedLibrary}"
|
||||
export HOME="$TMPDIR";
|
||||
|
||||
nvim --headless -i NONE \
|
||||
@@ -722,8 +728,6 @@ in
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "TOML_PLUS_PLUS_SRC" "${tomlplusplus.src}/include/toml++" \
|
||||
--replace-fail "MAGIC_ENUM_SRC" "${magic-enum.src}/include/magic_enum"
|
||||
|
||||
cat CMakeLists.txt
|
||||
'';
|
||||
});
|
||||
|
||||
|
||||
33
pkgs/development/python-modules/pycycling/default.nix
Normal file
33
pkgs/development/python-modules/pycycling/default.nix
Normal file
@@ -0,0 +1,33 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
bleak,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pycycling";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-yi3ZcyhhOtHp46MK0R15/dic+b1oYjy4tFVRH3ssbE8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bleak
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ pname ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Package for interacting with Bluetooth Low Energy (BLE) compatible bike trainers, power meters, radars and heart rate monitors";
|
||||
homepage = "https://github.com/zacharyedwardbull/pycycling";
|
||||
changelog = "https://github.com/zacharyedwardbull/pycycling/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ viraptor ];
|
||||
};
|
||||
}
|
||||
@@ -1,67 +0,0 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, curl
|
||||
, boost
|
||||
, liboauth
|
||||
, jsoncpp
|
||||
, htmlcxx
|
||||
, rhash
|
||||
, tinyxml-2
|
||||
, help2man
|
||||
, wrapQtAppsHook
|
||||
, qtbase
|
||||
, qtwebengine
|
||||
, testers
|
||||
, lgogdownloader
|
||||
|
||||
, enableGui ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lgogdownloader";
|
||||
version = "3.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Sude-";
|
||||
repo = "lgogdownloader";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-IjZizO0HWDqtviY3TZ3AYYm5A0sU74YXjfFEtvQvv04=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
help2man
|
||||
] ++ lib.optional enableGui wrapQtAppsHook;
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
curl
|
||||
htmlcxx
|
||||
jsoncpp
|
||||
liboauth
|
||||
rhash
|
||||
tinyxml-2
|
||||
] ++ lib.optionals enableGui [
|
||||
qtbase
|
||||
qtwebengine
|
||||
];
|
||||
|
||||
cmakeFlags = lib.optional enableGui "-DUSE_QT_GUI=ON";
|
||||
|
||||
passthru.tests = {
|
||||
version = testers.testVersion { package = lgogdownloader; };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Unofficial downloader to GOG.com for Linux users. It uses the same API as the official GOGDownloader";
|
||||
mainProgram = "lgogdownloader";
|
||||
homepage = "https://github.com/Sude-/lgogdownloader";
|
||||
license = licenses.wtfpl;
|
||||
maintainers = with maintainers; [ _0x4A6F ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -48,6 +48,11 @@ stdenv.mkDerivation rec {
|
||||
url = "https://github.com/OpenPrinting/cups-filters/commit/93e60d3df358c0ae6f3dba79e1c9684657683d89.patch";
|
||||
hash = "sha256-KgWTYFr2uShL040azzE+KaNyBPy7Gs/hCnEgQmmPCys=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2024-47076.patch";
|
||||
url = "https://github.com/OpenPrinting/libcupsfilters/commit/95576ec3d20c109332d14672a807353cdc551018.patch";
|
||||
hash = "sha256-MXWllrdWt8n7zqvumQNg34dBgWMwMTwf9lrD+ZZP8Wk=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
|
||||
@@ -36835,8 +36835,6 @@ with pkgs;
|
||||
|
||||
left4gore-bin = callPackage ../games/left4gore { };
|
||||
|
||||
lgogdownloader = libsForQt5.callPackage ../games/lgogdownloader { };
|
||||
|
||||
liberal-crime-squad = callPackage ../games/liberal-crime-squad { };
|
||||
|
||||
liberation-circuit = callPackage ../games/liberation-circuit { };
|
||||
|
||||
@@ -9954,6 +9954,8 @@ self: super: with self; {
|
||||
|
||||
pycrdt-websocket = callPackage ../development/python-modules/pycrdt-websocket { };
|
||||
|
||||
pycycling = callPackage ../development/python-modules/pycycling { };
|
||||
|
||||
pyfibaro = callPackage ../development/python-modules/pyfibaro { };
|
||||
|
||||
pyfireservicerota = callPackage ../development/python-modules/pyfireservicerota { };
|
||||
|
||||
Reference in New Issue
Block a user