Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2025-07-13 18:05:05 +00:00
committed by GitHub
161 changed files with 1203 additions and 606 deletions
-6
View File
@@ -19395,12 +19395,6 @@
name = "Michael Bergmeister";
githubId = 53442728;
};
paveloom = {
email = "contact@paveloom.dev";
github = "paveloom";
githubId = 49961859;
name = "Pavel Sobolev";
};
pawelchcki = {
email = "pawel.chcki@gmail.com";
github = "pawelchcki";
@@ -56,6 +56,8 @@
- [Sharkey](https://joinsharkey.org), a Sharkish microblogging platform. Available as [services.sharkey](#opt-services.sharkey.enable).
- [fw-fanctrl](https://github.com/TamtamHero/fw-fanctrl), a simple systemd service to better control Framework Laptop's fan(s). Available as [hardware.fw-fanctrl](#opt-hardware.fw-fanctrl.enable).
- [mautrix-discord](https://github.com/mautrix/discord), a Matrix-Discord puppeting/relay bridge. Available as [services.mautrix-discord](#opt-services.mautrix-discord.enable).
- [SuiteNumérique Meet](https://github.com/suitenumerique/meet) is an open source alternative to Google Meet and Zoom powered by LiveKit: HD video calls, screen sharing, and chat features. Built with Django and React. Available as [services.lasuite-meet](#opt-services.lasuite-meet.enable).
+129
View File
@@ -0,0 +1,129 @@
{
config,
lib,
pkgs,
...
}:
let
cfg = config.hardware.fw-fanctrl;
configFormat = pkgs.formats.json { };
configOption = configFormat.generate "config.json" cfg.config;
configFile = pkgs.runCommand "configFile" { } ''
${lib.getExe pkgs.jq} -s '.[0] * .[1]' ${pkgs.fw-fanctrl}/share/fw-fanctrl/config.json ${configOption} > $out
'';
in
{
options.hardware.fw-fanctrl = {
enable = lib.mkEnableOption "the fw-fanctrl systemd service and install the needed packages";
disableBatteryTempCheck = lib.mkOption {
type = lib.types.bool;
default = false;
description = ''
Disable checking battery temperature sensor
'';
};
config = lib.mkOption {
default = { };
description = ''
Additional config entries for the fw-fanctrl service (documentation: https://github.com/TamtamHero/fw-fanctrl/blob/main/doc/configuration.md)
'';
type = lib.types.submodule {
freeformType = configFormat.type;
options = {
defaultStrategy = lib.mkOption {
type = lib.types.str;
default = "lazy";
description = "Default strategy to use";
};
strategyOnDischarging = lib.mkOption {
type = lib.types.str;
default = "";
description = "Default strategy on discharging";
};
strategies = lib.mkOption {
default = null;
description = ''
Additional strategies which can be used by fw-fanctrl
'';
type = lib.types.nullOr (
lib.types.attrsOf (
lib.types.submodule {
options = {
fanSpeedUpdateFrequency = lib.mkOption {
type = lib.types.ints.unsigned;
default = 5;
description = "How often the fan speed should be updated in seconds";
};
movingAverageInterval = lib.mkOption {
type = lib.types.ints.unsigned;
default = 25;
description = "Interval (seconds) of the last temperatures to use to calculate the average temperature";
};
speedCurve = lib.mkOption {
default = [ ];
description = "How should the speed curve look like";
type = lib.types.listOf (
lib.types.submodule {
options = {
temp = lib.mkOption {
type = lib.types.int;
default = 0;
description = "Temperature in °C at which the fan speed should be changed";
};
speed = lib.mkOption {
type = lib.types.ints.between 0 100;
default = 0;
description = "Percent how fast the fan should run at";
};
};
}
);
};
};
}
)
);
};
};
};
};
};
config = lib.mkIf cfg.enable {
environment.systemPackages = with pkgs; [
fw-fanctrl
fw-ectool
];
systemd.services.fw-fanctrl = {
description = "Framework Fan Controller";
after = [ "multi-user.target" ];
serviceConfig = {
Type = "simple";
Restart = "always";
ExecStart = "${lib.getExe pkgs.fw-fanctrl} --output-format JSON run --config ${configFile} --silent ${lib.optionalString cfg.disableBatteryTempCheck "--no-battery-sensors"}";
ExecStopPost = "${lib.getExe pkgs.fw-ectool} autofanctrl";
};
wantedBy = [ "multi-user.target" ];
};
# Create suspend config
environment.etc."systemd/system-sleep/fw-fanctrl-suspend.sh".source =
"${pkgs.fw-fanctrl}/share/fw-fanctrl/fw-fanctrl-suspend";
};
meta = {
maintainers = pkgs.fw-fanctrl.meta.maintainers;
};
}
+1
View File
@@ -67,6 +67,7 @@
./hardware/digitalbitbox.nix
./hardware/flipperzero.nix
./hardware/flirc.nix
./hardware/fw-fanctrl.nix
./hardware/glasgow.nix
./hardware/gpgsmartcards.nix
./hardware/graphics.nix
+14 -1
View File
@@ -112,6 +112,12 @@ in
'';
};
extraSettings = lib.mkOption {
type = lib.types.lines;
default = "";
description = "Extra lines to append to the generated Klipper configuration.";
};
firmwares = lib.mkOption {
description = "Firmwares klipper should manage";
default = { };
@@ -166,6 +172,10 @@ in
assertion = (cfg.configFile != null) != (cfg.settings != null);
message = "You need to either specify services.klipper.settings or services.klipper.configFile.";
}
{
assertion = (cfg.configFile != null) -> (cfg.extraSettings == "");
message = "You can't use services.klipper.extraSettings with services.klipper.configFile.";
}
];
services.klipper = lib.mkIf cfg.octoprintIntegration {
@@ -180,7 +190,10 @@ in
+ lib.optionalString (cfg.apiSocket != null) " --api-server=${cfg.apiSocket}"
+ lib.optionalString (cfg.logFile != null) " --logfile=${cfg.logFile}";
printerConfig =
if cfg.settings != null then format.generate "klipper.cfg" cfg.settings else cfg.configFile;
if cfg.settings != null then
builtins.toFile "klipper.cfg" ((format.generate "" cfg.settings).text + cfg.extraSettings)
else
cfg.configFile;
in
{
description = "Klipper 3D Printer Firmware";
+1 -1
View File
@@ -1528,7 +1528,7 @@ in
virtualbox = handleTestOn [ "x86_64-linux" ] ./virtualbox.nix { };
vm-variant = handleTest ./vm-variant.nix { };
vscode-remote-ssh = handleTestOn [ "x86_64-linux" ] ./vscode-remote-ssh.nix { };
vscodium = discoverTests (import ./vscodium.nix);
vscodium = import ./vscodium.nix { inherit runTest; };
vsftpd = runTest ./vsftpd.nix;
waagent = runTest ./waagent.nix;
wakapi = runTest ./wakapi.nix;
+1 -1
View File
@@ -1,7 +1,7 @@
{ lib, ... }:
{
name = "flaresolverr";
meta.maintainers = with lib.maintainers; [ paveloom ];
meta.maintainers = with lib.maintainers; [ ];
nodes.machine =
{ pkgs, ... }:
+14 -17
View File
@@ -1,12 +1,13 @@
{ runTest }:
let
tests = {
wayland =
{ pkgs, ... }:
{ lib, pkgs, ... }:
{
imports = [ ./common/wayland-cage.nix ];
# We scale vscodium to help OCR find the small "Untitled" text.
services.cage.program = "${pkgs.vscodium}/bin/codium --force-device-scale-factor=2";
services.cage.program = "${lib.getExe pkgs.vscodium} --force-device-scale-factor=2";
environment.variables.NIXOS_OZONE_WL = "1";
environment.variables.DISPLAY = "do not use";
@@ -14,7 +15,7 @@ let
fonts.packages = with pkgs; [ dejavu_fonts ];
};
xorg =
{ pkgs, ... }:
{ lib, pkgs, ... }:
{
imports = [
./common/user-account.nix
@@ -24,7 +25,7 @@ let
virtualisation.memorySize = 2047;
services.xserver.enable = true;
services.xserver.displayManager.sessionCommands = ''
${pkgs.vscodium}/bin/codium --force-device-scale-factor=2
${lib.getExe pkgs.vscodium} --force-device-scale-factor=2
'';
test-support.displayManager.auto.user = "alice";
};
@@ -32,21 +33,18 @@ let
mkTest =
name: machine:
import ./make-test-python.nix (
{ pkgs, ... }:
runTest (
{ lib, ... }:
{
inherit name;
nodes = {
"${name}" = machine;
};
nodes."${name}" = machine;
meta.maintainers = with lib.maintainers; [
synthetica
turion
];
meta = with pkgs.lib.maintainers; {
maintainers = [
synthetica
turion
];
};
enableOCR = true;
testScript = ''
@@ -91,6 +89,5 @@ let
'';
}
);
in
builtins.mapAttrs (k: v: mkTest k v) tests
builtins.mapAttrs mkTest tests
+1 -1
View File
@@ -1,7 +1,7 @@
{ lib, ... }:
{
name = "whisparr";
meta.maintainers = [ lib.maintainers.paveloom ];
meta.maintainers = [ ];
nodes.machine =
{ pkgs, ... }:
@@ -11,13 +11,13 @@
}:
mkLibretroCore {
core = "pcsx2";
version = "0-unstable-2025-07-03";
version = "0-unstable-2025-07-11";
src = fetchFromGitHub {
owner = "libretro";
repo = "ps2";
rev = "f8c9740897cbba47ee5ecda9f1c34d73daf81379";
hash = "sha256-2/CYjilppD/7o3G4kNMUTbEP91DQYct0ojHwShNy8cw=";
rev = "553770c8d886acb12ff43d06b83215f46be89acc";
hash = "sha256-C2uASKAol7PB3TEdLPCHlcUdRcaYlFwngnviY3rBklE=";
fetchSubmodules = true;
};
+1 -1
View File
@@ -65,7 +65,7 @@ stdenv.mkDerivation (
# PHP extensions correctly.
# See the corresponding PR: https://github.com/Mic92/nix-update/pull/123
isPhpExtension = true;
updateScript = nix-update-script { };
updateScript = passthru.updateScript or (nix-update-script { });
};
}
)
+2 -2
View File
@@ -14,7 +14,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "1oom";
version = "1.11.6";
version = "1.11.7";
outputs = [
"out"
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "1oom-fork";
repo = "1oom";
tag = "v${finalAttrs.version}";
hash = "sha256-w67BjS5CrQviMXOeKNWGR1SzDeJHZrIpY7FDGt86CPA=";
hash = "sha256-pOEs3HQSxER0wUhasxQUyrktka8cRZCtNER0F01BRvk=";
};
nativeBuildInputs = [
+2 -1
View File
@@ -53,7 +53,8 @@
useStaticLibuvc ? true,
useStaticOpenAL ? true,
useStaticSqlite ? true,
useTracy ? true,
# For debugging only, disabled by upstream
useTracy ? false,
# Configurable options
sources ? callPackage ./sources.nix { },
}:
@@ -7,35 +7,6 @@
pkgsBuildBuild,
}:
let
# Argo can package a static server in the CLI using the `staticfiles` go module.
# We build the CLI without the static server for simplicity, but the tool is still required for
# compilation to succeed.
# See: https://github.com/argoproj/argo/blob/d7690e32faf2ac5842468831daf1443283703c25/Makefile#L117
staticfiles = pkgsBuildBuild.buildGoModule {
name = "staticfiles";
src = fetchFromGitHub {
owner = "bouk";
repo = "staticfiles";
rev = "827d7f6389cd410d0aa3f3d472a4838557bf53dd";
hash = "sha256-wchj5KjhTmhc4XVW0sRFCcyx5W9am8TNAIhej3WFWXU=";
};
vendorHash = null;
excludedPackages = [ "./example" ];
preBuild = ''
cp ${./staticfiles.go.mod} go.mod
'';
ldflags = [
"-s"
"-w"
];
};
in
buildGoModule rec {
pname = "argo-workflows";
version = "3.6.10";
@@ -59,13 +30,6 @@ buildGoModule rec {
installShellFiles
];
preBuild = ''
mkdir -p ui/dist/app
echo "Built without static files" > ui/dist/app/index.html
${staticfiles}/bin/staticfiles -o server/static/files.go ui/dist/app
'';
ldflags = [
"-s"
"-w"
+1 -4
View File
@@ -117,10 +117,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
homepage = "http://cppcheck.sourceforge.net";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [
joachifm
paveloom
];
maintainers = with lib.maintainers; [ joachifm ];
platforms = lib.platforms.unix;
};
})
+8 -8
View File
@@ -5,15 +5,15 @@
installShellFiles,
}:
buildGoModule rec {
buildGoModule (finalAttrs: {
pname = "duf";
version = "0.8.1";
src = fetchFromGitHub {
owner = "muesli";
repo = "duf";
rev = "v${version}";
sha256 = "sha256-bVuqX88KY+ky+fd1FU9GWP78jQc4fRDk9yRSeIesHyI=";
tag = "v${finalAttrs.version}";
hash = "sha256-bVuqX88KY+ky+fd1FU9GWP78jQc4fRDk9yRSeIesHyI=";
};
vendorHash = "sha256-oihi7E67VQmym9U1gdD802AYxWRrSowhzBiKg0CBDPc=";
@@ -21,7 +21,7 @@ buildGoModule rec {
ldflags = [
"-s"
"-w"
"-X=main.Version=${version}"
"-X=main.Version=${finalAttrs.version}"
];
nativeBuildInputs = [ installShellFiles ];
@@ -30,15 +30,15 @@ buildGoModule rec {
installManPage duf.1
'';
meta = with lib; {
meta = {
homepage = "https://github.com/muesli/duf/";
description = "Disk Usage/Free Utility";
license = licenses.mit;
maintainers = with maintainers; [
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
figsoda
penguwin
sigmasquadron
];
mainProgram = "duf";
};
}
})
+1 -1
View File
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
changelog = "https://github.com/glehmann/earthlyls/releases/tag/${version}";
license = lib.licenses.mit;
mainProgram = "earthlyls";
maintainers = with lib.maintainers; [ paveloom ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux ++ lib.platforms.darwin;
};
}
+1 -1
View File
@@ -138,7 +138,7 @@ buildDotnetModule rec {
homepage = "https://eddie.website";
license = lib.licenses.gpl3Plus;
mainProgram = "eddie-ui";
maintainers = with lib.maintainers; [ paveloom ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
};
}
+6 -3
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
unstableGitUpdater,
fetchurl,
pkg-config,
cmake,
@@ -29,15 +30,17 @@ let
in
stdenv.mkDerivation rec {
pname = "fido2-manage";
version = "0-unstable-2024-11-22";
version = "0-unstable-2025-06-06";
src = fetchFromGitHub {
owner = "token2";
repo = "fido2-manage";
rev = "2c14b222a432e34750bb3929c620bbdffd1c75be";
hash = "sha256-xdElYXx+F2XCP5zsbRTmTRyHKGnEt97jNRrQM0Oab5E=";
rev = "4fc6a4e0d905dcc2a7bfee70232a0398e9e4b45d";
hash = "sha256-olkEUHJ350FIMUlWG37wqSfO2wyYni4CYspwa4lAO5w=";
};
passthru.updateScript = unstableGitUpdater { };
icon = fetchurl {
url = "https://token2.net/img/icon/logo-white.png";
hash = "sha256-UpxRzn24v1vigMFlofVU+YOzKrkxCu2Pk5iktqFgNO8=";
+1 -1
View File
@@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
changelog = "https://github.com/FlareSolverr/FlareSolverr/blob/${finalAttrs.src.rev}/CHANGELOG.md";
license = licenses.mit;
mainProgram = "flaresolverr";
maintainers = with maintainers; [ paveloom ];
maintainers = with maintainers; [ ];
inherit (undetected-chromedriver.meta) platforms;
};
})
+1 -1
View File
@@ -48,7 +48,7 @@ stdenvNoCC.mkDerivation rec {
license = licenses.unfree;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
mainProgram = "fopnu";
maintainers = with maintainers; [ paveloom ];
maintainers = with maintainers; [ ];
platforms = [ "x86_64-linux" ];
};
}
+43
View File
@@ -0,0 +1,43 @@
{
lib,
python3Packages,
fw-ectool,
fetchFromGitHub,
}:
python3Packages.buildPythonPackage rec {
pname = "fw-fanctrl";
version = "1.0.3";
pyproject = true;
src = fetchFromGitHub {
owner = "TamtamHero";
repo = "fw-fanctrl";
tag = "v${version}";
hash = "sha256-TDVULNb/oH66/UX20mC89NSx8YPe8mPwNCB9+phavP4=";
};
build-system = [ python3Packages.setuptools ];
dependencies = [ python3Packages.jsonschema ];
makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ fw-ectool ]}" ];
postInstall = ''
mkdir -p $out/share/fw-fanctrl
install -m 644 $src/src/fw_fanctrl/_resources/config.json $out/share/fw-fanctrl/config.json
install -m 755 $src/services/system-sleep/fw-fanctrl-suspend $out/share/fw-fanctrl/fw-fanctrl-suspend
patchShebangs --build $out/share/fw-fanctrl/fw-fanctrl-suspend
substituteInPlace $out/share/fw-fanctrl/fw-fanctrl-suspend \
--replace-fail '"%PYTHON_SCRIPT_INSTALLATION_PATH%"' $out/bin/fw-fanctrl
'';
meta = {
mainProgram = "fw-fanctrl";
homepage = "https://github.com/TamtamHero/fw-fanctrl";
description = "Simple systemd service to better control Framework Laptop's fan(s)";
platforms = lib.platforms.linux;
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.Svenum ];
};
}
+2 -2
View File
@@ -7,13 +7,13 @@
buildDotnetModule rec {
pname = "gh-gei";
version = "1.15.1";
version = "1.16.0";
src = fetchFromGitHub {
owner = "github";
repo = "gh-gei";
rev = "v${version}";
hash = "sha256-Iuhz/kaamgMWNxilNvCRnjdTFrhSPhHpFKYllQ8OuGU=";
hash = "sha256-gqDnNIoSsCCN1BwkdfoeTMdAe5PoTNnRJE0g9XFtQak=";
};
dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx;
-13
View File
@@ -1,13 +0,0 @@
diff --git a/src/go.mod b/src/go.mod
index 3242342..795c306 100644
--- a/src/go.mod
+++ b/src/go.mod
@@ -28,7 +28,7 @@ require (
github.com/juju/go4 v0.0.0-20160222163258-40d72ab9641a // indirect
github.com/juju/persistent-cookiejar v0.0.0-20171026135701-d5e5a8405ef9 // indirect
github.com/juju/webbrowser v1.0.0 // indirect
- github.com/lxc/lxd v0.0.0-20200706202337-814c96fcec74
+ github.com/lxc/lxd v0.0.0-20200727014606-0d408e8e8ebb
github.com/mattn/go-colorable v0.1.7 // indirect
github.com/miekg/dns v1.1.30
github.com/mitchellh/go-testing-interface v1.14.0 // indirect
+22 -14
View File
@@ -6,39 +6,47 @@
enableStatic ? stdenv.hostPlatform.isStatic,
}:
buildGoModule rec {
buildGoModule (finalAttrs: {
pname = "gobetween";
version = "0.8.0";
version = "0.8.1";
src = fetchFromGitHub {
owner = "yyyar";
repo = "gobetween";
rev = version;
sha256 = "0bxf89l53sqan9qq23rwawjkcanv9p61sw56zjqhyx78f0bh0zbc";
tag = finalAttrs.version;
hash = "sha256-xmyqDi2q7J909cWMec9z2u0DJVJjzv86vjYkSfw/3o8=";
};
patches = [
./gomod.patch
];
vendorHash = "sha256-3jv0dSsJg90J64Ay7USkUOi8cF1Sj+A7v/snJEdJPFU=";
env = {
CGO_ENABLED = 0;
};
buildPhase = ''
runHook preBuild
make -e build${lib.optionalString enableStatic "-static"}
runHook postBuild
'';
vendorHash = null;
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp bin/gobetween $out/bin
cp -r share $out/share
cp -r config $out/share
runHook postInstall
'';
meta = with lib; {
meta = {
description = "Modern & minimalistic load balancer for the Сloud era";
homepage = "https://gobetween.io";
license = licenses.mit;
maintainers = with maintainers; [ tomberek ];
broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ tomberek ];
mainProgram = "gobetween";
};
}
})
-1
View File
@@ -47,7 +47,6 @@ buildGoModule (finalAttrs: {
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
xiaoxiangmoe
aaronjheng
];
mainProgram = "gojq";
};
+1 -1
View File
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
description = "GR framework is a graphics library for visualisation applications";
homepage = "https://gr-framework.org";
license = licenses.mit;
maintainers = with maintainers; [ paveloom ];
maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}
@@ -9,13 +9,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "hyprwayland-scanner";
version = "0.4.4";
version = "0.4.5";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "hyprwayland-scanner";
rev = "v${finalAttrs.version}";
hash = "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=";
hash = "sha256-FnhBENxihITZldThvbO7883PdXC/2dzW4eiNvtoV5Ao=";
};
nativeBuildInputs = [
@@ -35,6 +35,6 @@ buildGoModule rec {
homepage = "https://git.gay/besties/ios-safari-remote-debug";
license = lib.licenses.agpl3Plus;
mainProgram = "ios-safari-remote-debug";
maintainers = with lib.maintainers; [ paveloom ];
maintainers = with lib.maintainers; [ ];
};
}
@@ -74,9 +74,6 @@ stdenv.mkDerivation (finalAttrs: {
changelog = "https://github.com/google/ios-webkit-debug-proxy/releases/tag/${finalAttrs.src.rev}";
license = licenses.bsd3;
mainProgram = "ios_webkit_debug_proxy";
maintainers = with maintainers; [
abustany
paveloom
];
maintainers = with maintainers; [ abustany ];
};
})
-1
View File
@@ -45,7 +45,6 @@ buildGoModule rec {
Br1ght0ne
equirosa
khaneliman
paveloom
starsep
sigmasquadron
];
@@ -1,10 +1,10 @@
{
"stable": {
"version": "5.18.1",
"hash": "sha256-B4klaET6YT955p606aSky5tePGhpinRCqc3gMB+uaZY="
"version": "5.18.3",
"hash": "sha256-we4mWtMemszIpTehk74hbqjisX1vTk94tLdGGNiz4c8="
},
"beta": {
"version": "5.18.1",
"hash": "sha256-B4klaET6YT955p606aSky5tePGhpinRCqc3gMB+uaZY="
"version": "5.18.3",
"hash": "sha256-we4mWtMemszIpTehk74hbqjisX1vTk94tLdGGNiz4c8="
}
}
+6
View File
@@ -31,6 +31,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
versionCheckProgramArg = "--version";
cargoBuildFlags = [
# don't install the `mgf_dev`
"--bin"
"mergiraf"
];
passthru.updateScript = nix-update-script { };
meta = {
+1 -1
View File
@@ -165,7 +165,7 @@ stdenv'.mkDerivation (finalAttrs: {
changelog = "https://github.com/JCWasmx86/mesonlsp/releases/tag/v${finalAttrs.version}";
license = licenses.gpl3Plus;
mainProgram = "mesonlsp";
maintainers = with maintainers; [ paveloom ];
maintainers = with maintainers; [ ];
platforms = platforms.unix;
# ../src/liblog/log.cpp:41:7: error: call to 'format' is ambiguous
broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;
+9 -18
View File
@@ -3,7 +3,6 @@
lib,
nixosTests,
fetchFromGitHub,
fetchpatch,
nodejs,
pnpm_9,
makeWrapper,
@@ -13,42 +12,32 @@
ffmpeg-headless,
writeShellScript,
xcbuild,
...
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "misskey";
version = "2024.11.0";
version = "2025.6.3";
src = fetchFromGitHub {
owner = "misskey-dev";
repo = "misskey";
rev = finalAttrs.version;
hash = "sha256-uei5Ojx39kCbS8DCjHZ5PoEAsqJ5vC6SsFqIEIJ16n8=";
tag = finalAttrs.version;
hash = "sha256-6UZcIZlfcYcQgjR/jrNhsoLNQGml2tjK3LYLI0fdgMU=";
fetchSubmodules = true;
};
patches = [
(fetchpatch {
# https://github.com/misskey-dev/misskey/security/advisories/GHSA-w98m-j6hq-cwjm
name = "CVE-2025-24896.patch";
url = "https://github.com/misskey-dev/misskey/commit/ba9f295ef2bf31cc90fa587e20b9a7655b7a1824.patch";
hash = "sha256-jNl2AdLaG3v8QB5g/UPTupdyP1yGR0WcWull7EA7ogs=";
})
];
nativeBuildInputs = [
nodejs
pnpm_9.configHook
makeWrapper
python3
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcrun ];
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
# https://nixos.org/manual/nixpkgs/unstable/#javascript-pnpm
pnpmDeps = pnpm_9.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-YWZhm5eKjB6JGP45WC3UrIkr7vuBUI4Q3oiK8Lst3dI=";
hash = "sha256-T8LwpEjeWNmkIo3Dn1BCFHBsTzA/Dt6/pk/NMtvT0N4=";
};
buildPhase = ''
@@ -123,13 +112,15 @@ stdenv.mkDerivation (finalAttrs: {
passthru = {
inherit (finalAttrs) pnpmDeps;
tests.misskey = nixosTests.misskey;
updateScript = nix-update-script { };
};
meta = {
description = "🌎 An interplanetary microblogging platform 🚀";
description = "Open source, federated social media platform";
homepage = "https://misskey-hub.net/";
license = lib.licenses.agpl3Only;
maintainers = [ lib.maintainers.feathecutie ];
teams = [ lib.teams.ngi ];
platforms = lib.platforms.unix;
mainProgram = "misskey";
};
+1 -4
View File
@@ -130,9 +130,6 @@ stdenv.mkDerivation (finalAttrs: {
platforms = lib.platforms.unix;
broken = stdenv.hostPlatform.isDarwin;
mainProgram = "mold";
maintainers = with lib.maintainers; [
azahi
paveloom
];
maintainers = with lib.maintainers; [ azahi ];
};
})
@@ -8,13 +8,13 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "morewaita-icon-theme";
version = "48.3";
version = "48.3.1";
src = fetchFromGitHub {
owner = "somepaulo";
repo = "MoreWaita";
tag = "v${finalAttrs.version}";
hash = "sha256-ywZSRNXVxjs5l5UO4yvNZ7q7PRlaLNi/2+HSNhe8e5w=";
hash = "sha256-Gi73Cn/FwI055Inodo8huHeaWGTy9IR3qPMbjAHBsPw=";
};
postPatch = ''
@@ -3,30 +3,27 @@
stdenv,
fetchFromGitHub,
pkg-config,
qmake,
qttools,
qtbase,
qt6Packages,
mpv,
wrapQtAppsHook,
gitUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "mpc-qt";
version = "24.12.1-flatpak";
src = fetchFromGitHub {
owner = "mpc-qt";
repo = "mpc-qt";
rev = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-gn94kVs3Lbd+ggj4jTacHpmnVO2lH/QDhFk+hJC1N/c=";
};
nativeBuildInputs = [
pkg-config
qmake
qttools
wrapQtAppsHook
qt6Packages.qmake
qt6Packages.qttools
qt6Packages.wrapQtAppsHook
];
buildInputs = [
@@ -34,26 +31,26 @@ stdenv.mkDerivation rec {
];
postPatch = ''
substituteInPlace lconvert.pri --replace "qtPrepareTool(LCONVERT, lconvert)" "qtPrepareTool(LCONVERT, lconvert, , , ${qttools}/bin)"
substituteInPlace lconvert.pri --replace "qtPrepareTool(LCONVERT, lconvert)" "qtPrepareTool(LCONVERT, lconvert, , , ${qt6Packages.qttools}/bin)"
'';
postConfigure = ''
substituteInPlace Makefile --replace ${qtbase}/bin/lrelease ${qttools.dev}/bin/lrelease
substituteInPlace Makefile --replace ${qt6Packages.qtbase}/bin/lrelease ${qt6Packages.qttools.dev}/bin/lrelease
'';
qmakeFlags = [
"MPCQT_VERSION=${version}"
"MPCQT_VERSION=${finalAttrs.version}"
];
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
meta = with lib; {
meta = {
description = "Media Player Classic Qute Theater";
homepage = "https://mpc-qt.github.io";
license = licenses.gpl2;
platforms = platforms.unix;
license = lib.licenses.gpl2;
platforms = lib.platforms.unix;
broken = stdenv.hostPlatform.isDarwin;
maintainers = with maintainers; [ romildo ];
maintainers = with lib.maintainers; [ romildo ];
mainProgram = "mpc-qt";
};
}
})
+3 -3
View File
@@ -10,16 +10,16 @@
php.buildComposerProject2 (finalAttrs: {
pname = "phpunit";
version = "12.2.5";
version = "12.2.7";
src = fetchFromGitHub {
owner = "sebastianbergmann";
repo = "phpunit";
tag = finalAttrs.version;
hash = "sha256-xpIpcjteIC9rpDxySqcDwJu1e3oMs6qC8u0zYlInxMw=";
hash = "sha256-pSmxvDGsD2NFKwP0tA8LTBxfZEXDJFwLACdmK//6Ks8=";
};
vendorHash = "sha256-G67bYh61xTtqg2dj2laxYed/wXVIRZsG31mZETxohjM=";
vendorHash = "sha256-py1mJRNb8Wcsw9sq0sGZc7lHzi52Ui4HmTUeAvTaXwY=";
passthru = {
updateScript = nix-update-script { };
@@ -7,13 +7,13 @@
}:
buildGoModule (finalAttrs: {
pname = "prometheus-solaredge-exporter";
version = "0.1.5";
version = "0.1.6";
src = fetchFromGitHub {
owner = "paepckehh";
repo = "solaredge_exporter";
tag = "v${finalAttrs.version}";
hash = "sha256-vo0WaiigwjSEA+wEUs8Wdko+UHq5OXXcVcfgna/QVHE=";
hash = "sha256-vk2e9OeTt1T0f8H3uLHbd2fBO2KVse0IYrSFCu68Wgk=";
};
ldflags = [
@@ -26,7 +26,7 @@ buildGoModule (finalAttrs: {
"-X github.com/prometheus/common/version.Version=${finalAttrs.version}"
];
vendorHash = "sha256-ltCjuihbm0/bj2SPkiITTHzYmcQsX12xvt+OpYROivU=";
vendorHash = "sha256-Utydte6V07BN5Lz3Js54DqPV+cdnH2p1J5gYliFQYlU=";
passthru.updateScript = nix-update-script { };
+2 -2
View File
@@ -9,11 +9,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "proton-ge-bin";
version = "GE-Proton10-8";
version = "GE-Proton10-9";
src = fetchzip {
url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
hash = "sha256-cbmOQYWEP/uB2ZoMAbtbeXbOJjxZui0n2U+Tr/OLKjA=";
hash = "sha256-DJ7bRjzJehSFIyBo+oJyyWui+a3udGxc38P9Hw+xU9U=";
};
dontUnpack = true;
+1 -1
View File
@@ -77,6 +77,6 @@ stdenv.mkDerivation rec {
"x86_64-linux"
];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
maintainers = with lib.maintainers; [ paveloom ];
maintainers = with lib.maintainers; [ ];
};
}
+7 -2
View File
@@ -11,7 +11,7 @@
python3Packages.buildPythonApplication rec {
pname = "r128gain";
version = "1.0.7";
format = "setuptools";
pyproject = true;
src = fetchFromGitHub {
owner = "desbma";
@@ -26,12 +26,15 @@ python3Packages.buildPythonApplication rec {
})
];
propagatedBuildInputs = with python3Packages; [
build-system = with python3Packages; [ setuptools ];
dependencies = with python3Packages; [
crcmod
ffmpeg-python
mutagen
tqdm
];
nativeCheckInputs = with python3Packages; [
requests
sox
@@ -41,6 +44,8 @@ python3Packages.buildPythonApplication rec {
# sandbox to be disabled.
doCheck = false;
pythonImportsCheck = [ "r128gain" ];
passthru.updateScript = gitUpdater { };
meta = with lib; {
+3 -2
View File
@@ -7,14 +7,15 @@
python3Packages.buildPythonApplication rec {
pname = "raiseorlaunch";
version = "2.3.5";
format = "setuptools";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-L/hu0mYCAxHkp5me96a6HlEY6QsuJDESpTNhlzVRHWs=";
};
nativeBuildInputs = [ python3Packages.setuptools-scm ];
build-system = with python3Packages; [ setuptools ];
pythonPath = with python3Packages; [ i3ipc ];
# no tests
+8 -3
View File
@@ -12,22 +12,27 @@ in
pypkgs.buildPythonApplication rec {
pname = "rdiff-backup";
version = "2.2.6";
format = "setuptools";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-0HeDVyZrxlE7t/daRXCymySydgNIu/YHur/DpvCUWM8";
};
nativeBuildInputs = with pypkgs; [ setuptools-scm ];
build-system = with pypkgs; [
setuptools
setuptools-scm
];
buildInputs = [ librsync ];
propagatedBuildInputs = with pypkgs; [ pyyaml ];
dependencies = with pypkgs; [ pyyaml ];
# no tests from pypi
doCheck = false;
pythonImportsCheck = [ "rdiff_backup" ];
meta = with lib; {
description = "Backup system trying to combine best a mirror and an incremental backup system";
homepage = "https://rdiff-backup.net";
+5 -1
View File
@@ -10,18 +10,22 @@ let
in
python3.pkgs.buildPythonApplication {
inherit pname version;
format = "setuptools";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-X/G6osOHCBidKZG/Y2nmHadifDacJhjBIc7WYrUCPn8=";
};
build-system = with python3.pkgs; [ setuptools ];
propagatedBuildInputs = with python3.pkgs; [
requests
python-dateutil
];
pythonImportsCheck = [ "redfishtoollib" ];
meta = {
description = "Python34 program that implements a command line tool for accessing the Redfish API";
homepage = "https://github.com/DMTF/Redfishtool";
+5 -5
View File
@@ -23,13 +23,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "redisinsight";
version = "2.68.0";
version = "2.70.0";
src = fetchFromGitHub {
owner = "RedisInsight";
repo = "RedisInsight";
rev = finalAttrs.version;
hash = "sha256-rXp3C/Ui3vMBscsxlwU9fRF1bmvMrvXLtmJfGzfh1Rk=";
hash = "sha256-b97/hBhXqSFDzcyrQKu5Ebu1Ud3wpWEjyzUehj0PP9w=";
};
patches = [
@@ -42,21 +42,21 @@ stdenv.mkDerivation (finalAttrs: {
baseOfflineCache = fetchYarnDeps {
name = "redisinsight-${finalAttrs.version}-base-offline-cache";
inherit (finalAttrs) src patches;
hash = "sha256-ORVftwl/8Yrug2MeqWfZTsHNTRJlpKGn2P7JCHUf3do=";
hash = "sha256-m3relh3DZGReEi4dVOJcIXU9QVClisXw+f7K5i25x24=";
};
innerOfflineCache = fetchYarnDeps {
name = "redisinsight-${finalAttrs.version}-inner-offline-cache";
inherit (finalAttrs) src patches;
postPatch = "cd redisinsight";
hash = "sha256-yFfkpWV/GD2CcAzb0D3lNZwmqzEN6Bi1MjPyRwClaQ0=";
hash = "sha256-rqmrETlc2XoZDM4GP1+qI4eK4oGmtpmc6TVvAam2+W8=";
};
apiOfflineCache = fetchYarnDeps {
name = "redisinsight-${finalAttrs.version}-api-offline-cache";
inherit (finalAttrs) src patches;
postPatch = "cd redisinsight/api";
hash = "sha256-go7IR1UsW8TrWjaFSlC6/biUvb9cHo3PgJa16tF0XHo=";
hash = "sha256-KFtmq3iYAnsAi5ysvGCzBk9RHV7EE7SIPbzPza7vBdA=";
};
nativeBuildInputs = [
+4 -2
View File
@@ -4,6 +4,7 @@
nixosTests,
rustPlatform,
fetchFromGitHub,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
pname = "redlib";
@@ -61,8 +62,9 @@ rustPlatform.buildRustPackage rec {
SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
};
passthru.tests = {
inherit (nixosTests) redlib;
passthru = {
tests = nixosTests.redlib;
updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
};
meta = {
+6 -2
View File
@@ -7,7 +7,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "regexploit";
version = "1.0.0";
format = "setuptools";
pyproject = true;
disabled = python3.pythonOlder "3.8";
@@ -18,7 +18,11 @@ python3.pkgs.buildPythonApplication rec {
sha256 = "0z3fghsyw0ll36in7ihc0qi3gy7mqi6cw1mi8m8c8xb1nlwpfr0y";
};
propagatedBuildInputs = with python3.pkgs; [
build-system = with python3.pkgs; [
setuptools
];
dependencies = with python3.pkgs; [
pyyaml
];
+6 -2
View File
@@ -7,7 +7,7 @@
python3Packages.buildPythonApplication rec {
pname = "replacement";
version = "0.4.4";
format = "setuptools";
pyproject = true;
disabled = python3Packages.isPy27;
@@ -18,7 +18,11 @@ python3Packages.buildPythonApplication rec {
sha256 = "0j4lvn3rx1kqvxcsd8nhc2lgk48jyyl7qffhlkvakhy60f9lymj3";
};
propagatedBuildInputs = with python3Packages; [
build-system = with python3Packages; [
setuptools
];
dependencies = with python3Packages; [
ruamel-yaml
];
+5 -4
View File
@@ -25,17 +25,17 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "restate";
version = "1.4.1";
version = "1.4.2";
src = fetchFromGitHub {
owner = "restatedev";
repo = "restate";
tag = "v${finalAttrs.version}";
hash = "sha256-4hNutU9WpzxOjQe+0t5teSjMhuoprR0INQo6H/wOygc=";
hash = "sha256-0p3pH2lQnb3oOsGtKP8olVUefobGa3DsnB2LMx06+no=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-/ng8ONIszRgmfgRBKn65kcJFaTp1T0lNdZQb3t9Gol0=";
cargoHash = "sha256-9EeS599rZLLKkdBS1bTX7y7CTmeTBlgHZ8c0WBlbZmk=";
env = {
PROTOC = lib.getExe protobuf;
@@ -52,6 +52,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
"-C force-unwind-tables"
"--cfg uuid_unstable"
"--cfg tokio_unstable"
"--cfg tokio_taskdump"
];
"aarch64-unknown-linux-gnu" = self.build ++ [
@@ -132,7 +133,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
};
meta = {
description = "Platform for developing distributed fault-tolerant applications.";
description = "Platform for developing distributed fault-tolerant applications";
homepage = "https://restate.dev";
changelog = "https://github.com/restatedev/restate/releases/tag/v${finalAttrs.version}";
mainProgram = "restate";
+5 -4
View File
@@ -4,11 +4,10 @@
python3,
}:
with python3.pkgs;
buildPythonApplication rec {
python3.pkgs.buildPythonApplication rec {
pname = "rfc-bibtex";
version = "0.3.2";
format = "setuptools";
pyproject = true;
src = fetchFromGitHub {
owner = "iluxonchik";
@@ -17,7 +16,9 @@ buildPythonApplication rec {
hash = "sha256-bPCNQqiG50vWVFA6J2kyxftwsXunHTNBdSkoIRYkb0s=";
};
nativeCheckInputs = [
build-system = with python3.pkgs; [ setuptools ];
nativeCheckInputs = with python3.pkgs; [
pytestCheckHook
vcrpy
];
+9 -5
View File
@@ -8,7 +8,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "ripe-atlas-tools";
version = "3.1.0";
format = "setuptools";
pyproject = true;
src = fetchFromGitHub {
owner = "RIPE-NCC";
@@ -24,13 +24,17 @@ python3.pkgs.buildPythonApplication rec {
echo "include ripe/atlas/tools/user-agent" >> MANIFEST.in
'';
nativeBuildInputs = with python3.pkgs; [
sphinx-rtd-theme
sphinxHook
nativeBuildInputs = [
installShellFiles
];
propagatedBuildInputs = with python3.pkgs; [
build-system = with python3.pkgs; [
setuptools
sphinx-rtd-theme
sphinxHook
];
dependencies = with python3.pkgs; [
ipy
pyopenssl
python-dateutil
+11 -7
View File
@@ -7,7 +7,7 @@
python3Packages.buildPythonPackage rec {
pname = "rivalcfg";
version = "4.15.0";
format = "setuptools";
pyproject = true;
src = fetchFromGitHub {
owner = "flozz";
@@ -16,29 +16,33 @@ python3Packages.buildPythonPackage rec {
sha256 = "sha256-UqVogJLv+sNhAxdMjBEvhBQw6LU+QUq1IekvWpeeMqk=";
};
propagatedBuildInputs = with python3Packages; [
build-system = with python3Packages; [ setuptools ];
dependencies = with python3Packages; [
hidapi
setuptools
setuptools # pkg_resources is imported during runtime
];
checkInputs = [ python3Packages.pytest ];
checkPhase = "pytest";
nativeCheckInputs = with python3Packages; [
pytestCheckHook
];
# tests are broken
doCheck = false;
postInstall = ''
set -x
mkdir -p $out/lib/udev/rules.d
tmpl_udev="$out/lib/udev/rules.d/99-rivalcfg.rules"
tmpudev="''${tmpl_udev}.in"
finaludev="$tmpl_udev"
"$out/bin/rivalcfg" --print-udev > "$tmpudev"
substitute "$tmpudev" "$out/lib/udev/rules.d/99-rivalcfg.rules" \
--replace MODE=\"0666\" "MODE=\"0664\", GROUP=\"input\""
--replace-fail MODE=\"0666\" "MODE=\"0664\", GROUP=\"input\""
rm "$tmpudev"
'';
pythonImportsCheck = [ "rivalcfg" ];
meta = with lib; {
description = "Utility program that allows you to configure SteelSeries Rival gaming mice";
homepage = "https://github.com/flozz/rivalcfg";
+4 -2
View File
@@ -7,7 +7,7 @@
python3Packages.buildPythonApplication rec {
pname = "rofi-mpd";
version = "2.2.1";
format = "setuptools";
pyproject = true;
src = fetchFromGitHub {
owner = "JakeStanger";
@@ -16,7 +16,9 @@ python3Packages.buildPythonApplication rec {
sha256 = "0jabyn6gqh8ychn2a06xws3avz0lqdnx3qvqkavfd2xr6sp2q7lg";
};
propagatedBuildInputs = with python3Packages; [
build-system = with python3Packages; [ setuptools ];
dependencies = with python3Packages; [
mutagen
mpd2
toml
+5 -3
View File
@@ -7,14 +7,16 @@
python3.pkgs.buildPythonApplication rec {
pname = "s3bro";
version = "2.8";
format = "setuptools";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-+OqcLbXilbY4h/zRAkvRd8taVIOPyiScOAcDyPZ4RUw=";
};
propagatedBuildInputs = with python3.pkgs; [
build-system = with python3.pkgs; [ setuptools ];
dependencies = with python3.pkgs; [
boto3
botocore
click
@@ -23,7 +25,7 @@ python3.pkgs.buildPythonApplication rec {
postPatch = ''
substituteInPlace setup.py \
--replace "use_2to3=True," ""
--replace-fail "use_2to3=True," ""
'';
# No tests
+6 -2
View File
@@ -7,14 +7,16 @@
python3Packages.buildPythonApplication rec {
pname = "s4cmd";
version = "2.1.0";
format = "setuptools";
pyproject = true;
src = fetchPypi {
inherit pname version;
sha256 = "0d4mx98i3qhvlmr9x898mjvf827smzx6x5ji6daiwgjdlxc60mj2";
};
propagatedBuildInputs = with python3Packages; [
build-system = with python3Packages; [ setuptools ];
dependencies = with python3Packages; [
boto3
pytz
];
@@ -34,6 +36,8 @@ python3Packages.buildPythonApplication rec {
# Test suite requires an S3 bucket
doCheck = false;
pythonImportsCheck = [ "s4cmd" ];
meta = with lib; {
homepage = "https://github.com/bloomreach/s4cmd";
description = "Super S3 command line tool";
+8 -7
View File
@@ -14,12 +14,10 @@
wrapGAppsHook3,
}:
with python3.pkgs;
buildPythonApplication rec {
python3.pkgs.buildPythonApplication rec {
pname = "safeeyes";
version = "2.2.3";
format = "setuptools";
pyproject = true;
src = fetchPypi {
inherit pname version;
@@ -27,7 +25,7 @@ buildPythonApplication rec {
};
postPatch = ''
substituteInPlace setup.py --replace "root_dir = sys.prefix" "root_dir = '/'"
substituteInPlace setup.py --replace-fail "root_dir = sys.prefix" "root_dir = '/'"
'';
nativeBuildInputs = [
@@ -40,14 +38,15 @@ buildPythonApplication rec {
libnotify
];
propagatedBuildInputs = [
build-system = with python3.pkgs; [ setuptools ];
dependencies = with python3.pkgs; [
babel
psutil
xlib
pygobject3
dbus-python
croniter
setuptools
packaging
];
@@ -74,6 +73,8 @@ buildPythonApplication rec {
doCheck = false; # no tests
pythonImportsCheck = [ "safeeyes" ];
passthru.tests.version = testers.testVersion { package = safeeyes; };
meta = with lib; {
+6 -2
View File
@@ -7,7 +7,7 @@
python3Packages.buildPythonApplication rec {
pname = "savepagenow";
version = "1.1.1";
format = "setuptools";
pyproject = true;
src = fetchFromGitHub {
owner = "pastpages";
@@ -16,7 +16,9 @@ python3Packages.buildPythonApplication rec {
sha256 = "1lz6rc47cds9rb35jdf8n13gr61wdkh5jqzx4skikm1yrqkwjyhm";
};
propagatedBuildInputs = with python3Packages; [
build-system = with python3Packages; [ setuptools ];
dependencies = with python3Packages; [
click
requests
];
@@ -24,6 +26,8 @@ python3Packages.buildPythonApplication rec {
# requires network access
doCheck = false;
pythonImportsCheck = [ "savepagenow" ];
meta = with lib; {
description = "Simple Python wrapper for archive.org's \"Save Page Now\" capturing service";
homepage = "https://github.com/pastpages/savepagenow";
+4 -2
View File
@@ -28,7 +28,7 @@ in
python.pkgs.buildPythonApplication rec {
pname = "sca2d";
version = "0.2.2";
format = "setuptools";
pyproject = true;
src = fetchFromGitLab {
owner = "bath_open_instrumentation_group";
@@ -37,7 +37,9 @@ python.pkgs.buildPythonApplication rec {
hash = "sha256-p0Bv8jcnjcOLBAXN5A4GspSIEG4G4NPA4o0aEtwe/LU=";
};
propagatedBuildInputs = with python.pkgs; [
build-system = with python.pkgs; [ setuptools ];
dependencies = with python.pkgs; [
lark010
colorama
];
+8 -4
View File
@@ -13,7 +13,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "screenkey";
version = "1.5";
format = "setuptools";
pyproject = true;
src = fetchFromGitLab {
owner = "screenkey";
@@ -33,7 +33,9 @@ python3.pkgs.buildPythonApplication rec {
libappindicator-gtk3
];
propagatedBuildInputs = with python3.pkgs; [
build-system = with python3.pkgs; [ setuptools ];
dependencies = with python3.pkgs; [
babel
pycairo
pygobject3
@@ -53,11 +55,13 @@ python3.pkgs.buildPythonApplication rec {
# screenkey does not have any tests
doCheck = false;
pythonImportsCheck = [ "Screenkey" ];
# Fix CDLL python calls for non absolute paths of xorg libraries
postPatch = ''
substituteInPlace Screenkey/xlib.py \
--replace libX11.so.6 ${lib.getLib xorg.libX11}/lib/libX11.so.6 \
--replace libXtst.so.6 ${lib.getLib xorg.libXtst}/lib/libXtst.so.6
--replace-fail libX11.so.6 ${lib.getLib xorg.libX11}/lib/libX11.so.6 \
--replace-fail libXtst.so.6 ${lib.getLib xorg.libXtst}/lib/libXtst.so.6
'';
meta = with lib; {
+3 -1
View File
@@ -7,13 +7,15 @@
python3Packages.buildPythonApplication rec {
pname = "seashells";
version = "0.1.2";
format = "setuptools";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-RBs28FC7f82DrxRcmvTP9nljVpm7tjrGuvr05l32hDM=";
};
build-system = with python3Packages; [ setuptools ];
doCheck = false; # there are no tests
pythonImportsCheck = [ "seashells" ];
+4 -2
View File
@@ -7,7 +7,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "semiphemeral";
version = "0.7";
format = "setuptools";
pyproject = true;
src = fetchPypi {
inherit pname version;
@@ -18,7 +18,9 @@ python3.pkgs.buildPythonApplication rec {
pythonImportsCheck = [ "semiphemeral" ];
propagatedBuildInputs = with python3.pkgs; [
build-system = with python3.pkgs; [ setuptools ];
dependencies = with python3.pkgs; [
click
sqlalchemy
flask
@@ -0,0 +1,17 @@
{
serious-sam-classic,
vulkan-headers,
vulkan-loader,
}:
serious-sam-classic.overrideAttrs (oldAttrs: {
pname = "serious-sam-classic-vulkan";
src = oldAttrs.src.override {
repo = "SeriousSamClassic-VK";
hash = "sha256-fnWJOmgaW4/PfrmXiN7qodHEXc96/AZCbUo3dwelY6s=";
};
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ vulkan-headers ];
buildInputs = oldAttrs.buildInputs ++ [ vulkan-loader ];
})
@@ -0,0 +1,86 @@
{
bison,
cmake,
fetchFromGitHub,
flex,
imagemagick,
lib,
libogg,
libvorbis,
makeWrapper,
nasm,
SDL2,
stdenv,
zlib,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "serious-sam-classic";
version = "1.10.7";
src = fetchFromGitHub {
owner = "tx00100xt";
repo = "SeriousSamClassic";
tag = finalAttrs.version;
hash = "sha256-TwbTG2QT3nddLFHwMW4T7sAd9pi+QXdBz62ri4VcNeg=";
};
patches = [
./tfe-fix-cmake-libdir-override.patch
./tse-fix-cmake-libdir-override.patch
./tfe-force-using-system-path.patch
./tse-force-using-system-path.patch
];
postPatch = ''
substituteInPlace SamTFE/Sources/CMakeLists.txt --replace-fail "-march=native" "-mtune=generic"
substituteInPlace SamTSE/Sources/CMakeLists.txt --replace-fail "-march=native" "-mtune=generic"
'';
nativeBuildInputs = [
makeWrapper
cmake
imagemagick
bison
flex
nasm
];
buildInputs = [
SDL2
zlib
libogg
libvorbis
];
# I've tried to use patchelf --add-needed and --add-rpath with libvorbis, didn't work
postInstall = ''
wrapProgram $out/bin/serioussam --prefix LD_LIBRARY_PATH : ${libvorbis}/lib
wrapProgram $out/bin/serioussamse --prefix LD_LIBRARY_PATH : ${libvorbis}/lib
'';
meta = {
homepage = "https://github.com/tx00100xt/${finalAttrs.src.repo}";
description = "Open source game engine version developed by Croteam for Serious Sam Classic";
longDescription = ''
Note: This package allows to run both Serious Sam: The First Encounter (serioussam)
and The Second Encounter (serioussamse).
For serioussam you must copy all the assets of the original games into
~/.local/share/Serious-Engine/serioussam for serioussam and
~/.local/share/Serious-Engine/serioussamse for serioussamse.
Look at
https://github.com/tx00100xt/${finalAttrs.src.repo}/wiki/How-to-building-a-package-for-Debian-or-Ubuntu.md#game-resources
for instructions on how to do that.
For both games you must also copy the files SE1_10b.gro and ModEXT.txt into the assets.
For serioussam:
- https://raw.githubusercontent.com/tx00100xt/${finalAttrs.src.repo}/${finalAttrs.src.tag}/SamTFE/ModEXT.txt
- https://raw.githubusercontent.com/tx00100xt/${finalAttrs.src.repo}/${finalAttrs.src.tag}/SamTFE/SE1_10b.gro
For serioussamse:
- https://raw.githubusercontent.com/tx00100xt/${finalAttrs.src.repo}/${finalAttrs.src.tag}/SamTSE/ModEXT.txt
- https://raw.githubusercontent.com/tx00100xt/${finalAttrs.src.repo}/${finalAttrs.src.tag}/SamTSE/SE1_10b.gro
'';
license = lib.licenses.gpl2Only;
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.l0b0 ];
};
})
@@ -0,0 +1,17 @@
diff --git a/SamTFE/Sources/CMakeLists.txt b/SamTFE/Sources/CMakeLists.txt
index 956518b..76308f2 100644
--- a/SamTFE/Sources/CMakeLists.txt
+++ b/SamTFE/Sources/CMakeLists.txt
@@ -221,10 +221,10 @@ endif (LINUX)
message(STATUS "Operating system name: ${CMAKE_OS_NAME}")
set(CMAKE_ARCH_BITS 32)
-set(CMAKE_INSTALL_LIBDIR "/usr/lib")
+#set(CMAKE_INSTALL_LIBDIR "/usr/lib")
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(CMAKE_ARCH_BITS 64)
- set(CMAKE_INSTALL_LIBDIR "/usr/lib64")
+ #set(CMAKE_INSTALL_LIBDIR "/usr/lib64")
endif()
message(STATUS "Arch bits: ${CMAKE_ARCH_BITS}")
@@ -0,0 +1,60 @@
diff --git a/SamTFE/Sources/Engine/Engine.cpp b/SamTFE/Sources/Engine/Engine.cpp
index 6febab8..5963e34 100644
--- a/SamTFE/Sources/Engine/Engine.cpp
+++ b/SamTFE/Sources/Engine/Engine.cpp
@@ -742,53 +742,8 @@
CPrintF(TRANSV("Running %d-bit version\n"), sys_iGameBits);
#ifdef PLATFORM_UNIX
-#if defined(__OpenBSD__) || defined(__FreeBSD__)
- int _isystempath = strncmp((const char *)strExePath, (const char *) "/usr/local/bin/", (size_t) 15 );
-#elif defined(__NetBSD__)
- int _isystempath = strncmp((const char *)strExePath, (const char *) "/usr/pkg/bin/", (size_t) 13 );
-#else
- int _isystempath = strncmp((const char *)strExePath, (const char *) "/usr/bin/", (size_t) 9 );
-#endif
- if( _isystempath == 0 ) {
- sys_iSysPath = 1; // using system path
- } else {
- sys_iSysPath = 0; // using standarted path
- }
-
- // get library path for mods
- _fnmModLibPath = "";
-#if defined(__OpenBSD__) || defined(__FreeBSD__)
- if( sys_iSysPath == 1 ) {
- _fnmModLibPath = "/usr/local/lib/" + strGameID + "/";
-#elif defined(__NetBSD__)
- if( sys_iSysPath == 1 ) {
- _fnmModLibPath = "/usr/pkg/lib/" + strGameID + "/";
-#else
- if( sys_iSysPath == 1 && sys_iGameBits == 64 && _pFileSystem->IsDirectory((const char *) "/usr/lib/aarch64-linux-gnu/" + strGameID)) {
- _fnmModLibPath = "/usr/lib/aarch64-linux-gnu/" + strGameID + "/";
- } else if( sys_iSysPath == 1 && sys_iGameBits == 32 && _pFileSystem->IsDirectory((const char *) "/usr/lib/arm-linux-gnueabihf/" + strGameID)) {
- _fnmModLibPath = "/usr/lib/arm-linux-gnueabihf/" + strGameID + "/";
- } else if( sys_iSysPath == 1 && sys_iGameBits == 64 && _pFileSystem->IsDirectory((const char *) "/usr/lib/riscv64-linux-gnu/" + strGameID)) {
- _fnmModLibPath = "/usr/lib/riscv64-linux-gnu/" + strGameID + "/";
- } else if( sys_iSysPath == 1 && sys_iGameBits == 64 && _pFileSystem->IsDirectory((const char *) "/usr/lib/s390x-linux-gnu/" + strGameID)) {
- _fnmModLibPath = "/usr/lib/s390x-linux-gnu/" + strGameID + "/";
- } else if( sys_iSysPath == 1 && sys_iGameBits == 64 && _pFileSystem->IsDirectory((const char *) "/usr/lib/powerpc64-linux-gnu/" + strGameID)) {
- _fnmModLibPath = "/usr/lib/powerpc64-linux-gnu/" + strGameID + "/";
- } else if( sys_iSysPath == 1 && sys_iGameBits == 64 && _pFileSystem->IsDirectory((const char *) "/usr/lib/x86_64-linux-gnu/" + strGameID)) {
- _fnmModLibPath = "/usr/lib/x86_64-linux-gnu/" + strGameID + "/";
- } else if( sys_iSysPath == 1 && sys_iGameBits == 32 && _pFileSystem->IsDirectory((const char *) "/usr/lib/i386-linux-gnu/" + strGameID)) {
- _fnmModLibPath = "/usr/lib/i386-linux-gnu/" + strGameID + "/";
- } else if( sys_iSysPath == 1 && sys_iGameBits == 64 && _pFileSystem->IsDirectory((const char *) "/usr/lib64/" + strGameID)) {
- _fnmModLibPath = "/usr/lib64/" + strGameID + "/";
- } else if( sys_iSysPath == 1 && sys_iGameBits == 32 && _pFileSystem->IsDirectory((const char *) "/usr/lib//" + strGameID)) {
- _fnmModLibPath = "/usr/lib/" + strGameID + "/";
-#endif
- } else if( sys_iSysPath == 0 ) {
- _fnmModLibPath = _fnmApplicationPath;
- } else {
- CPrintF(TRANSV("ERROR: Game libraries not ound!\n"));
- FatalError(TRANSV("Failed to search game libraries installed!\nPlease reinstall the game.\nSee the log for more details.\nGame log is here: ~/.local/share/Serious-Engine/%s/SeriousSam.log"),(const char *) strGameID);
- }
+ sys_iSysPath = 1; // using system path
+ _fnmModLibPath = _fnmApplicationPath + "lib/" + strGameID + "/";
if( sys_iSysPath == 1 ) { // search game data
CTFileName _fnm_usr_TestFile, _fnm_local_TestFile, _fnm_home_TestFile;
@@ -0,0 +1,17 @@
diff --git a/SamTSE/Sources/CMakeLists.txt b/SamTSE/Sources/CMakeLists.txt
index 956518b..76308f2 100644
--- a/SamTSE/Sources/CMakeLists.txt
+++ b/SamTSE/Sources/CMakeLists.txt
@@ -221,10 +221,10 @@ endif (LINUX)
message(STATUS "Operating system name: ${CMAKE_OS_NAME}")
set(CMAKE_ARCH_BITS 32)
-set(CMAKE_INSTALL_LIBDIR "/usr/lib")
+#set(CMAKE_INSTALL_LIBDIR "/usr/lib")
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(CMAKE_ARCH_BITS 64)
- set(CMAKE_INSTALL_LIBDIR "/usr/lib64")
+ #set(CMAKE_INSTALL_LIBDIR "/usr/lib64")
endif()
message(STATUS "Arch bits: ${CMAKE_ARCH_BITS}")
@@ -0,0 +1,60 @@
diff --git a/SamTSE/Sources/Engine/Engine.cpp b/SamTSE/Sources/Engine/Engine.cpp
index 6febab8..5963e34 100644
--- a/SamTSE/Sources/Engine/Engine.cpp
+++ b/SamTSE/Sources/Engine/Engine.cpp
@@ -742,53 +742,8 @@
CPrintF(TRANSV("Running %d-bit version\n"), sys_iGameBits);
#ifdef PLATFORM_UNIX
-#if defined(__OpenBSD__) || defined(__FreeBSD__)
- int _isystempath = strncmp((const char *)strExePath, (const char *) "/usr/local/bin/", (size_t) 15 );
-#elif defined(__NetBSD__)
- int _isystempath = strncmp((const char *)strExePath, (const char *) "/usr/pkg/bin/", (size_t) 13 );
-#else
- int _isystempath = strncmp((const char *)strExePath, (const char *) "/usr/bin/", (size_t) 9 );
-#endif
- if( _isystempath == 0 ) {
- sys_iSysPath = 1; // using system path
- } else {
- sys_iSysPath = 0; // using standarted path
- }
-
- // get library path for mods
- _fnmModLibPath = "";
-#if defined(__OpenBSD__) || defined(__FreeBSD__)
- if( sys_iSysPath == 1 ) {
- _fnmModLibPath = "/usr/local/lib/" + strGameID + "/";
-#elif defined(__NetBSD__)
- if( sys_iSysPath == 1 ) {
- _fnmModLibPath = "/usr/pkg/lib/" + strGameID + "/";
-#else
- if( sys_iSysPath == 1 && sys_iGameBits == 64 && _pFileSystem->IsDirectory((const char *) "/usr/lib/aarch64-linux-gnu/" + strGameID)) {
- _fnmModLibPath = "/usr/lib/aarch64-linux-gnu/" + strGameID + "/";
- } else if( sys_iSysPath == 1 && sys_iGameBits == 32 && _pFileSystem->IsDirectory((const char *) "/usr/lib/arm-linux-gnueabihf/" + strGameID)) {
- _fnmModLibPath = "/usr/lib/arm-linux-gnueabihf/" + strGameID + "/";
- } else if( sys_iSysPath == 1 && sys_iGameBits == 64 && _pFileSystem->IsDirectory((const char *) "/usr/lib/riscv64-linux-gnu/" + strGameID)) {
- _fnmModLibPath = "/usr/lib/riscv64-linux-gnu/" + strGameID + "/";
- } else if( sys_iSysPath == 1 && sys_iGameBits == 64 && _pFileSystem->IsDirectory((const char *) "/usr/lib/s390x-linux-gnu/" + strGameID)) {
- _fnmModLibPath = "/usr/lib/s390x-linux-gnu/" + strGameID + "/";
- } else if( sys_iSysPath == 1 && sys_iGameBits == 64 && _pFileSystem->IsDirectory((const char *) "/usr/lib/powerpc64-linux-gnu/" + strGameID)) {
- _fnmModLibPath = "/usr/lib/powerpc64-linux-gnu/" + strGameID + "/";
- } else if( sys_iSysPath == 1 && sys_iGameBits == 64 && _pFileSystem->IsDirectory((const char *) "/usr/lib/x86_64-linux-gnu/" + strGameID)) {
- _fnmModLibPath = "/usr/lib/x86_64-linux-gnu/" + strGameID + "/";
- } else if( sys_iSysPath == 1 && sys_iGameBits == 32 && _pFileSystem->IsDirectory((const char *) "/usr/lib/i386-linux-gnu/" + strGameID)) {
- _fnmModLibPath = "/usr/lib/i386-linux-gnu/" + strGameID + "/";
- } else if( sys_iSysPath == 1 && sys_iGameBits == 64 && _pFileSystem->IsDirectory((const char *) "/usr/lib64/" + strGameID)) {
- _fnmModLibPath = "/usr/lib64/" + strGameID + "/";
- } else if( sys_iSysPath == 1 && sys_iGameBits == 32 && _pFileSystem->IsDirectory((const char *) "/usr/lib//" + strGameID)) {
- _fnmModLibPath = "/usr/lib/" + strGameID + "/";
-#endif
- } else if( sys_iSysPath == 0 ) {
- _fnmModLibPath = _fnmApplicationPath;
- } else {
- CPrintF(TRANSV("ERROR: Game libraries not ound!\n"));
- FatalError(TRANSV("Failed to search game libraries installed!\nPlease reinstall the game.\nSee the log for more details.\nGame log is here: ~/.local/share/Serious-Engine/%s/SeriousSam.log"),(const char *) strGameID);
- }
+ sys_iSysPath = 1; // using system path
+ _fnmModLibPath = _fnmApplicationPath + "lib/" + strGameID + "/";
if( sys_iSysPath == 1 ) { // search game data
CTFileName _fnm_usr_TestFile, _fnm_local_TestFile, _fnm_home_TestFile;
+4 -2
View File
@@ -6,7 +6,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "seventeenlands";
version = "0.1.43";
format = "setuptools";
pyproject = true;
src = fetchPypi {
inherit pname version;
@@ -18,7 +18,9 @@ python3.pkgs.buildPythonApplication rec {
pythonImportsCheck = [ "seventeenlands" ];
propagatedBuildInputs = with python3.pkgs; [
build-system = with python3.pkgs; [ setuptools ];
dependencies = with python3.pkgs; [
python-dateutil
requests
tkinter
+6 -2
View File
@@ -7,19 +7,23 @@
python3Packages.buildPythonApplication rec {
pname = "sewer";
version = "0.8.4";
format = "setuptools";
pyproject = true;
src = fetchPypi {
inherit pname version;
sha256 = "sha256-a4VdbZY8pYxrXIaUHJpnLuTB928tJn4UCdnt+m8UBug=";
};
propagatedBuildInputs = with python3Packages; [
build-system = with python3Packages; [ setuptools ];
dependencies = with python3Packages; [
pyopenssl
requests
tldextract
];
pythonImportsCheck = [ "sewer" ];
meta = with lib; {
homepage = "https://github.com/komuw/sewer";
description = "ACME client";
+5 -1
View File
@@ -7,7 +7,7 @@
python3Packages.buildPythonApplication rec {
pname = "sftpman";
version = "1.2.2";
format = "setuptools";
pyproject = true;
src = fetchFromGitHub {
owner = "spantaleev";
@@ -16,10 +16,14 @@ python3Packages.buildPythonApplication rec {
hash = "sha256-YxqN4+u0nYUWehbyRhjddIo2sythH3E0fiPSyrUlWhM=";
};
build-system = with python3Packages; [ setuptools ];
checkPhase = ''
$out/bin/sftpman help
'';
pythonImportsCheck = [ "sftpman" ];
meta = with lib; {
homepage = "https://github.com/spantaleev/sftpman";
description = "Application that handles sshfs/sftp file systems mounting";
+4 -2
View File
@@ -7,7 +7,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "shot-scraper";
version = "1.8";
format = "setuptools";
pyproject = true;
disabled = python3.pkgs.pythonOlder "3.6";
@@ -18,7 +18,9 @@ python3.pkgs.buildPythonApplication rec {
hash = "sha256-CSV9HOqVMHI/L+jyMTdaDyc6ACyGIkG/mmcyRza6EjQ=";
};
propagatedBuildInputs = with python3.pkgs; [
build-system = with python3.pkgs; [ setuptools ];
dependencies = with python3.pkgs; [
click
click-default-group
playwright
+4 -2
View File
@@ -7,7 +7,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "soco-cli";
version = "0.4.73";
format = "setuptools";
pyproject = true;
disabled = python3.pythonOlder "3.6";
@@ -18,7 +18,9 @@ python3.pkgs.buildPythonApplication rec {
hash = "sha256-WxBwHjh5tCXclQXqrHrpvZdcQU93RObteAfZyyVvKf0=";
};
propagatedBuildInputs = with python3.pkgs; [
build-system = with python3.pkgs; [ setuptools ];
dependencies = with python3.pkgs; [
fastapi
rangehttpserver
soco
+4 -2
View File
@@ -25,7 +25,7 @@ in
buildPythonApplication rec {
pname = "sonata";
version = "1.7.1";
format = "setuptools";
pyproject = true;
src = fetchFromGitHub {
owner = "multani";
@@ -50,13 +50,15 @@ buildPythonApplication rec {
gdk-pixbuf
];
build-system = [ setuptools ];
# The optional tagpy dependency (for editing metadata) is not yet
# included because it's difficult to build.
pythonPath = [
dbus-python
mpd2
pygobject3
setuptools
setuptools # pkg_resources is imported during runtime
];
postPatch = ''
+6 -2
View File
@@ -7,14 +7,16 @@
python3Packages.buildPythonApplication rec {
pname = "sqlite-web";
version = "0.6.4";
format = "setuptools";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-5Bdd1C9M3HjvfDKdVvGSQ+/I0Iimvf1MZwPonRiqwqU=";
};
propagatedBuildInputs = with python3Packages; [
build-system = with python3Packages; [ setuptools ];
dependencies = with python3Packages; [
flask
peewee
pygments
@@ -23,6 +25,8 @@ python3Packages.buildPythonApplication rec {
# no tests in repository
doCheck = false;
pythonImportsCheck = [ "sqlite_web" ];
meta = with lib; {
description = "Web-based SQLite database browser";
mainProgram = "sqlite_web";
+1 -1
View File
@@ -66,7 +66,7 @@ python3Packages.buildPythonApplication rec {
description = "Scriptable music downloader for Qobuz, Tidal, SoundCloud, and Deezer";
homepage = "https://github.com/nathom/streamrip";
license = licenses.gpl3Only;
maintainers = with maintainers; [ paveloom ];
maintainers = with maintainers; [ ];
mainProgram = "rip";
};
}
+1 -1
View File
@@ -43,6 +43,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://www.randomhacks.net/substudy";
license = licenses.asl20;
mainProgram = "substudy";
maintainers = with maintainers; [ paveloom ];
maintainers = with maintainers; [ ];
};
}
+1 -1
View File
@@ -95,6 +95,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
platforms = platforms.all;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
maintainers = with maintainers; [ paveloom ];
maintainers = with maintainers; [ ];
};
}
+4 -2
View File
@@ -7,7 +7,7 @@
python3.pkgs.buildPythonApplication {
pname = "swaggerhole";
version = "1.1";
format = "setuptools";
pyproject = true;
src = fetchFromGitHub {
owner = "Liodeus";
@@ -17,7 +17,9 @@ python3.pkgs.buildPythonApplication {
hash = "sha256-3HmIpn1A86PXZRL+SqMdr84O16hW1mCUWHKnOVolmx8=";
};
propagatedBuildInputs = with python3.pkgs; [
build-system = with python3.pkgs; [ setuptools ];
dependencies = with python3.pkgs; [
requests
whispers
];
+5 -3
View File
@@ -8,7 +8,7 @@
python3.pkgs.buildPythonApplication {
pname = "swaglyrics";
version = "unstable-2021-06-17";
format = "setuptools";
pyproject = true;
src = fetchFromGitHub {
owner = "SwagLyrics";
@@ -19,10 +19,12 @@ python3.pkgs.buildPythonApplication {
postPatch = ''
substituteInPlace setup.py \
--replace "==" ">="
--replace-fail "==" ">="
'';
propagatedBuildInputs = with python3.pkgs; [
build-system = with python3.pkgs; [ setuptools ];
dependencies = with python3.pkgs; [
beautifulsoup4
colorama
flask
@@ -5,18 +5,19 @@
testers,
wrapGAppsHook3,
bash-completion,
blueprint-compiler,
dbus,
dbus-glib,
fish,
gdk-pixbuf,
glib,
gobject-introspection,
gtk-layer-shell,
gtk3,
gtk4-layer-shell,
gtk4,
gvfs,
json-glib,
libadwaita,
libgee,
libhandy,
libnotify,
libpulseaudio,
librsvg,
@@ -34,13 +35,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "SwayNotificationCenter";
version = "0.11.0";
version = "0.12.0";
src = fetchFromGitHub {
owner = "ErikReider";
repo = "SwayNotificationCenter";
rev = "v${finalAttrs.version}";
hash = "sha256-kRawYbBLVx0ie4t7tChkA8QJShS83fUcGrJSKkxBy8Q=";
tag = "v${finalAttrs.version}";
hash = "sha256-F7fccUaQUSHHqXO0lvnW1H3Af2YTQwQ17rNFhprgFz4=";
};
# build pkg-config is required to locate the native `scdoc` input
@@ -48,6 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
bash-completion
blueprint-compiler
# cmake # currently conflicts with meson
fish
glib
@@ -67,16 +69,16 @@ stdenv.mkDerivation (finalAttrs: {
dbus-glib
gdk-pixbuf
glib
gtk-layer-shell
gtk3
gtk4-layer-shell
gtk4
gvfs
json-glib
libadwaita
libgee
libhandy
libnotify
libpulseaudio
librsvg
pantheon.granite
pantheon.granite7
# systemd # ends with broken permission
wayland-scanner
];
+3 -3
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "syft";
version = "1.27.0";
version = "1.28.0";
src = fetchFromGitHub {
owner = "anchore";
repo = "syft";
tag = "v${version}";
hash = "sha256-q9Dmb8R9CixAQkERoKg778K9UiZMC6ql1ZHVsNfk/0s=";
hash = "sha256-cJIHyfnrzy0SM9qOxNGf9PGVapoGRWD8hT5L7XCKLjo=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -28,7 +28,7 @@ buildGoModule rec {
# hash mismatch with darwin
proxyVendor = true;
vendorHash = "sha256-K6d4IloHF/WURfJ0JIi2LdP8ft/3Pc426HzB2x8Qwj0=";
vendorHash = "sha256-cBaAndcF1RBxdmG196KFXKd9mEqyUQdGlaTPZSPln0I=";
nativeBuildInputs = [ installShellFiles ];
+3 -1
View File
@@ -7,7 +7,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "syncrclone";
version = "unstable-2023-03-23";
format = "setuptools";
pyproject = true;
src = fetchFromGitHub {
owner = "jwink3101";
@@ -16,6 +16,8 @@ python3.pkgs.buildPythonApplication rec {
hash = "sha256-v81hPeu5qnMG6Sb95D88jy5x/GO781bf7efCYjbOaxs=";
};
build-system = with python3.pkgs; [ setuptools ];
pythonImportsCheck = [
"syncrclone"
];
+4 -2
View File
@@ -7,7 +7,7 @@
python3Packages.buildPythonApplication {
pname = "systemd-wait";
version = "0.1+2018-10-05";
format = "setuptools";
pyproject = true;
src = fetchFromGitHub {
owner = "Stebalien";
@@ -16,7 +16,9 @@ python3Packages.buildPythonApplication {
sha256 = "1l8rd0wzf3m7fk0g1c8wc0csdisdfac0filhixpgp0ck9ignayq5";
};
propagatedBuildInputs = with python3Packages; [
build-system = with python3Packages; [ setuptools ];
dependencies = with python3Packages; [
dbus-python
pygobject3
];
+3 -1
View File
@@ -33,13 +33,15 @@ let
lynxpresence = python3Packages.buildPythonPackage rec {
pname = "lynxpresence";
version = "4.4.1";
format = "setuptools";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-y/KboyhEGs9RvyKayEIQu2+WaiQNOdsHDl1/pEoqEkQ=";
};
build-system = with python3Packages; [ setuptools ];
doCheck = false; # tests require internet connection
pythonImportsCheck = [ "lynxpresence" ];
};
+6 -3
View File
@@ -12,7 +12,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "tebreak";
version = "1.1";
format = "setuptools";
pyproject = true;
src = fetchFromGitHub {
owner = "adamewing";
@@ -21,8 +21,9 @@ python3.pkgs.buildPythonApplication rec {
sha256 = "13mgh775d8hkl340923lfwwm4r5ps70girn8d6wgfxzwzxylz8iz";
};
nativeBuildInputs = [ python3.pkgs.cython ];
propagatedBuildInputs = with python3.pkgs; [
build-system = with python3.pkgs; [ setuptools ];
dependencies = with python3.pkgs; [
pysam
scipy
bx-python
@@ -47,6 +48,8 @@ python3.pkgs.buildPythonApplication rec {
${python3.interpreter} checktest.py
'';
pythonImportsCheck = [ "tebreak" ];
meta = with lib; {
description = "Find and characterise transposable element insertions";
mainProgram = "tebreak";
+6 -3
View File
@@ -4,20 +4,21 @@
buildGoModule,
installShellFiles,
stdenv,
nix-update-script,
}:
buildGoModule (finalAttrs: {
pname = "temporal-cli";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "temporalio";
repo = "cli";
tag = "v${finalAttrs.version}";
hash = "sha256-9O+INXJhNwgwwvC0751ifdHmxbD0qI5A3LdDb4Krk/o=";
hash = "sha256-y4NS9IoGknHOKLJtAZBbruwRTqjUmQTKtEYNlixwyL8=";
};
vendorHash = "sha256-Xe/qrlqg6DpCNmsO/liTKjWIaY3KznkOQdXSSoJVZq4=";
vendorHash = "sha256-dWcf4X8/Wy/TULdT6PbiMaOd1d+haBlnII+6VKazrD4=";
overrideModAttrs = old: {
# https://gitlab.com/cznic/libc/-/merge_requests/10
@@ -55,6 +56,8 @@ buildGoModule (finalAttrs: {
__darwinAllowLocalNetworking = true;
passthru.updateScript = nix-update-script { };
meta = {
description = "Command-line interface for running Temporal Server and interacting with Workflows, Activities, Namespaces, and other parts of Temporal";
homepage = "https://docs.temporal.io/cli";
+6 -2
View File
@@ -17,7 +17,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "terminator";
version = "2.1.5";
format = "setuptools";
pyproject = true;
src = fetchFromGitHub {
owner = "gnome-terminator";
@@ -42,7 +42,9 @@ python3.pkgs.buildPythonApplication rec {
vte
];
propagatedBuildInputs = with python3.pkgs; [
build-system = with python3.pkgs; [ setuptools ];
dependencies = with python3.pkgs; [
configobj
dbus-python
pygobject3
@@ -56,6 +58,8 @@ python3.pkgs.buildPythonApplication rec {
doCheck = false;
pythonImportsCheck = [ "terminatorlib" ];
dontWrapGApps = true;
# HACK: 'wrapPythonPrograms' will add things to the $PATH in the wrapper. This bleeds into the
+6 -2
View File
@@ -7,19 +7,23 @@
python3Packages.buildPythonApplication rec {
pname = "termtosvg";
version = "1.1.0";
format = "setuptools";
pyproject = true;
src = fetchPypi {
inherit pname version;
sha256 = "1vk5kn8w3zf2ymi76l8cpwmvvavkmh3b9lb18xw3x1vzbmhz2f7d";
};
propagatedBuildInputs = with python3Packages; [
build-system = with python3Packages; [ setuptools ];
dependencies = with python3Packages; [
lxml
pyte
wcwidth
];
pythonImportsCheck = [ "termtosvg" ];
meta = with lib; {
homepage = "https://nbedos.github.io/termtosvg/";
description = "Record terminal sessions as SVG animations";
@@ -7,7 +7,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "terraform-compliance";
version = "1.3.52";
format = "setuptools";
pyproject = true;
src = fetchFromGitHub {
owner = "terraform-compliance";
@@ -16,14 +16,14 @@ python3.pkgs.buildPythonApplication rec {
hash = "sha256-M6u1P1UxOrP9bNPjPB0V15DUj+Y/1dFIjf/GCnYoCwc=";
};
postPatch = ''
substituteInPlace setup.py \
--replace "IPython==7.16.1" "IPython" \
--replace "diskcache==5.1.0" "diskcache>=5.1.0" \
--replace "radish-bdd==0.13.1" "radish-bdd" \
'';
build-system = with python3.pkgs; [ setuptools ];
propagatedBuildInputs = with python3.pkgs; [
pythonRelaxDeps = [
"radish-bdd"
"IPython"
];
dependencies = with python3.pkgs; [
diskcache
emoji
filetype
+6 -4
View File
@@ -8,12 +8,10 @@
desktopToDarwinBundle,
}:
with python3.pkgs;
buildPythonApplication rec {
python3.pkgs.buildPythonApplication rec {
pname = "thonny";
version = "4.1.7";
format = "setuptools";
pyproject = true;
src = fetchFromGitHub {
owner = "thonny";
@@ -40,6 +38,8 @@ buildPythonApplication rec {
})
];
build-system = with python3.pkgs; [ setuptools ];
dependencies =
with python3.pkgs;
(
@@ -71,6 +71,8 @@ buildPythonApplication rec {
# Tests need a DISPLAY
doCheck = false;
pythonImportsCheck = [ "thonny" ];
meta = {
description = "Python IDE for beginners";
longDescription = ''
+7 -2
View File
@@ -7,7 +7,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "timetagger_cli";
version = "25.5.1";
format = "setuptools";
pyproject = true;
src = fetchFromGitHub {
owner = "almarklein";
@@ -16,14 +16,19 @@ python3.pkgs.buildPythonApplication rec {
hash = "sha256-UklsHcVyCpWDHOxu+oB8RvwY+laEBFnDyjejS/GzgHE=";
};
propagatedBuildInputs = with python3.pkgs; [
build-system = with python3.pkgs; [ setuptools ];
dependencies = with python3.pkgs; [
requests
toml
dateparser
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "timetagger_cli" ];
meta = with lib; {
description = "Track your time from the command-line";
homepage = "https://github.com/almarklein/timetagger_cli";
+8 -5
View File
@@ -9,7 +9,7 @@ buildPythonApplication rec {
pname = "tinyprog";
# `python setup.py --version` from repo checkout
version = "1.0.24.dev114+g${lib.substring 0 7 src.rev}";
format = "setuptools";
pyproject = true;
src = fetchFromGitHub {
owner = "tinyfpga";
@@ -20,19 +20,22 @@ buildPythonApplication rec {
sourceRoot = "${src.name}/programmer";
propagatedBuildInputs = [
build-system = with python3Packages; [
setuptools
setuptools-scm
];
dependencies = [
pyserial
jsonmerge
intelhex
tqdm
six
packaging
setuptools
setuptools # pkg_resources is imported during runtime
pyusb
];
nativeBuildInputs = [ setuptools-scm ];
meta = with lib; {
homepage = "https://github.com/tinyfpga/TinyFPGA-Bootloader/tree/master/programmer";
description = "Programmer for FPGA boards using the TinyFPGA USB Bootloader";
+6 -2
View File
@@ -7,14 +7,16 @@
python3.pkgs.buildPythonApplication rec {
pname = "tockloader";
version = "1.9.0";
format = "setuptools";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-7W55jugVtamFUL8N3dD1LFLJP2UDQb74V6o96rd/tEg=";
};
propagatedBuildInputs = with python3.pkgs; [
build-system = with python3.pkgs; [ setuptools ];
dependencies = with python3.pkgs; [
argcomplete
colorama
crcmod
@@ -32,6 +34,8 @@ python3.pkgs.buildPythonApplication rec {
runHook postCheck
'';
pythonImportsCheck = [ "tockloader" ];
meta = {
description = "Tool for programming Tock onto hardware boards";
mainProgram = "tockloader";
-1
View File
@@ -129,7 +129,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [
mpickering
nagisa
paveloom
];
platforms = platforms.linux ++ platforms.darwin;
};
+3 -3
View File
@@ -8,16 +8,16 @@
buildGo124Module (finalAttrs: {
pname = "traefik";
version = "3.4.3";
version = "3.4.4";
# Archive with static assets for webui
src = fetchzip {
url = "https://github.com/traefik/traefik/releases/download/v${finalAttrs.version}/traefik-v${finalAttrs.version}.src.tar.gz";
hash = "sha256-fxFr0PRKMYf5KpyFUoEv4TEJBmwTr1s5CRAZyHAgfqM=";
hash = "sha256-v9czTMaNcl4Aov6w4+CAM6YQoyIEy90eBfwrnmQVmgQ=";
stripRoot = false;
};
vendorHash = "sha256-nh5l71iRnT32mceeS7slksP3hjQP4hO4AKIvlO+CYMQ=";
vendorHash = "sha256-y0RibDQF+iG3HCX2FkEqxxn8bsC7zc4rQyRyq8oRgQM=";
subPackages = [ "cmd/traefik" ];
+14 -7
View File
@@ -9,7 +9,7 @@
python3Packages.buildPythonApplication rec {
pname = "trash-cli";
version = "0.24.5.26";
format = "setuptools";
pyproject = true;
src = fetchFromGitHub {
owner = "andreafrancia";
@@ -18,14 +18,18 @@ python3Packages.buildPythonApplication rec {
hash = "sha256-ltuMnxtG4jTTSZd6ZHWl8wI0oQMMFqW0HAPetZMfGtc=";
};
propagatedBuildInputs = with python3Packages; [
psutil
six
nativeBuildInputs = [
installShellFiles
];
nativeBuildInputs = with python3Packages; [
installShellFiles
shtab
build-system = with python3Packages; [
setuptools
shtab # for shell completions
];
dependencies = with python3Packages; [
psutil
six
];
nativeCheckInputs = with python3Packages; [
@@ -58,6 +62,9 @@ python3Packages.buildPythonApplication rec {
runHook postInstallCheck
'';
pythonImportsCheck = [ "trashcli" ];
postInstall = ''
for bin in trash-empty trash-list trash-restore trash-put trash; do
installShellCompletion --cmd "$bin" \
+24 -18
View File
@@ -8,7 +8,7 @@ with python3Packages;
buildPythonApplication rec {
pname = "tuir";
version = "1.31.0";
format = "setuptools";
pyproject = true;
src = fetchFromGitLab {
owner = "Chocimier";
@@ -17,24 +17,9 @@ buildPythonApplication rec {
hash = "sha256-VYBtD3Ex6+iIRNvX6jF0b0iPvno41/58xCRydiyssvk=";
};
# Tests try to access network
doCheck = false;
build-system = with python3Packages; [ setuptools ];
checkPhase = ''
py.test
'';
nativeCheckInputs = [
coverage
coveralls
docopt
mock
pylint
pytest
vcrpy
];
propagatedBuildInputs = [
dependencies = [
beautifulsoup4
decorator
kitchen
@@ -43,6 +28,27 @@ buildPythonApplication rec {
six
];
nativeCheckInputs = [
coverage
coveralls
docopt
mock
pylint
pytestCheckHook
vcrpy
];
__darwinAllowLocalNetworking = true; # for oauth tests
disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
# AssertionError: assert ['pbcopy', 'w'] == ['xclip', '-s..., 'clipboard']
"test_copy_nix"
# AttributeError: Can't get local object 'Terminal.open_browser.open_browser.<locals>.open_url_silent'
"test_terminal_open_browser_display"
];
pythonImportsCheck = [ "tuir" ];
meta = with lib; {
description = "Browse Reddit from your Terminal (fork of rtv)";
mainProgram = "tuir";
+6 -2
View File
@@ -34,18 +34,22 @@ in
pypkgs.buildPythonApplication rec {
pname = "tvnamer";
version = "3.0.4";
format = "setuptools";
pyproject = true;
src = fetchPypi {
inherit pname version;
sha256 = "dc2ea8188df6ac56439343630466b874c57756dd0b2538dd8e7905048f425f04";
};
propagatedBuildInputs = with pypkgs; [ tvdb-api ];
build-system = with pypkgs; [ setuptools ];
dependencies = with pypkgs; [ tvdb-api ];
# no tests from pypi
doCheck = false;
pythonImportsCheck = [ "tvnamer" ];
meta = with lib; {
description = "Automatic TV episode file renamer, uses data from thetvdb.com via tvdb_api";
homepage = "https://github.com/dbr/tvnamer";

Some files were not shown because too many files have changed in this diff Show More