diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e04546497dec..94fd8b1dbfb5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -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"; diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index fec3cf6e25ba..ea72486c0273 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -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). diff --git a/nixos/modules/hardware/fw-fanctrl.nix b/nixos/modules/hardware/fw-fanctrl.nix new file mode 100644 index 000000000000..27ab50be3179 --- /dev/null +++ b/nixos/modules/hardware/fw-fanctrl.nix @@ -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; + }; +} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e17e301b5c17..0ec81e5bcb7b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -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 diff --git a/nixos/modules/services/misc/klipper.nix b/nixos/modules/services/misc/klipper.nix index 78e7f35fed4e..d719bc511c52 100644 --- a/nixos/modules/services/misc/klipper.nix +++ b/nixos/modules/services/misc/klipper.nix @@ -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"; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 4664120c75db..7aa2dbdbdaf5 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -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; diff --git a/nixos/tests/flaresolverr.nix b/nixos/tests/flaresolverr.nix index dc92e03a0a60..184f57b78ff8 100644 --- a/nixos/tests/flaresolverr.nix +++ b/nixos/tests/flaresolverr.nix @@ -1,7 +1,7 @@ { lib, ... }: { name = "flaresolverr"; - meta.maintainers = with lib.maintainers; [ paveloom ]; + meta.maintainers = with lib.maintainers; [ ]; nodes.machine = { pkgs, ... }: diff --git a/nixos/tests/vscodium.nix b/nixos/tests/vscodium.nix index a3efd07bf501..8badad20b03c 100644 --- a/nixos/tests/vscodium.nix +++ b/nixos/tests/vscodium.nix @@ -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 diff --git a/nixos/tests/whisparr.nix b/nixos/tests/whisparr.nix index ee34aca18ce5..2d6d1bd9fb16 100644 --- a/nixos/tests/whisparr.nix +++ b/nixos/tests/whisparr.nix @@ -1,7 +1,7 @@ { lib, ... }: { name = "whisparr"; - meta.maintainers = [ lib.maintainers.paveloom ]; + meta.maintainers = [ ]; nodes.machine = { pkgs, ... }: diff --git a/pkgs/applications/emulators/libretro/cores/pcsx2.nix b/pkgs/applications/emulators/libretro/cores/pcsx2.nix index d4d618ca9883..f0623cf2d6b5 100644 --- a/pkgs/applications/emulators/libretro/cores/pcsx2.nix +++ b/pkgs/applications/emulators/libretro/cores/pcsx2.nix @@ -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; }; diff --git a/pkgs/build-support/php/build-pecl.nix b/pkgs/build-support/php/build-pecl.nix index 79faa2c7700a..be02be6c76ed 100644 --- a/pkgs/build-support/php/build-pecl.nix +++ b/pkgs/build-support/php/build-pecl.nix @@ -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 { }); }; } ) diff --git a/pkgs/by-name/_1/_1oom/package.nix b/pkgs/by-name/_1/_1oom/package.nix index 0be8e12228e0..6a49d1a9525d 100644 --- a/pkgs/by-name/_1/_1oom/package.nix +++ b/pkgs/by-name/_1/_1oom/package.nix @@ -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 = [ diff --git a/pkgs/by-name/ar/arcan/package.nix b/pkgs/by-name/ar/arcan/package.nix index 47f6f512dd8a..acff817af09b 100644 --- a/pkgs/by-name/ar/arcan/package.nix +++ b/pkgs/by-name/ar/arcan/package.nix @@ -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 { }, }: diff --git a/pkgs/by-name/ar/argo-workflows/package.nix b/pkgs/by-name/ar/argo-workflows/package.nix index 3d36652a968a..34961c75eb1b 100644 --- a/pkgs/by-name/ar/argo-workflows/package.nix +++ b/pkgs/by-name/ar/argo-workflows/package.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" diff --git a/pkgs/by-name/cp/cppcheck/package.nix b/pkgs/by-name/cp/cppcheck/package.nix index 9bcdedb354f8..265dead86b3a 100644 --- a/pkgs/by-name/cp/cppcheck/package.nix +++ b/pkgs/by-name/cp/cppcheck/package.nix @@ -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; }; }) diff --git a/pkgs/by-name/du/duf/package.nix b/pkgs/by-name/du/duf/package.nix index dce3c1588834..20ee29563a94 100644 --- a/pkgs/by-name/du/duf/package.nix +++ b/pkgs/by-name/du/duf/package.nix @@ -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"; }; -} +}) diff --git a/pkgs/by-name/ea/earthlyls/package.nix b/pkgs/by-name/ea/earthlyls/package.nix index 274c71c9d748..e149fed743cf 100644 --- a/pkgs/by-name/ea/earthlyls/package.nix +++ b/pkgs/by-name/ea/earthlyls/package.nix @@ -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; }; } diff --git a/pkgs/by-name/ed/eddie/package.nix b/pkgs/by-name/ed/eddie/package.nix index 735a3268aafa..104733fdb62a 100644 --- a/pkgs/by-name/ed/eddie/package.nix +++ b/pkgs/by-name/ed/eddie/package.nix @@ -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; }; } diff --git a/pkgs/by-name/fi/fido2-manage/package.nix b/pkgs/by-name/fi/fido2-manage/package.nix index b6440098e92f..f83f11ac2117 100644 --- a/pkgs/by-name/fi/fido2-manage/package.nix +++ b/pkgs/by-name/fi/fido2-manage/package.nix @@ -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="; diff --git a/pkgs/by-name/fl/flaresolverr/package.nix b/pkgs/by-name/fl/flaresolverr/package.nix index a3f6a17a21b8..a0b4eb546ab4 100644 --- a/pkgs/by-name/fl/flaresolverr/package.nix +++ b/pkgs/by-name/fl/flaresolverr/package.nix @@ -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; }; }) diff --git a/pkgs/by-name/fo/fopnu/package.nix b/pkgs/by-name/fo/fopnu/package.nix index dd5d825af329..fd8df2447f22 100644 --- a/pkgs/by-name/fo/fopnu/package.nix +++ b/pkgs/by-name/fo/fopnu/package.nix @@ -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" ]; }; } diff --git a/pkgs/by-name/fw/fw-fanctrl/package.nix b/pkgs/by-name/fw/fw-fanctrl/package.nix new file mode 100644 index 000000000000..172d67e7ad02 --- /dev/null +++ b/pkgs/by-name/fw/fw-fanctrl/package.nix @@ -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 ]; + }; +} diff --git a/pkgs/by-name/gh/gh-gei/package.nix b/pkgs/by-name/gh/gh-gei/package.nix index 73f360632092..928c4af1a0f1 100644 --- a/pkgs/by-name/gh/gh-gei/package.nix +++ b/pkgs/by-name/gh/gh-gei/package.nix @@ -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; diff --git a/pkgs/by-name/go/gobetween/gomod.patch b/pkgs/by-name/go/gobetween/gomod.patch deleted file mode 100644 index 2f0fb408061f..000000000000 --- a/pkgs/by-name/go/gobetween/gomod.patch +++ /dev/null @@ -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 diff --git a/pkgs/by-name/go/gobetween/package.nix b/pkgs/by-name/go/gobetween/package.nix index ca795661eeee..27f5eb3f04b7 100644 --- a/pkgs/by-name/go/gobetween/package.nix +++ b/pkgs/by-name/go/gobetween/package.nix @@ -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"; }; -} +}) diff --git a/pkgs/by-name/go/gojq/package.nix b/pkgs/by-name/go/gojq/package.nix index 895730ce9e0a..bc9946df3589 100644 --- a/pkgs/by-name/go/gojq/package.nix +++ b/pkgs/by-name/go/gojq/package.nix @@ -47,7 +47,6 @@ buildGoModule (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ xiaoxiangmoe - aaronjheng ]; mainProgram = "gojq"; }; diff --git a/pkgs/by-name/gr/gr-framework/package.nix b/pkgs/by-name/gr/gr-framework/package.nix index 51d63e78d187..86f7c5e9ea79 100644 --- a/pkgs/by-name/gr/gr-framework/package.nix +++ b/pkgs/by-name/gr/gr-framework/package.nix @@ -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; }; } diff --git a/pkgs/by-name/hy/hyprwayland-scanner/package.nix b/pkgs/by-name/hy/hyprwayland-scanner/package.nix index 448a2e85dc2f..3872937acfa2 100644 --- a/pkgs/by-name/hy/hyprwayland-scanner/package.nix +++ b/pkgs/by-name/hy/hyprwayland-scanner/package.nix @@ -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 = [ diff --git a/pkgs/by-name/io/ios-safari-remote-debug/package.nix b/pkgs/by-name/io/ios-safari-remote-debug/package.nix index 216c4ed15cdd..47f3f6d973ad 100644 --- a/pkgs/by-name/io/ios-safari-remote-debug/package.nix +++ b/pkgs/by-name/io/ios-safari-remote-debug/package.nix @@ -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; [ ]; }; } diff --git a/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix b/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix index 416af017b6cd..82595e3be187 100644 --- a/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix +++ b/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix @@ -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 ]; }; }) diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix index d90826440ed6..e0f7d270d397 100644 --- a/pkgs/by-name/la/lazygit/package.nix +++ b/pkgs/by-name/la/lazygit/package.nix @@ -45,7 +45,6 @@ buildGoModule rec { Br1ght0ne equirosa khaneliman - paveloom starsep sigmasquadron ]; diff --git a/pkgs/by-name/ma/maa-assistant-arknights/pin.json b/pkgs/by-name/ma/maa-assistant-arknights/pin.json index 6f84e60cb1de..dd5286e659bd 100644 --- a/pkgs/by-name/ma/maa-assistant-arknights/pin.json +++ b/pkgs/by-name/ma/maa-assistant-arknights/pin.json @@ -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=" } } diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix index a1abc3ab407d..b41bb53baee4 100644 --- a/pkgs/by-name/me/mergiraf/package.nix +++ b/pkgs/by-name/me/mergiraf/package.nix @@ -31,6 +31,12 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckProgramArg = "--version"; + cargoBuildFlags = [ + # don't install the `mgf_dev` + "--bin" + "mergiraf" + ]; + passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/me/mesonlsp/package.nix b/pkgs/by-name/me/mesonlsp/package.nix index 2c67abb0968a..40977ad93a5c 100644 --- a/pkgs/by-name/me/mesonlsp/package.nix +++ b/pkgs/by-name/me/mesonlsp/package.nix @@ -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; diff --git a/pkgs/by-name/mi/misskey/package.nix b/pkgs/by-name/mi/misskey/package.nix index 6fe2fe4d4be5..0cabaa810bbf 100644 --- a/pkgs/by-name/mi/misskey/package.nix +++ b/pkgs/by-name/mi/misskey/package.nix @@ -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"; }; diff --git a/pkgs/by-name/mo/mold/package.nix b/pkgs/by-name/mo/mold/package.nix index 89437aa7034b..85c09132b6ae 100644 --- a/pkgs/by-name/mo/mold/package.nix +++ b/pkgs/by-name/mo/mold/package.nix @@ -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 ]; }; }) diff --git a/pkgs/by-name/mo/morewaita-icon-theme/package.nix b/pkgs/by-name/mo/morewaita-icon-theme/package.nix index 4550ba0ea206..76885e8baaf8 100644 --- a/pkgs/by-name/mo/morewaita-icon-theme/package.nix +++ b/pkgs/by-name/mo/morewaita-icon-theme/package.nix @@ -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 = '' diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/by-name/mp/mpc-qt/package.nix similarity index 57% rename from pkgs/applications/video/mpc-qt/default.nix rename to pkgs/by-name/mp/mpc-qt/package.nix index 7868257ffda7..1d4ebaf8bf68 100644 --- a/pkgs/applications/video/mpc-qt/default.nix +++ b/pkgs/by-name/mp/mpc-qt/package.nix @@ -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"; }; -} +}) diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix index aa0ca52f32d8..9c54b6b68acd 100644 --- a/pkgs/by-name/ph/phpunit/package.nix +++ b/pkgs/by-name/ph/phpunit/package.nix @@ -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 { }; diff --git a/pkgs/by-name/pr/prometheus-solaredge-exporter/package.nix b/pkgs/by-name/pr/prometheus-solaredge-exporter/package.nix index 8e7913871c85..032b3d222d83 100644 --- a/pkgs/by-name/pr/prometheus-solaredge-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-solaredge-exporter/package.nix @@ -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 { }; diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix index 4a6e1c0c0a41..bab83e3a3fb2 100644 --- a/pkgs/by-name/pr/proton-ge-bin/package.nix +++ b/pkgs/by-name/pr/proton-ge-bin/package.nix @@ -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; diff --git a/pkgs/by-name/pv/pvs-studio/package.nix b/pkgs/by-name/pv/pvs-studio/package.nix index 626b4e16f7d1..8789344023e5 100644 --- a/pkgs/by-name/pv/pvs-studio/package.nix +++ b/pkgs/by-name/pv/pvs-studio/package.nix @@ -77,6 +77,6 @@ stdenv.mkDerivation rec { "x86_64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with lib.maintainers; [ paveloom ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/by-name/r1/r128gain/package.nix b/pkgs/by-name/r1/r128gain/package.nix index 4c0ba8d99749..f487be2b4cfd 100644 --- a/pkgs/by-name/r1/r128gain/package.nix +++ b/pkgs/by-name/r1/r128gain/package.nix @@ -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; { diff --git a/pkgs/by-name/ra/raiseorlaunch/package.nix b/pkgs/by-name/ra/raiseorlaunch/package.nix index 80d5dba11cea..f1a8a9d51bab 100644 --- a/pkgs/by-name/ra/raiseorlaunch/package.nix +++ b/pkgs/by-name/ra/raiseorlaunch/package.nix @@ -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 diff --git a/pkgs/by-name/rd/rdiff-backup/package.nix b/pkgs/by-name/rd/rdiff-backup/package.nix index 7045656a10c8..facc5b257e8e 100644 --- a/pkgs/by-name/rd/rdiff-backup/package.nix +++ b/pkgs/by-name/rd/rdiff-backup/package.nix @@ -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"; diff --git a/pkgs/by-name/re/redfishtool/package.nix b/pkgs/by-name/re/redfishtool/package.nix index 51a1c781d4a8..029617a616a9 100644 --- a/pkgs/by-name/re/redfishtool/package.nix +++ b/pkgs/by-name/re/redfishtool/package.nix @@ -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"; diff --git a/pkgs/by-name/re/redisinsight/package.nix b/pkgs/by-name/re/redisinsight/package.nix index 9f8c88f2b136..9e60587cda32 100644 --- a/pkgs/by-name/re/redisinsight/package.nix +++ b/pkgs/by-name/re/redisinsight/package.nix @@ -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 = [ diff --git a/pkgs/by-name/re/redlib/package.nix b/pkgs/by-name/re/redlib/package.nix index b5c569a9f01f..de988ae8e4a9 100644 --- a/pkgs/by-name/re/redlib/package.nix +++ b/pkgs/by-name/re/redlib/package.nix @@ -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 = { diff --git a/pkgs/by-name/re/regexploit/package.nix b/pkgs/by-name/re/regexploit/package.nix index 62576425b164..8e9ecc549f05 100644 --- a/pkgs/by-name/re/regexploit/package.nix +++ b/pkgs/by-name/re/regexploit/package.nix @@ -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 ]; diff --git a/pkgs/by-name/re/replacement/package.nix b/pkgs/by-name/re/replacement/package.nix index 104ad16a2f2f..60443b2d2400 100644 --- a/pkgs/by-name/re/replacement/package.nix +++ b/pkgs/by-name/re/replacement/package.nix @@ -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 ]; diff --git a/pkgs/by-name/re/restate/package.nix b/pkgs/by-name/re/restate/package.nix index 708a2ee0375a..796761afc7ae 100644 --- a/pkgs/by-name/re/restate/package.nix +++ b/pkgs/by-name/re/restate/package.nix @@ -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"; diff --git a/pkgs/by-name/rf/rfc-bibtex/package.nix b/pkgs/by-name/rf/rfc-bibtex/package.nix index e594574388bc..3ca11ac923cf 100644 --- a/pkgs/by-name/rf/rfc-bibtex/package.nix +++ b/pkgs/by-name/rf/rfc-bibtex/package.nix @@ -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 ]; diff --git a/pkgs/by-name/ri/ripe-atlas-tools/package.nix b/pkgs/by-name/ri/ripe-atlas-tools/package.nix index 196b7983e2aa..180750393089 100644 --- a/pkgs/by-name/ri/ripe-atlas-tools/package.nix +++ b/pkgs/by-name/ri/ripe-atlas-tools/package.nix @@ -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 diff --git a/pkgs/by-name/ri/rivalcfg/package.nix b/pkgs/by-name/ri/rivalcfg/package.nix index 669883f0a83b..7618d7e3a65e 100644 --- a/pkgs/by-name/ri/rivalcfg/package.nix +++ b/pkgs/by-name/ri/rivalcfg/package.nix @@ -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"; diff --git a/pkgs/by-name/ro/rofi-mpd/package.nix b/pkgs/by-name/ro/rofi-mpd/package.nix index 806b6a2169d4..7fa82ef3b53a 100644 --- a/pkgs/by-name/ro/rofi-mpd/package.nix +++ b/pkgs/by-name/ro/rofi-mpd/package.nix @@ -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 diff --git a/pkgs/by-name/s3/s3bro/package.nix b/pkgs/by-name/s3/s3bro/package.nix index fb5b8e8237e6..f8d5caff902e 100644 --- a/pkgs/by-name/s3/s3bro/package.nix +++ b/pkgs/by-name/s3/s3bro/package.nix @@ -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 diff --git a/pkgs/by-name/s4/s4cmd/package.nix b/pkgs/by-name/s4/s4cmd/package.nix index 2c2cf486757f..ef5ff67afc13 100644 --- a/pkgs/by-name/s4/s4cmd/package.nix +++ b/pkgs/by-name/s4/s4cmd/package.nix @@ -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"; diff --git a/pkgs/by-name/sa/safeeyes/package.nix b/pkgs/by-name/sa/safeeyes/package.nix index 5e87488b9fb2..dcce05e55338 100644 --- a/pkgs/by-name/sa/safeeyes/package.nix +++ b/pkgs/by-name/sa/safeeyes/package.nix @@ -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; { diff --git a/pkgs/by-name/sa/savepagenow/package.nix b/pkgs/by-name/sa/savepagenow/package.nix index 5875b96cce19..4be414d2f8c2 100644 --- a/pkgs/by-name/sa/savepagenow/package.nix +++ b/pkgs/by-name/sa/savepagenow/package.nix @@ -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"; diff --git a/pkgs/by-name/sc/sca2d/package.nix b/pkgs/by-name/sc/sca2d/package.nix index 4cca153e6f95..f18a765769c2 100644 --- a/pkgs/by-name/sc/sca2d/package.nix +++ b/pkgs/by-name/sc/sca2d/package.nix @@ -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 ]; diff --git a/pkgs/by-name/sc/screenkey/package.nix b/pkgs/by-name/sc/screenkey/package.nix index c5b02d2d8cc0..7a6a15c732b5 100644 --- a/pkgs/by-name/sc/screenkey/package.nix +++ b/pkgs/by-name/sc/screenkey/package.nix @@ -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; { diff --git a/pkgs/by-name/se/seashells/package.nix b/pkgs/by-name/se/seashells/package.nix index c190a458fbce..d4c6e663166a 100644 --- a/pkgs/by-name/se/seashells/package.nix +++ b/pkgs/by-name/se/seashells/package.nix @@ -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" ]; diff --git a/pkgs/by-name/se/semiphemeral/package.nix b/pkgs/by-name/se/semiphemeral/package.nix index 2cc721a2228b..90f419d35432 100644 --- a/pkgs/by-name/se/semiphemeral/package.nix +++ b/pkgs/by-name/se/semiphemeral/package.nix @@ -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 diff --git a/pkgs/by-name/se/serious-sam-classic-vulkan/package.nix b/pkgs/by-name/se/serious-sam-classic-vulkan/package.nix new file mode 100644 index 000000000000..48d47f5c5d05 --- /dev/null +++ b/pkgs/by-name/se/serious-sam-classic-vulkan/package.nix @@ -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 ]; +}) diff --git a/pkgs/by-name/se/serious-sam-classic/package.nix b/pkgs/by-name/se/serious-sam-classic/package.nix new file mode 100644 index 000000000000..12ae5fb92617 --- /dev/null +++ b/pkgs/by-name/se/serious-sam-classic/package.nix @@ -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 ]; + }; +}) diff --git a/pkgs/by-name/se/serious-sam-classic/tfe-fix-cmake-libdir-override.patch b/pkgs/by-name/se/serious-sam-classic/tfe-fix-cmake-libdir-override.patch new file mode 100644 index 000000000000..af5f3008b906 --- /dev/null +++ b/pkgs/by-name/se/serious-sam-classic/tfe-fix-cmake-libdir-override.patch @@ -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}") diff --git a/pkgs/by-name/se/serious-sam-classic/tfe-force-using-system-path.patch b/pkgs/by-name/se/serious-sam-classic/tfe-force-using-system-path.patch new file mode 100644 index 000000000000..a48c2f18185a --- /dev/null +++ b/pkgs/by-name/se/serious-sam-classic/tfe-force-using-system-path.patch @@ -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; diff --git a/pkgs/by-name/se/serious-sam-classic/tse-fix-cmake-libdir-override.patch b/pkgs/by-name/se/serious-sam-classic/tse-fix-cmake-libdir-override.patch new file mode 100644 index 000000000000..fda65a255291 --- /dev/null +++ b/pkgs/by-name/se/serious-sam-classic/tse-fix-cmake-libdir-override.patch @@ -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}") diff --git a/pkgs/by-name/se/serious-sam-classic/tse-force-using-system-path.patch b/pkgs/by-name/se/serious-sam-classic/tse-force-using-system-path.patch new file mode 100644 index 000000000000..71aa14e16eb9 --- /dev/null +++ b/pkgs/by-name/se/serious-sam-classic/tse-force-using-system-path.patch @@ -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; diff --git a/pkgs/by-name/se/seventeenlands/package.nix b/pkgs/by-name/se/seventeenlands/package.nix index 649a5280e464..0691a82035ee 100644 --- a/pkgs/by-name/se/seventeenlands/package.nix +++ b/pkgs/by-name/se/seventeenlands/package.nix @@ -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 diff --git a/pkgs/by-name/se/sewer/package.nix b/pkgs/by-name/se/sewer/package.nix index 17049eb5db10..d2a6240f48fe 100644 --- a/pkgs/by-name/se/sewer/package.nix +++ b/pkgs/by-name/se/sewer/package.nix @@ -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"; diff --git a/pkgs/by-name/sf/sftpman/package.nix b/pkgs/by-name/sf/sftpman/package.nix index 26ea3d4b7e40..db9b5143c296 100644 --- a/pkgs/by-name/sf/sftpman/package.nix +++ b/pkgs/by-name/sf/sftpman/package.nix @@ -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"; diff --git a/pkgs/by-name/sh/shot-scraper/package.nix b/pkgs/by-name/sh/shot-scraper/package.nix index 86a921b1042b..5f3ff70cf52f 100644 --- a/pkgs/by-name/sh/shot-scraper/package.nix +++ b/pkgs/by-name/sh/shot-scraper/package.nix @@ -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 diff --git a/pkgs/by-name/so/soco-cli/package.nix b/pkgs/by-name/so/soco-cli/package.nix index edf5ffc461fe..434b6a2dd167 100644 --- a/pkgs/by-name/so/soco-cli/package.nix +++ b/pkgs/by-name/so/soco-cli/package.nix @@ -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 diff --git a/pkgs/by-name/so/sonata/package.nix b/pkgs/by-name/so/sonata/package.nix index 46e2504fae87..0e2f2ca7d74c 100644 --- a/pkgs/by-name/so/sonata/package.nix +++ b/pkgs/by-name/so/sonata/package.nix @@ -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 = '' diff --git a/pkgs/by-name/sq/sqlite-web/package.nix b/pkgs/by-name/sq/sqlite-web/package.nix index 6dea15352a99..b1128260999b 100644 --- a/pkgs/by-name/sq/sqlite-web/package.nix +++ b/pkgs/by-name/sq/sqlite-web/package.nix @@ -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"; diff --git a/pkgs/by-name/st/streamrip/package.nix b/pkgs/by-name/st/streamrip/package.nix index 9fa90e8b6603..262c50c9d374 100644 --- a/pkgs/by-name/st/streamrip/package.nix +++ b/pkgs/by-name/st/streamrip/package.nix @@ -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"; }; } diff --git a/pkgs/by-name/su/substudy/package.nix b/pkgs/by-name/su/substudy/package.nix index 681ea499573d..bd07b08eaf9b 100644 --- a/pkgs/by-name/su/substudy/package.nix +++ b/pkgs/by-name/su/substudy/package.nix @@ -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; [ ]; }; } diff --git a/pkgs/by-name/su/subtitleedit/package.nix b/pkgs/by-name/su/subtitleedit/package.nix index 23df1771fed7..f194f593f3f8 100644 --- a/pkgs/by-name/su/subtitleedit/package.nix +++ b/pkgs/by-name/su/subtitleedit/package.nix @@ -95,6 +95,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.all; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ paveloom ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/by-name/sw/swaggerhole/package.nix b/pkgs/by-name/sw/swaggerhole/package.nix index d1311c61fd8f..a6d6868ff1c0 100644 --- a/pkgs/by-name/sw/swaggerhole/package.nix +++ b/pkgs/by-name/sw/swaggerhole/package.nix @@ -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 ]; diff --git a/pkgs/by-name/sw/swaglyrics/package.nix b/pkgs/by-name/sw/swaglyrics/package.nix index b2e567afc5cf..5c4e6031286b 100644 --- a/pkgs/by-name/sw/swaglyrics/package.nix +++ b/pkgs/by-name/sw/swaglyrics/package.nix @@ -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 diff --git a/pkgs/by-name/sw/swaynotificationcenter/package.nix b/pkgs/by-name/sw/swaynotificationcenter/package.nix index e9eb571eea4f..1248027bfcef 100644 --- a/pkgs/by-name/sw/swaynotificationcenter/package.nix +++ b/pkgs/by-name/sw/swaynotificationcenter/package.nix @@ -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 ]; diff --git a/pkgs/by-name/sy/syft/package.nix b/pkgs/by-name/sy/syft/package.nix index a413fc4fa962..f514586713bf 100644 --- a/pkgs/by-name/sy/syft/package.nix +++ b/pkgs/by-name/sy/syft/package.nix @@ -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 ]; diff --git a/pkgs/by-name/sy/syncrclone/package.nix b/pkgs/by-name/sy/syncrclone/package.nix index d5fd5968f0e9..a23ae28d8e71 100644 --- a/pkgs/by-name/sy/syncrclone/package.nix +++ b/pkgs/by-name/sy/syncrclone/package.nix @@ -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" ]; diff --git a/pkgs/by-name/sy/systemd-wait/package.nix b/pkgs/by-name/sy/systemd-wait/package.nix index d5e054ccb14b..a19db9b7acf5 100644 --- a/pkgs/by-name/sy/systemd-wait/package.nix +++ b/pkgs/by-name/sy/systemd-wait/package.nix @@ -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 ]; diff --git a/pkgs/by-name/ta/tauon/package.nix b/pkgs/by-name/ta/tauon/package.nix index b4c8ac5cbac5..d302aa1650b2 100644 --- a/pkgs/by-name/ta/tauon/package.nix +++ b/pkgs/by-name/ta/tauon/package.nix @@ -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" ]; }; diff --git a/pkgs/by-name/te/tebreak/package.nix b/pkgs/by-name/te/tebreak/package.nix index 40ad4527916e..1a8107b35310 100644 --- a/pkgs/by-name/te/tebreak/package.nix +++ b/pkgs/by-name/te/tebreak/package.nix @@ -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"; diff --git a/pkgs/by-name/te/temporal-cli/package.nix b/pkgs/by-name/te/temporal-cli/package.nix index c9da5beb625d..69360a910be4 100644 --- a/pkgs/by-name/te/temporal-cli/package.nix +++ b/pkgs/by-name/te/temporal-cli/package.nix @@ -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"; diff --git a/pkgs/by-name/te/terminator/package.nix b/pkgs/by-name/te/terminator/package.nix index 80ca31f6ccc6..22c84eb5d36e 100644 --- a/pkgs/by-name/te/terminator/package.nix +++ b/pkgs/by-name/te/terminator/package.nix @@ -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 diff --git a/pkgs/by-name/te/termtosvg/package.nix b/pkgs/by-name/te/termtosvg/package.nix index 038168c53a56..5b30ecef9a4e 100644 --- a/pkgs/by-name/te/termtosvg/package.nix +++ b/pkgs/by-name/te/termtosvg/package.nix @@ -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"; diff --git a/pkgs/by-name/te/terraform-compliance/package.nix b/pkgs/by-name/te/terraform-compliance/package.nix index 2edb96777f3b..0ab9c03badb4 100644 --- a/pkgs/by-name/te/terraform-compliance/package.nix +++ b/pkgs/by-name/te/terraform-compliance/package.nix @@ -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 diff --git a/pkgs/by-name/th/thonny/package.nix b/pkgs/by-name/th/thonny/package.nix index c99854b9adaa..0a8b0cc8b0d9 100644 --- a/pkgs/by-name/th/thonny/package.nix +++ b/pkgs/by-name/th/thonny/package.nix @@ -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 = '' diff --git a/pkgs/by-name/ti/timetagger_cli/package.nix b/pkgs/by-name/ti/timetagger_cli/package.nix index 55cd89448477..a3edce502af7 100644 --- a/pkgs/by-name/ti/timetagger_cli/package.nix +++ b/pkgs/by-name/ti/timetagger_cli/package.nix @@ -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"; diff --git a/pkgs/by-name/ti/tinyprog/package.nix b/pkgs/by-name/ti/tinyprog/package.nix index a57d25473b6f..a0d7cf880a40 100644 --- a/pkgs/by-name/ti/tinyprog/package.nix +++ b/pkgs/by-name/ti/tinyprog/package.nix @@ -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"; diff --git a/pkgs/by-name/to/tockloader/package.nix b/pkgs/by-name/to/tockloader/package.nix index 5f8f6f710bae..32b6181c6f57 100644 --- a/pkgs/by-name/to/tockloader/package.nix +++ b/pkgs/by-name/to/tockloader/package.nix @@ -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"; diff --git a/pkgs/by-name/tr/tracy/package.nix b/pkgs/by-name/tr/tracy/package.nix index 2fcf417165a0..61cae96e1104 100644 --- a/pkgs/by-name/tr/tracy/package.nix +++ b/pkgs/by-name/tr/tracy/package.nix @@ -129,7 +129,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ mpickering nagisa - paveloom ]; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/by-name/tr/traefik/package.nix b/pkgs/by-name/tr/traefik/package.nix index 32a0693eee8a..ab792f8f5b3e 100644 --- a/pkgs/by-name/tr/traefik/package.nix +++ b/pkgs/by-name/tr/traefik/package.nix @@ -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" ]; diff --git a/pkgs/by-name/tr/trash-cli/package.nix b/pkgs/by-name/tr/trash-cli/package.nix index b86a434cb10c..b645d5a3ec78 100644 --- a/pkgs/by-name/tr/trash-cli/package.nix +++ b/pkgs/by-name/tr/trash-cli/package.nix @@ -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" \ diff --git a/pkgs/by-name/tu/tuir/package.nix b/pkgs/by-name/tu/tuir/package.nix index 7570298cb6c8..638d639a9e38 100644 --- a/pkgs/by-name/tu/tuir/package.nix +++ b/pkgs/by-name/tu/tuir/package.nix @@ -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..open_url_silent' + "test_terminal_open_browser_display" + ]; + + pythonImportsCheck = [ "tuir" ]; + meta = with lib; { description = "Browse Reddit from your Terminal (fork of rtv)"; mainProgram = "tuir"; diff --git a/pkgs/by-name/tv/tvnamer/package.nix b/pkgs/by-name/tv/tvnamer/package.nix index 1141a473d643..c5e83e3ab788 100644 --- a/pkgs/by-name/tv/tvnamer/package.nix +++ b/pkgs/by-name/tv/tvnamer/package.nix @@ -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"; diff --git a/pkgs/by-name/tx/txt2tags/package.nix b/pkgs/by-name/tx/txt2tags/package.nix index 7f8a028cbd7d..59213b1913ea 100644 --- a/pkgs/by-name/tx/txt2tags/package.nix +++ b/pkgs/by-name/tx/txt2tags/package.nix @@ -8,7 +8,7 @@ python3.pkgs.buildPythonApplication rec { pname = "txt2tags"; version = "3.9"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "txt2tags"; @@ -17,17 +17,21 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-PwPGJJg79ny13gEb1WmgIVHcXQppI/j5mhIyOZjR19k="; }; + build-system = with python3.pkgs; [ setuptools ]; + postPatch = '' substituteInPlace test/lib.py \ - --replace 'TXT2TAGS = os.path.join(TEST_DIR, "..", "txt2tags.py")' \ - 'TXT2TAGS = "${placeholder "out"}/bin/txt2tags"' \ - --replace "[PYTHON] + TXT2TAGS" "TXT2TAGS" + --replace-fail 'TXT2TAGS = os.path.join(TEST_DIR, "..", "txt2tags.py")' \ + 'TXT2TAGS = "${placeholder "out"}/bin/txt2tags"' \ + --replace-fail "[PYTHON] + TXT2TAGS" "TXT2TAGS" ''; checkPhase = '' ${python3.interpreter} test/run.py ''; + pythonImportsCheck = [ "txt2tags" ]; + meta = { changelog = "https://github.com/txt2tags/txt2tags/blob/${src.rev}/CHANGELOG.md"; description = "Convert between markup languages"; diff --git a/pkgs/by-name/ud/uddup/package.nix b/pkgs/by-name/ud/uddup/package.nix index 9f8ec15df2cf..1975e0d73274 100644 --- a/pkgs/by-name/ud/uddup/package.nix +++ b/pkgs/by-name/ud/uddup/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "uddup"; version = "0.9.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "rotemreiss"; @@ -16,7 +16,11 @@ python3.pkgs.buildPythonApplication rec { sha256 = "1f5dm3772hiik9irnyvbs7wygcafbwi7czw3b47cwhb90b8fi5hg"; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ + setuptools + ]; + + dependencies = with python3.pkgs; [ colorama ]; diff --git a/pkgs/by-name/ud/udocker/package.nix b/pkgs/by-name/ud/udocker/package.nix index bc87553651ec..49be910c01b3 100644 --- a/pkgs/by-name/ud/udocker/package.nix +++ b/pkgs/by-name/ud/udocker/package.nix @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { pname = "udocker"; version = "1.3.17"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "indigo-dc"; @@ -30,6 +30,10 @@ python3Packages.buildPythonApplication rec { singularity ]; + build-system = with python3Packages; [ + setuptools + ]; + dependencies = with python3Packages; [ pycurl ]; @@ -49,6 +53,8 @@ python3Packages.buildPythonApplication rec { "tests/unit/test_dockerioapi.py" ]; + pythonImportsCheck = [ "udocker" ]; + passthru = { tests.version = testers.testVersion { package = udocker; }; }; diff --git a/pkgs/by-name/ul/ulauncher/package.nix b/pkgs/by-name/ul/ulauncher/package.nix index b7b6e1f74baf..c9fdbcf6defa 100644 --- a/pkgs/by-name/ul/ulauncher/package.nix +++ b/pkgs/by-name/ul/ulauncher/package.nix @@ -23,15 +23,14 @@ python3Packages.buildPythonApplication rec { pname = "ulauncher"; version = "5.15.7"; - format = "setuptools"; + pyproject = true; src = fetchurl { url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz"; hash = "sha256-YgOw3Gyy/o8qorWAnAlQrAZ2ZTnyP3PagLs2Qkdg788="; }; - nativeBuildInputs = with python3Packages; [ - distutils-extra + nativeBuildInputs = [ gobject-introspection intltool wrapGAppsHook3 @@ -50,7 +49,12 @@ python3Packages.buildPythonApplication rec { wmctrl ]; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ + setuptools + distutils-extra + ]; + + dependencies = with python3Packages; [ mock dbus-python pygobject3 @@ -102,6 +106,8 @@ python3Packages.buildPythonApplication rec { runHook postCheck ''; + pythonImportsCheck = [ "ulauncher" ]; + # do not double wrap dontWrapGApps = true; preFixup = '' diff --git a/pkgs/by-name/un/undervolt/package.nix b/pkgs/by-name/un/undervolt/package.nix index 3b75f468ca08..b00041ba1124 100644 --- a/pkgs/by-name/un/undervolt/package.nix +++ b/pkgs/by-name/un/undervolt/package.nix @@ -5,9 +5,9 @@ }: python3Packages.buildPythonApplication rec { - version = "0.4.0"; - format = "setuptools"; pname = "undervolt"; + version = "0.4.0"; + pyproject = true; src = fetchFromGitHub { owner = "georgewhewell"; @@ -16,6 +16,10 @@ python3Packages.buildPythonApplication rec { hash = "sha256-G+CK/lnZXkQdyNZPqY9P3owVJsd22H3K8wSpjHFG0ow="; }; + build-system = with python3Packages; [ setuptools ]; + + pythonImportsCheck = [ "undervolt" ]; + meta = with lib; { homepage = "https://github.com/georgewhewell/undervolt/"; description = "Program for undervolting Intel CPUs on Linux"; diff --git a/pkgs/by-name/un/undetected-chromedriver/package.nix b/pkgs/by-name/un/undetected-chromedriver/package.nix index 844bbe3b069c..4bf725552fad 100644 --- a/pkgs/by-name/un/undetected-chromedriver/package.nix +++ b/pkgs/by-name/un/undetected-chromedriver/package.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation (finalAttrs: { meta = chromedriver.meta // { description = "Custom Selenium ChromeDriver that passes all bot mitigation systems"; mainProgram = "undetected-chromedriver"; - maintainers = with lib.maintainers; [ paveloom ]; + maintainers = with lib.maintainers; [ ]; }; }) diff --git a/pkgs/by-name/un/unicode-paracode/package.nix b/pkgs/by-name/un/unicode-paracode/package.nix index 004eab28cce9..2b3ac152a4ce 100644 --- a/pkgs/by-name/un/unicode-paracode/package.nix +++ b/pkgs/by-name/un/unicode-paracode/package.nix @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { pname = "unicode"; version = "2.9"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "garabik"; @@ -26,9 +26,11 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ installShellFiles ]; + build-system = with python3Packages; [ setuptools ]; + postFixup = '' substituteInPlace "$out/bin/.unicode-wrapped" \ - --replace "/usr/share/unicode/UnicodeData.txt" "$ucdtxt" + --replace-fail "/usr/share/unicode/UnicodeData.txt" "$ucdtxt" ''; postInstall = '' diff --git a/pkgs/by-name/un/unsilence/package.nix b/pkgs/by-name/un/unsilence/package.nix index 02784951d806..4b7a8077bc70 100644 --- a/pkgs/by-name/un/unsilence/package.nix +++ b/pkgs/by-name/un/unsilence/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonPackage rec { pname = "unsilence"; version = "1.0.9"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "lagmoellertim"; @@ -16,13 +16,12 @@ python3Packages.buildPythonPackage rec { hash = "sha256-M4Ek1JZwtr7vIg14aTa8h4otIZnPQfKNH4pZE4GpiBQ="; }; - nativeBuildInputs = with python3Packages; [ - rich + build-system = with python3Packages; [ + setuptools ]; - propagatedBuildInputs = [ - python3Packages.rich - python3Packages.setuptools # imports pkg_resources.parse_version + dependencies = with python3Packages; [ + rich ]; makeWrapperArgs = [ diff --git a/pkgs/by-name/ur/urlwatch/package.nix b/pkgs/by-name/ur/urlwatch/package.nix index d653389865c4..972cd24c1cfd 100644 --- a/pkgs/by-name/ur/urlwatch/package.nix +++ b/pkgs/by-name/ur/urlwatch/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { pname = "urlwatch"; version = "2.29"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "thp"; @@ -16,7 +16,9 @@ python3Packages.buildPythonApplication rec { hash = "sha256-X1UR9JrQuujOIUg87W0YqfXsM3A5nttWjjJMIe3hgk8="; }; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ cssselect jq keyring @@ -35,6 +37,8 @@ python3Packages.buildPythonApplication rec { # no tests doCheck = false; + pythonImportsCheck = [ "urlwatch" ]; + meta = with lib; { description = "Tool for monitoring webpages for updates"; mainProgram = "urlwatch"; diff --git a/pkgs/by-name/us/usbrip/package.nix b/pkgs/by-name/us/usbrip/package.nix index f44552e5c236..9c07a2002f03 100644 --- a/pkgs/by-name/us/usbrip/package.nix +++ b/pkgs/by-name/us/usbrip/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication { pname = "usbrip"; version = "unstable-2021-07-02"; - format = "setuptools"; + pyproject = true; disabled = python3.pythonOlder "3.6"; @@ -18,7 +18,9 @@ python3.pkgs.buildPythonApplication { sha256 = "1vws8ybhv7szpqvlbmv0hrkys2fhhaa5bj9dywv3q2y1xmljl0py"; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ termcolor terminaltables tqdm @@ -27,9 +29,8 @@ python3.pkgs.buildPythonApplication { postPatch = '' # Remove install helpers which we don't need substituteInPlace setup.py \ - --replace "parse_requirements('requirements.txt')," "[]," \ - --replace "resolve('wheel')" "" \ - --replace "'install': LocalInstallCommand," "" + --replace-fail "resolve('wheel')" "" \ + --replace-fail "'install': LocalInstallCommand," "" ''; # Project has no tests diff --git a/pkgs/by-name/us/usbsdmux/package.nix b/pkgs/by-name/us/usbsdmux/package.nix index cbdc49f19418..26945b0c8e98 100644 --- a/pkgs/by-name/us/usbsdmux/package.nix +++ b/pkgs/by-name/us/usbsdmux/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "usbsdmux"; version = "24.1.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -22,6 +22,8 @@ python3Packages.buildPythonApplication rec { --replace-fail 'TAG+="uaccess", GROUP="plugdev"' 'TAG+="uaccess"' ''; + build-system = with python3Packages; [ setuptools ]; + nativeBuildInputs = [ udevCheckHook ]; @@ -32,6 +34,8 @@ python3Packages.buildPythonApplication rec { install -Dm0444 -t $out/lib/udev/rules.d/ contrib/udev/99-usbsdmux.rules ''; + pythonImportsCheck = [ "usbsdmux" ]; + meta = with lib; { description = "Control software for the LXA USB-SD-Mux"; homepage = "https://github.com/linux-automation/usbsdmux"; diff --git a/pkgs/by-name/va/vanguards/package.nix b/pkgs/by-name/va/vanguards/package.nix index f1b81fc4e699..6f2f77c941d5 100644 --- a/pkgs/by-name/va/vanguards/package.nix +++ b/pkgs/by-name/va/vanguards/package.nix @@ -6,7 +6,9 @@ python312Packages.buildPythonApplication { pname = "vanguards"; version = "0.3.1-unstable-2023-10-31"; - format = "setuptools"; + pyproject = true; + + build-system = [ python312Packages.setuptools ]; dependencies = [ python312Packages.stem ]; #tries to access the network during the tests, which fails @@ -25,6 +27,8 @@ python312Packages.buildPythonApplication { 'import stem.response.events' 'import stem.socket; import stem.control; import stem.response.events' ''; + pythonImportsCheck = [ "vanguards" ]; + meta = { maintainers = with lib.maintainers; [ ForgottenBeast ]; mainProgram = "vanguards"; diff --git a/pkgs/by-name/va/variety/package.nix b/pkgs/by-name/va/variety/package.nix index 4515739d0598..3ab710244956 100644 --- a/pkgs/by-name/va/variety/package.nix +++ b/pkgs/by-name/va/variety/package.nix @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { pname = "variety"; version = "0.8.13"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "varietywalls"; @@ -46,6 +46,8 @@ python3Packages.buildPythonApplication rec { librsvg ] ++ lib.optional appindicatorSupport libayatana-appindicator; + build-system = with python3Packages; [ setuptools ]; + dependencies = with python3Packages; [ @@ -85,6 +87,8 @@ python3Packages.buildPythonApplication rec { --replace-fail "{VARIETY_PATH}" "variety" ''; + pythonImportsCheck = [ "variety" ]; + meta = { homepage = "https://github.com/varietywalls/variety"; description = "Wallpaper manager for Linux systems"; diff --git a/pkgs/by-name/vc/vcluster/package.nix b/pkgs/by-name/vc/vcluster/package.nix index bcb44ba4562d..c2308ccfe660 100644 --- a/pkgs/by-name/vc/vcluster/package.nix +++ b/pkgs/by-name/vc/vcluster/package.nix @@ -56,7 +56,6 @@ buildGoModule rec { license = lib.licenses.asl20; mainProgram = "vcluster"; maintainers = with lib.maintainers; [ - berryp peterromfeldhk qjoly ]; diff --git a/pkgs/by-name/vc/vcstool/package.nix b/pkgs/by-name/vc/vcstool/package.nix index 1d1ada92230f..d014089090a6 100644 --- a/pkgs/by-name/vc/vcstool/package.nix +++ b/pkgs/by-name/vc/vcstool/package.nix @@ -12,16 +12,18 @@ with python3Packages; buildPythonApplication rec { pname = "vcstool"; version = "0.3.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "04b3a963e15386660f139e5b95d293e43e3cb414e3b13e14ee36f5223032ee2c"; }; - propagatedBuildInputs = [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = [ pyyaml - setuptools + setuptools # pkg_resources is imported during runtime ]; makeWrapperArgs = [ @@ -37,6 +39,8 @@ buildPythonApplication rec { doCheck = false; # requires network + pythonImportsCheck = [ "vcstool" ]; + meta = with lib; { description = "Provides a command line tool to invoke vcs commands on multiple repositories"; homepage = "https://github.com/dirk-thomas/vcstool"; diff --git a/pkgs/by-name/vi/vim-vint/package.nix b/pkgs/by-name/vi/vim-vint/package.nix index f1f78a112597..2b5006e5ee91 100644 --- a/pkgs/by-name/vi/vim-vint/package.nix +++ b/pkgs/by-name/vi/vim-vint/package.nix @@ -4,12 +4,10 @@ fetchFromGitHub, }: -with python3Packages; - -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "vim-vint"; version = "0.3.21"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "Vimjas"; @@ -18,18 +16,18 @@ buildPythonApplication rec { hash = "sha256-A0yXDkB/b9kEEXSoLeqVdmdm4p2PYL2QHqbF4FgAn30="; }; - # For python 3.5 > version > 2.7 , a nested dependency (pythonPackages.hypothesis) fails. - disabled = !pythonAtLeast "3.5"; + build-system = with python3Packages; [ setuptools ]; - nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub - ]; - propagatedBuildInputs = [ + dependencies = with python3Packages; [ ansicolor chardet pyyaml - setuptools + setuptools # pkg_resources is imported during runtime + ]; + + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + pytest-cov-stub ]; preCheck = '' diff --git a/pkgs/by-name/vi/vimiv-qt/package.nix b/pkgs/by-name/vi/vimiv-qt/package.nix index 15d19936237f..e7f69c62da0b 100644 --- a/pkgs/by-name/vi/vimiv-qt/package.nix +++ b/pkgs/by-name/vi/vimiv-qt/package.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { pname = "vimiv-qt"; version = "0.9.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "karlch"; @@ -19,13 +19,14 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-28sk5qDVmrgXYX2wm5G8zv564vG6GwxNp+gjrFHCRfU="; }; + build-system = with python3.pkgs; [ setuptools ]; + nativeBuildInputs = [ installShellFiles qt5.wrapQtAppsHook - python3.pkgs.setuptools ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ pyqt5 py3exiv2 ]; @@ -44,6 +45,8 @@ python3.pkgs.buildPythonApplication rec { done ''; + pythonImportsCheck = [ "vimiv" ]; + # Vimiv has to be wrapped manually because it is a non-ELF executable. dontWrapQtApps = true; preFixup = '' diff --git a/pkgs/by-name/vi/virtnbdbackup/package.nix b/pkgs/by-name/vi/virtnbdbackup/package.nix index 6c2ebe4384fa..ae64b13ece2c 100644 --- a/pkgs/by-name/vi/virtnbdbackup/package.nix +++ b/pkgs/by-name/vi/virtnbdbackup/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "virtnbdbackup"; version = "2.29"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "abbbi"; @@ -38,6 +38,8 @@ python3Packages.buildPythonApplication rec { versionCheckProgramArg = "-V"; + pythonImportsCheck = [ "libvirtnbdbackup" ]; + meta = { description = "Backup utility for Libvirt/qemu/kvm"; homepage = "https://github.com/abbbi/virtnbdbackup"; diff --git a/pkgs/by-name/vi/vit/package.nix b/pkgs/by-name/vi/vit/package.nix index a78636cfb762..88ab07958ba4 100644 --- a/pkgs/by-name/vi/vit/package.nix +++ b/pkgs/by-name/vi/vit/package.nix @@ -11,7 +11,7 @@ with python3Packages; buildPythonApplication rec { pname = "vit"; version = "2.3.3"; - format = "setuptools"; + pyproject = true; disabled = lib.versionOlder python.version "3.7"; src = fetchPypi { @@ -19,7 +19,9 @@ buildPythonApplication rec { hash = "sha256-+lrXGfhoB4z5IWkJTXMIm3GGVPfNGO9lUB3uFTx8hDY="; }; - propagatedBuildInputs = [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = [ tasklib urwid ]; @@ -37,6 +39,8 @@ buildPythonApplication rec { export TERM=''${TERM-linux} ''; + pythonImportsCheck = [ "vit" ]; + meta = with lib; { homepage = "https://github.com/scottkosty/vit"; description = "Visual Interactive Taskwarrior"; diff --git a/pkgs/by-name/vk/vkbasalt-cli/package.nix b/pkgs/by-name/vk/vkbasalt-cli/package.nix index f11a4890f454..c5e32ac4f5b8 100644 --- a/pkgs/by-name/vk/vkbasalt-cli/package.nix +++ b/pkgs/by-name/vk/vkbasalt-cli/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "vkbasalt-cli"; version = "3.1.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitLab { owner = "TheEvilSkeleton"; @@ -19,9 +19,11 @@ python3Packages.buildPythonApplication rec { postPatch = '' substituteInPlace vkbasalt/lib.py \ - --replace /usr ${vkbasalt} + --replace-fail /usr ${vkbasalt} ''; + build-system = with python3Packages; [ setuptools ]; + pythonImportsCheck = [ "vkbasalt.lib" ]; meta = with lib; { diff --git a/pkgs/by-name/vt/vtfedit/package.nix b/pkgs/by-name/vt/vtfedit/package.nix index 77ee821ad7e4..6b8792452727 100644 --- a/pkgs/by-name/vt/vtfedit/package.nix +++ b/pkgs/by-name/vt/vtfedit/package.nix @@ -75,6 +75,6 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.lgpl21Plus; inherit (wine.meta) platforms; - maintainers = with lib.maintainers; [ paveloom ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/by-name/wa/waagent/package.nix b/pkgs/by-name/wa/waagent/package.nix index e0537c7afa32..d406c36da99a 100644 --- a/pkgs/by-name/wa/waagent/package.nix +++ b/pkgs/by-name/wa/waagent/package.nix @@ -16,7 +16,8 @@ in python.pkgs.buildPythonApplication rec { pname = "waagent"; version = "2.14.0.0"; - format = "setuptools"; + pyproject = true; + src = fetchFromGitHub { owner = "Azure"; repo = "WALinuxAgent"; @@ -47,7 +48,9 @@ python.pkgs.buildPythonApplication rec { --replace-fail '/usr/bin/openssl' '${openssl}/bin/openssl' ''; - propagatedBuildInputs = [ python.pkgs.distro ]; + build-system = with python.pkgs; [ setuptools ]; + + dependencies = with python.pkgs; [ distro ]; # The udev rules are placed to the wrong place. # Move them to their default location. diff --git a/pkgs/by-name/wa/wad/package.nix b/pkgs/by-name/wa/wad/package.nix index c1e21ab8261a..231c197832ea 100644 --- a/pkgs/by-name/wa/wad/package.nix +++ b/pkgs/by-name/wa/wad/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "wad"; version = "0.4.6"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "CERN-CERT"; @@ -16,7 +16,9 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-/mlmOzFkyKpmK/uk4813Wk0cf/+ynX3Qxafnd1mGR5k="; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ six ]; diff --git a/pkgs/by-name/wa/warp-plus/package.nix b/pkgs/by-name/wa/warp-plus/package.nix index e783ca677f56..0bd38a45d10a 100644 --- a/pkgs/by-name/wa/warp-plus/package.nix +++ b/pkgs/by-name/wa/warp-plus/package.nix @@ -47,7 +47,7 @@ buildGoModule rec { description = "Warp + Psiphon, an anti censorship utility for Iran"; homepage = "https://github.com/bepass-org/warp-plus"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ paveloom ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "warp-plus"; # Doesn't work with Go toolchain >1.22, runtime error: # 'panic: tls.ConnectionState doesn't match' diff --git a/pkgs/by-name/wa/watson/package.nix b/pkgs/by-name/wa/watson/package.nix index 0b761f2148a5..2d2f926a988a 100644 --- a/pkgs/by-name/wa/watson/package.nix +++ b/pkgs/by-name/wa/watson/package.nix @@ -6,12 +6,10 @@ fetchpatch, }: -with python3.pkgs; - -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "watson"; version = "2.1.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "jazzband"; @@ -29,25 +27,31 @@ buildPythonApplication rec { }) ]; + nativeBuildInputs = [ installShellFiles ]; + + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ + arrow + click + click-didyoumean + requests + ]; + + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook + pytest-mock + mock + pytest-datafiles + ]; + postInstall = '' installShellCompletion --bash --name watson watson.completion installShellCompletion --zsh --name _watson watson.zsh-completion installShellCompletion --fish watson.fish ''; - nativeCheckInputs = [ - pytestCheckHook - pytest-mock - mock - pytest-datafiles - ]; - propagatedBuildInputs = [ - arrow - click - click-didyoumean - requests - ]; - nativeBuildInputs = [ installShellFiles ]; + pythonImportsCheck = [ "watson" ]; meta = with lib; { homepage = "https://github.com/jazzband/Watson"; diff --git a/pkgs/by-name/wa/wayback-machine-archiver/package.nix b/pkgs/by-name/wa/wayback-machine-archiver/package.nix index 270f44ca8e11..76fa33e94f33 100644 --- a/pkgs/by-name/wa/wayback-machine-archiver/package.nix +++ b/pkgs/by-name/wa/wayback-machine-archiver/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "wayback-machine-archiver"; version = "1.9.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "agude"; @@ -16,8 +16,13 @@ python3.pkgs.buildPythonApplication rec { sha256 = "0dnnqx507gpj8wsx6f2ivfmha969ydayiqsvxh23p9qcixw9257x"; }; - nativeBuildInputs = with python3.pkgs; [ pypandoc ]; - propagatedBuildInputs = with python3.pkgs; [ requests ]; + build-system = with python3.pkgs; [ + setuptools + pypandoc + ]; + + dependencies = with python3.pkgs; [ requests ]; + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook requests-mock @@ -25,7 +30,7 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace setup.py \ - --replace \"pytest-runner\", "" + --replace-fail \"pytest-runner\", "" ''; pythonImportsCheck = [ "wayback_machine_archiver" ]; diff --git a/pkgs/by-name/wa/waymore/package.nix b/pkgs/by-name/wa/waymore/package.nix index 181fd35adc10..a0f6c6fdcea1 100644 --- a/pkgs/by-name/wa/waymore/package.nix +++ b/pkgs/by-name/wa/waymore/package.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { pname = "waymore"; version = "4.7"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "xnl-h4ck3r"; @@ -26,6 +26,11 @@ python3Packages.buildPythonApplication rec { setuptools ]; + pythonRemoveDeps = [ + # python already provides urllib.parse + "urlparse3" + ]; + dependencies = with python3Packages; [ requests termcolor @@ -35,6 +40,8 @@ python3Packages.buildPythonApplication rec { tldextract ]; + pythonImportsCheck = [ "waymore.waymore" ]; + passthru.tests.version = testers.testVersion { package = waymore; command = "waymore --version"; diff --git a/pkgs/by-name/wh/whisparr/package.nix b/pkgs/by-name/wh/whisparr/package.nix index 2988538496da..a25d09f20989 100644 --- a/pkgs/by-name/wh/whisparr/package.nix +++ b/pkgs/by-name/wh/whisparr/package.nix @@ -91,6 +91,6 @@ stdenv.mkDerivation rec { ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; mainProgram = "Whisparr"; - maintainers = [ lib.maintainers.paveloom ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/wi/win2xcur/package.nix b/pkgs/by-name/wi/win2xcur/package.nix index 1b75eededa37..d365c2aa8a03 100644 --- a/pkgs/by-name/wi/win2xcur/package.nix +++ b/pkgs/by-name/wi/win2xcur/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonPackage rec { pname = "win2xcur"; version = "0.1.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "quantum5"; @@ -16,11 +16,18 @@ python3Packages.buildPythonPackage rec { hash = "sha256-OjLj+QYg8YOJzDq3Y6/uyEXlNWbPm8VA/b1yP9jT6Jo="; }; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ numpy wand ]; + pythonImportsCheck = [ + "win2xcur.main.win2xcur" + "win2xcur.main.x2wincur" + ]; + meta = { description = "Tools that convert cursors between the Windows (*.cur, *.ani) and Xcursor format"; homepage = "https://github.com/quantum5/win2xcur"; diff --git a/pkgs/by-name/wl/wlc/package.nix b/pkgs/by-name/wl/wlc/package.nix index 04d734fc0ec1..2c3731103ef3 100644 --- a/pkgs/by-name/wl/wlc/package.nix +++ b/pkgs/by-name/wl/wlc/package.nix @@ -4,19 +4,19 @@ fetchPypi, }: -with python3.pkgs; - -buildPythonPackage rec { +python3.pkgs.buildPythonPackage rec { pname = "wlc"; version = "1.15"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-0T8cMq5Mrv/Ygo6BfYho3sjFuu8dYZyUMtJc5gabuG4="; }; - propagatedBuildInputs = [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ argcomplete python-dateutil requests @@ -25,10 +25,12 @@ buildPythonPackage rec { twine ]; - nativeCheckInputs = [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; + pythonImportsCheck = [ "wlc" ]; + meta = with lib; { description = "Weblate commandline client using Weblate's REST API"; homepage = "https://github.com/WeblateOrg/wlc"; diff --git a/pkgs/by-name/wl/wllvm/package.nix b/pkgs/by-name/wl/wllvm/package.nix index bc1c9ebac3e0..365c9ff472e2 100644 --- a/pkgs/by-name/wl/wllvm/package.nix +++ b/pkgs/by-name/wl/wllvm/package.nix @@ -5,15 +5,19 @@ }: python3Packages.buildPythonApplication rec { - version = "1.3.1"; - format = "setuptools"; pname = "wllvm"; + version = "1.3.1"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-PgV6V18FyezIZpqMQEbyv98MaVM7h7T7/Kvg3yMMwzE="; }; + build-system = with python3Packages; [ setuptools ]; + + pythonImportsCheck = [ "wllvm.wllvm" ]; + meta = with lib; { homepage = "https://github.com/travitch/whole-program-llvm"; description = "Wrapper script to build whole-program LLVM bitcode files"; diff --git a/pkgs/by-name/wo/wofi-power-menu/package.nix b/pkgs/by-name/wo/wofi-power-menu/package.nix index 49f04b70a13b..19b9163cb1bc 100644 --- a/pkgs/by-name/wo/wofi-power-menu/package.nix +++ b/pkgs/by-name/wo/wofi-power-menu/package.nix @@ -6,31 +6,23 @@ wofi, versionCheckHook, nix-update-script, - yq, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "wofi-power-menu"; - version = "0.2.7"; + version = "0.2.9"; src = fetchFromGitHub { owner = "szaffarano"; repo = "wofi-power-menu"; tag = "v${finalAttrs.version}"; - hash = "sha256-WPTK9izFU8xZ5YVFuEGO5EoOzgpXWXQnGgeNYjnb/zA="; + hash = "sha256-xio/Gt37PJ/0Di22na4USmfah2GV+xM2eV4NnGBeVfY="; }; - postPatch = '' - tomlq -ti '.package.version = "0.2.7"' Cargo.toml - ''; - useFetchCargoVendor = true; - cargoHash = "sha256-oJd2ymNkNSGUD3cQ+bEHooAJQNeSarkIHWvGNXezwrM="; + cargoHash = "sha256-diDLKP7JGzrXgdZMwSmg70dbFlMLLWp4Ad/ejjiOSlc="; - nativeBuildInputs = [ - makeWrapper - yq # for `tomlq` - ]; + nativeBuildInputs = [ makeWrapper ]; postInstall = '' wrapProgram $out/bin/wofi-power-menu \ diff --git a/pkgs/by-name/wp/wpm/package.nix b/pkgs/by-name/wp/wpm/package.nix index 63e9a06d3da9..7f12b096c7a2 100644 --- a/pkgs/by-name/wp/wpm/package.nix +++ b/pkgs/by-name/wp/wpm/package.nix @@ -7,15 +7,17 @@ python3.pkgs.buildPythonApplication rec { pname = "wpm"; version = "1.51.5"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-swT9E5Tto4yWnm0voowcJXtY3cIY3MNqAdfrTnuGbdg="; }; - propagatedBuildInputs = with python3.pkgs; [ - setuptools + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ + setuptools # pkg_resources is imported during runtime ]; pythonImportsCheck = [ "wpm" ]; diff --git a/pkgs/by-name/xb/xborders/package.nix b/pkgs/by-name/xb/xborders/package.nix index 72d2c48bdbbe..d3e69da2884c 100644 --- a/pkgs/by-name/xb/xborders/package.nix +++ b/pkgs/by-name/xb/xborders/package.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonPackage rec { pname = "xborders"; version = "3.4"; # in version.txt - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "deter0"; @@ -33,7 +33,9 @@ python3Packages.buildPythonPackage rec { gobject-introspection ]; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ pycairo requests pygobject3 diff --git a/pkgs/by-name/xd/xdxf2slob/package.nix b/pkgs/by-name/xd/xdxf2slob/package.nix index c694ca396bb6..dc0a015d44d6 100644 --- a/pkgs/by-name/xd/xdxf2slob/package.nix +++ b/pkgs/by-name/xd/xdxf2slob/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication { pname = "xdxf2slob"; version = "unstable-2015-06-30"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "itkach"; @@ -16,11 +16,15 @@ python3Packages.buildPythonApplication { sha256 = "0m3dnc3816ja3kmik1wabb706dkqdf5sxvabwgf2rcrq891xcddd"; }; - propagatedBuildInputs = [ - python3Packages.pyicu - python3Packages.slob + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ + pyicu + slob ]; + pythonImportsCheck = [ "xdxf2slob" ]; + meta = with lib; { description = "Tool to convert XDXF dictionary files to slob format"; homepage = "https://github.com/itkach/xdxf2slob/"; diff --git a/pkgs/by-name/xe/xed/package.nix b/pkgs/by-name/xe/xed/package.nix index e3fea2801bcf..505b337a86f2 100644 --- a/pkgs/by-name/xe/xed/package.nix +++ b/pkgs/by-name/xe/xed/package.nix @@ -13,7 +13,7 @@ let mbuild = python3Packages.buildPythonPackage rec { pname = "mbuild"; version = "2024.11.04"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "intelxed"; @@ -22,6 +22,8 @@ let hash = "sha256-iQVykBG3tEPxI1HmqBkvO1q+K8vi64qBfVC63/rcTOk="; }; + build-system = with python3Packages; [ setuptools ]; + meta = { description = "Python-based build system used for building XED"; homepage = "https://github.com/intelxed/mbuild"; diff --git a/pkgs/by-name/xe/xenomapper/package.nix b/pkgs/by-name/xe/xenomapper/package.nix index 5e269bfc91be..f25f6b249d90 100644 --- a/pkgs/by-name/xe/xenomapper/package.nix +++ b/pkgs/by-name/xe/xenomapper/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "xenomapper"; version = "1.0.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "genomematt"; @@ -16,7 +16,14 @@ python3.pkgs.buildPythonApplication rec { sha256 = "0mnmfzlq5mhih6z8dq5bkx95vb8whjycz9mdlqwbmlqjb3gb3zhr"; }; - propagatedBuildInputs = with python3.pkgs; [ statistics ]; + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ statistics ]; + + pythonImportsCheck = [ + "xenomapper.xenomapper" + "xenomapper.mappability" + ]; meta = with lib; { homepage = "https://github.com/genomematt/xenomapper"; diff --git a/pkgs/by-name/xe/xenon/package.nix b/pkgs/by-name/xe/xenon/package.nix index 583036442ec3..6907c94bf947 100644 --- a/pkgs/by-name/xe/xenon/package.nix +++ b/pkgs/by-name/xe/xenon/package.nix @@ -11,7 +11,7 @@ in python3.pkgs.buildPythonApplication { inherit pname version; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -20,12 +20,16 @@ python3.pkgs.buildPythonApplication { doCheck = false; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ requests radon pyaml ]; + pythonImportsCheck = [ "xenon" ]; + meta = with lib; { description = "Monitoring tool based on radon"; homepage = "https://github.com/rubik/xenon"; diff --git a/pkgs/by-name/xh/xh/package.nix b/pkgs/by-name/xh/xh/package.nix index 74fcbc2f8399..2d1eeec6210d 100644 --- a/pkgs/by-name/xh/xh/package.nix +++ b/pkgs/by-name/xh/xh/package.nix @@ -73,7 +73,6 @@ rustPlatform.buildRustPackage (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ figsoda - aaronjheng defelo ]; mainProgram = "xh"; diff --git a/pkgs/by-name/xk/xkeysnail/package.nix b/pkgs/by-name/xk/xkeysnail/package.nix index 68ff0ffbc24f..c9c50863f34c 100644 --- a/pkgs/by-name/xk/xkeysnail/package.nix +++ b/pkgs/by-name/xk/xkeysnail/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication { pname = "xkeysnail"; version = "0.4"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "mooz"; @@ -24,7 +24,9 @@ python3Packages.buildPythonApplication { }) ]; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ evdev xlib inotify-simple @@ -38,6 +40,8 @@ python3Packages.buildPythonApplication { --add-flags "-q" --add-flags "$out/share/browser.py" ''; + pythonImportsCheck = [ "xkeysnail" ]; + meta = { description = "Yet another keyboard remapping tool for X environment"; homepage = "https://github.com/mooz/xkeysnail"; diff --git a/pkgs/by-name/xm/xmldiff/package.nix b/pkgs/by-name/xm/xmldiff/package.nix index 2c68e6b83c1f..4eccca0ffc50 100644 --- a/pkgs/by-name/xm/xmldiff/package.nix +++ b/pkgs/by-name/xm/xmldiff/package.nix @@ -14,13 +14,15 @@ let }; in python3.pkgs.buildPythonApplication { - format = "setuptools"; pname = "xmldiff"; inherit version src; + pyproject = true; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ lxml - setuptools + setuptools # pkg_resources is imported during runtime ]; meta = { diff --git a/pkgs/by-name/xo/xonsh/xontribs/xonsh-direnv/default.nix b/pkgs/by-name/xo/xonsh/xontribs/xonsh-direnv/default.nix index 8cba53b3d479..536e71569c02 100644 --- a/pkgs/by-name/xo/xonsh/xontribs/xonsh-direnv/default.nix +++ b/pkgs/by-name/xo/xonsh/xontribs/xonsh-direnv/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "xonsh-direnv"; version = "1.6.5"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "74th"; diff --git a/pkgs/by-name/xp/xpaste/package.nix b/pkgs/by-name/xp/xpaste/package.nix index 2e1050ec8db6..c56c664402c3 100644 --- a/pkgs/by-name/xp/xpaste/package.nix +++ b/pkgs/by-name/xp/xpaste/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { pname = "xpaste"; version = "1.6"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "ossobv"; @@ -16,7 +16,9 @@ python3Packages.buildPythonApplication rec { hash = "sha256-eVnoLG+06UTOkvGhzL/XS4JBrEwbXYZ1fuNTIW7YAfE="; }; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ xlib ]; diff --git a/pkgs/by-name/ya/yams/package.nix b/pkgs/by-name/ya/yams/package.nix index d5745e2ea7a5..732bbc4e81d3 100644 --- a/pkgs/by-name/ya/yams/package.nix +++ b/pkgs/by-name/ya/yams/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonPackage rec { pname = "yams"; # nixpkgs-update: no auto update version = "0.7.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "Berulacks"; @@ -17,7 +17,9 @@ python3Packages.buildPythonPackage rec { sha256 = "1zkhcys9i0s6jkaz24an690rvnkv1r84jxpaa84sf46abi59ijh8"; }; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ pyyaml psutil mpd2 @@ -26,6 +28,8 @@ python3Packages.buildPythonPackage rec { doCheck = false; + pythonImportsCheck = [ "yams.scrobble" ]; + meta = with lib; { homepage = "https://github.com/Berulacks/yams"; description = "Last.FM scrobbler for MPD"; diff --git a/pkgs/by-name/yo/you-get/package.nix b/pkgs/by-name/yo/you-get/package.nix index c9a32a82e0db..d7e4ec0976c5 100644 --- a/pkgs/by-name/yo/you-get/package.nix +++ b/pkgs/by-name/yo/you-get/package.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { pname = "you-get"; version = "0.4.1700"; - format = "setuptools"; + pyproject = true; # Tests aren't packaged, but they all hit the real network so # probably aren't suitable for a build environment anyway. @@ -31,6 +31,8 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ installShellFiles ]; + build-system = with python3.pkgs; [ setuptools ]; + postInstall = '' installShellCompletion --cmd you-get \ --zsh contrib/completion/_you-get \ diff --git a/pkgs/by-name/yt/ytmdl/package.nix b/pkgs/by-name/yt/ytmdl/package.nix index dfbadc146b71..7869aedf1aa7 100644 --- a/pkgs/by-name/yt/ytmdl/package.nix +++ b/pkgs/by-name/yt/ytmdl/package.nix @@ -2,14 +2,14 @@ lib, python3Packages, fetchPypi, - yt-dlp, ffmpeg, + writableTmpDirAsHomeHook, }: python3Packages.buildPythonApplication rec { pname = "ytmdl"; version = "2023.11.26"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname; @@ -19,13 +19,13 @@ python3Packages.buildPythonApplication rec { postPatch = '' substituteInPlace setup.py \ - --replace "bs4" "beautifulsoup4" \ - --replace "/etc/bash_completion.d" "share/bash-completion/completions" \ - --replace "/usr/share/zsh/functions/Completion/Unix" "share/zsh/site-functions" - sed -i '/python_requires=/d' setup.py + --replace-fail "/etc/bash_completion.d" "share/bash-completion/completions" \ + --replace-fail "/usr/share/zsh/functions/Completion/Unix" "share/zsh/site-functions" ''; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ ffmpeg-python musicbrainzngs rich @@ -51,8 +51,11 @@ python3Packages.buildPythonApplication rec { (lib.makeBinPath [ ffmpeg ]) ]; - # This application has no tests - doCheck = false; + nativeCheckInputs = [ + writableTmpDirAsHomeHook # the app tries to log stuff into xdg_cache_home + ]; + + pythonImportsCheck = [ "ytmdl" ]; meta = with lib; { homepage = "https://github.com/deepjyoti30/ytmdl"; diff --git a/pkgs/by-name/za/zapzap/package.nix b/pkgs/by-name/za/zapzap/package.nix index 3d68b11b4b1d..720fd3ed5bbe 100644 --- a/pkgs/by-name/za/zapzap/package.nix +++ b/pkgs/by-name/za/zapzap/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "zapzap"; version = "6.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "rafatosta"; @@ -17,8 +17,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-g3J9oVIRiar0QoksRjJZsbvSKiFBILaUdSUscNs1VXE="; }; - nativeBuildInputs = with python3Packages; [ - setuptools + nativeBuildInputs = [ qt6.wrapQtAppsHook ]; @@ -31,7 +30,9 @@ python3Packages.buildPythonApplication rec { export HOME=$(mktemp -d) ''; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ dbus-python pyqt6 pyqt6-webengine @@ -51,6 +52,8 @@ python3Packages.buildPythonApplication rec { # has no tests doCheck = false; + pythonImportsCheck = [ "zapzap" ]; + meta = with lib; { description = "WhatsApp desktop application written in Pyqt6 + PyQt6-WebEngine."; homepage = "https://rtosta.com/zapzap-web/"; diff --git a/pkgs/by-name/zf/zfs-autobackup/package.nix b/pkgs/by-name/zf/zfs-autobackup/package.nix index db4eb62abcbc..12ef9ebfa6b2 100644 --- a/pkgs/by-name/zf/zfs-autobackup/package.nix +++ b/pkgs/by-name/zf/zfs-autobackup/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { pname = "zfs-autobackup"; version = "3.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit version; @@ -15,7 +15,9 @@ python3Packages.buildPythonApplication rec { hash = "sha256-nAc1mdrtIEmUS0uMqOdvV07xP02MFj6F5uCTiCXtnMs="; }; - propagatedBuildInputs = with python3Packages; [ colorama ]; + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ colorama ]; pythonRemoveDeps = [ "argparse" ]; diff --git a/pkgs/by-name/zi/zim/package.nix b/pkgs/by-name/zi/zim/package.nix index 28b741256cc8..57ec16d3168e 100644 --- a/pkgs/by-name/zi/zim/package.nix +++ b/pkgs/by-name/zi/zim/package.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { pname = "zim"; version = "0.76.3"; - format = "setuptools"; + pyproject = true; src = fetchurl { url = "https://zim-wiki.org/downloads/zim-${version}.tar.gz"; @@ -36,6 +36,8 @@ python3Packages.buildPythonApplication rec { adwaita-icon-theme ]; + build-system = with python3Packages; [ setuptools ]; + dependencies = with python3Packages; [ pyxdg pygobject3 diff --git a/pkgs/by-name/zs/zsh-history-to-fish/package.nix b/pkgs/by-name/zs/zsh-history-to-fish/package.nix index bbd6ee4b8c25..9932ed8e7a31 100644 --- a/pkgs/by-name/zs/zsh-history-to-fish/package.nix +++ b/pkgs/by-name/zs/zsh-history-to-fish/package.nix @@ -7,14 +7,16 @@ python3.pkgs.buildPythonApplication rec { pname = "zsh-history-to-fish"; version = "0.3.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-expPuffZttyXNRreplPC5Ee/jfWAyOnmjTIMXONtrnw="; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ click ]; diff --git a/pkgs/development/compilers/dart/default.nix b/pkgs/development/compilers/dart/default.nix index a97cb6f9aa82..d5c0862b857c 100644 --- a/pkgs/development/compilers/dart/default.nix +++ b/pkgs/development/compilers/dart/default.nix @@ -1,8 +1,10 @@ { - stdenv, lib, + stdenv, fetchurl, unzip, + bintools, + versionCheckHook, runCommand, cctools, darwin, @@ -23,16 +25,25 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' - mkdir -p $out - cp -R * $out/ - echo $libPath + runHook preInstall + + cp -R . $out '' + lib.optionalString (stdenv.hostPlatform.isLinux) '' - find $out/bin -executable -type f -exec patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) {} \; + find $out/bin -executable -type f -exec patchelf --set-interpreter ${bintools.dynamicLinker} {} \; + '' + + '' + runHook postInstall ''; - libPath = lib.makeLibraryPath [ stdenv.cc.cc ]; dontStrip = true; + + doInstallCheck = true; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + versionCheckProgramArg = "--version"; + passthru = { updateScript = ./update.sh; tests = { @@ -67,9 +78,9 @@ stdenv.mkDerivation (finalAttrs: { }; }; - meta = with lib; { + meta = { homepage = "https://dart.dev"; - maintainers = with maintainers; [ grburst ]; + maintainers = with lib.maintainers; [ grburst ]; description = "Scalable programming language, with robust libraries and runtimes, for building web, server, and mobile apps"; longDescription = '' Dart is a class-based, single inheritance, object-oriented language @@ -79,12 +90,11 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "dart"; platforms = [ "x86_64-linux" - "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.bsd3; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.bsd3; }; }) diff --git a/pkgs/development/compilers/dart/sources.nix b/pkgs/development/compilers/dart/sources.nix index d5ae0fef55d8..6c50501ae087 100644 --- a/pkgs/development/compilers/dart/sources.nix +++ b/pkgs/development/compilers/dart/sources.nix @@ -1,27 +1,23 @@ let - version = "3.8.0"; + version = "3.8.1"; in { fetchurl }: { versionUsed = version; "${version}-x86_64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip"; - sha256 = "0qkhzk9mn7xhdg03g3nj24zfalm4fd8k054gnncdsjn2vz1fhgpg"; + hash = "sha256-OTcd89ZPlPWz2cERnD9UkWTFYoxqE7lFG3tEhZ8fkRQ="; }; "${version}-aarch64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip"; - sha256 = "1vlyncm8hyfvwkdjvvkmra3b3mj7rz7sxwy2xjh07dkrmvw0n4cy"; + hash = "sha256-UIC8b0p4zM4OOOceRkdsCNYeCBRTZGlI8/DHcXepKPg="; }; "${version}-aarch64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip"; - sha256 = "09gmkyg0h662n8wd3k1mx8sglvwa9l5cfhaq934hvcvpc16ajssy"; + hash = "sha256-eKMkAJe+47ebAJxp6tIuGq7e3ty+CT6qmACExWYQlsg="; }; "${version}-x86_64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip"; - sha256 = "1kpkd1c48y0v6hi5pabxhijd04aqbq1fqw3lcsrfkyig84gawbhj"; - }; - "${version}-i686-linux" = fetchurl { - url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-ia32-release.zip"; - sha256 = "0bcb95wadwhq0m64h9mrycdzp9ssnkh4lh3x3hf19py0ak6ix14v"; + hash = "sha256-DVjAEKNh8/FYixwvV5QvfMr3t6u+A0BP73oQLrY48J0="; }; } diff --git a/pkgs/development/compilers/dart/update.sh b/pkgs/development/compilers/dart/update.sh index 38940a696b19..e8cfc3b432a6 100755 --- a/pkgs/development/compilers/dart/update.sh +++ b/pkgs/development/compilers/dart/update.sh @@ -1,80 +1,21 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq +#!nix-shell -i bash -p curl jq common-updater-scripts set -euo pipefail -# so if the script fails, debug logs are on stderr -log() { - >&2 echo "DART_UPDATER: $@" -} +latestVersion=$(curl -sL https://storage.googleapis.com/dart-archive/channels/stable/release/latest/VERSION | jq --raw-output .version) +currentVersion=$(nix eval --raw -f . dart.version) -# fetch the latest version number from upstream -NEW_VER_DETAILS=$(curl -sL https://storage.googleapis.com/dart-archive/channels/stable/release/latest/VERSION) -NEW_VER=$(jq -r '.version' <<< "$NEW_VER_DETAILS") +if [[ "$latestVersion" == "$currentVersion" ]]; then + exit 0 +fi MY_PATH=$(dirname $(realpath "$0")) -SRC_FILE=$(mktemp) -log "file to write is $SRC_FILE" +update-source-version dart $latestVersion --file=$MY_PATH/sources.nix -PRELUDE="let - version = \"$NEW_VER\"; -in -{ fetchurl }: -{ - versionUsed = version;" -echo "$PRELUDE" > "$SRC_FILE" -log "wrote prelude" - -# Fetches the source, then writes the fetcher and hash into the sources file. -# Arguments: -# - $1: VARIABLE NAME of (table of nix platform -> dart platform mappings) ("DARWIN_PLATFORMS"|"LIN_PLATFORMS") -# - $2: Dart-OS ("macos"|"linux") -write_for_platform() { - BASE_OF_ALL_URLS='https://storage.googleapis.com/dart-archive/channels/stable/release' - BASE_URL_WRITTEN="$BASE_OF_ALL_URLS/\${version}/sdk" - BASE_URL_FETCHED="$BASE_OF_ALL_URLS/$NEW_VER/sdk" - - TABLE_NAME=$1 - declare -n TABLE=$TABLE_NAME - - for platform in "${!TABLE[@]}"; do - DART_PLATFORM="${TABLE[$platform]}" - log "trying for dartplatform $DART_PLATFORM (platform $platform) (OS $2)" - - URL_POSTFIX="dartsdk-$2-$DART_PLATFORM-release.zip" - URL="$BASE_URL_FETCHED/$URL_POSTFIX" - log "URL for $DART_PLATFORM: $URL" - - HASH=$(nix-prefetch-url "$URL" --type sha256) - log "hash for platform $platform: $HASH" - - FETCHER=" \"\${version}-$platform\" = fetchurl { - url = \"$BASE_URL_WRITTEN/$URL_POSTFIX\"; - sha256 = \"$HASH\"; - };" - - echo "$FETCHER" >> $SRC_FILE - done - log "finished for $1" - -} - -# Map nix platforms -> Dart platforms -X8664="x64" -AARCH64="arm64" -I686="ia32" -declare -A DARWIN_PLATFORMS=(["aarch64-darwin"]="$AARCH64" - ["x86_64-darwin"]="$X8664") - -declare -A LIN_PLATFORMS=( ["x86_64-linux"]="$X8664" - ["i686-linux"]="$I686" - ["aarch64-linux"]="$AARCH64") - -write_for_platform "DARWIN_PLATFORMS" "macos" -write_for_platform "LIN_PLATFORMS" "linux" - -echo '}' >> $SRC_FILE - -log "moving tempfile to target directory" -mv "$SRC_FILE" "$MY_PATH/sources.nix" +systems=$(nix eval --json -f . dart.meta.platforms | jq --raw-output '.[]') +for system in $systems; do + hash=$(nix hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix eval --raw -f . dart.src.url --system "$system"))) + update-source-version dart $latestVersion $hash --file=$MY_PATH/sources.nix --system=$system --ignore-same-version --ignore-same-hash +done diff --git a/pkgs/development/php-packages/meminfo/default.nix b/pkgs/development/php-packages/meminfo/default.nix index d7cca10ba328..bee2be6fd614 100644 --- a/pkgs/development/php-packages/meminfo/default.nix +++ b/pkgs/development/php-packages/meminfo/default.nix @@ -2,10 +2,11 @@ buildPecl, lib, fetchFromGitHub, + nix-update-script, }: buildPecl rec { - version = "unstable-2022-03-25"; + version = "1.1.1-unstable-2022-03-25"; pname = "meminfo"; src = fetchFromGitHub { @@ -17,6 +18,8 @@ buildPecl rec { sourceRoot = "${src.name}/extension"; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + meta = { description = "PHP extension to get insight about memory usage"; homepage = "https://github.com/BitOne/php-meminfo"; diff --git a/pkgs/development/python-modules/ale-py/default.nix b/pkgs/development/python-modules/ale-py/default.nix index 7c9d147d03ea..6977ece2f648 100644 --- a/pkgs/development/python-modules/ale-py/default.nix +++ b/pkgs/development/python-modules/ale-py/default.nix @@ -34,14 +34,14 @@ buildPythonPackage rec { pname = "ale-py"; - version = "0.11.1"; + version = "0.11.2"; pyproject = true; src = fetchFromGitHub { owner = "Farama-Foundation"; repo = "Arcade-Learning-Environment"; tag = "v${version}"; - hash = "sha256-VrPc3i1VYuThKdQn/wimNzMHNmPIAdTxbh2tuJb4YJY="; + hash = "sha256-4IkjW8HX21uBEHFtb3qETxco6FfDMgLbG1BDHWwvn58="; }; build-system = [ diff --git a/pkgs/development/python-modules/cryptolyzer/default.nix b/pkgs/development/python-modules/cryptolyzer/default.nix index 5290c347ce89..f9ae2daca9a8 100644 --- a/pkgs/development/python-modules/cryptolyzer/default.nix +++ b/pkgs/development/python-modules/cryptolyzer/default.nix @@ -56,11 +56,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "cryptolyzer" ]; - meta = with lib; { + meta = { description = "Cryptographic protocol analyzer"; homepage = "https://gitlab.com/coroner/cryptolyzer"; changelog = "https://gitlab.com/coroner/cryptolyzer/-/blob/v${version}/CHANGELOG.md"; - license = licenses.mpl20; - maintainers = with maintainers; [ kranzes ]; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ kranzes ]; + teams = with lib.teams; [ ngi ]; }; } diff --git a/pkgs/development/python-modules/pyqtdarktheme/default.nix b/pkgs/development/python-modules/pyqtdarktheme/default.nix index 2d4841227071..872e22d6ef1a 100644 --- a/pkgs/development/python-modules/pyqtdarktheme/default.nix +++ b/pkgs/development/python-modules/pyqtdarktheme/default.nix @@ -58,6 +58,6 @@ buildPythonPackage rec { description = "Flat dark theme for PySide and PyQt"; homepage = "https://pyqtdarktheme.readthedocs.io/en/stable"; license = licenses.mit; - maintainers = with maintainers; [ paveloom ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index 57f9cb956ec1..2e036ab61ea7 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "textual"; - version = "3.7.1"; + version = "4.0.0"; pyproject = true; src = fetchFromGitHub { owner = "Textualize"; repo = "textual"; tag = "v${version}"; - hash = "sha256-ceA4Mv/oq4tZRC8rY6xkpuAcS/f3GXcY891EoOCES/M="; + hash = "sha256-rVDr4Snp5qnErxWRM9yoxnzzX8gg8nD3RbBkL1rmgqI="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/undetected-chromedriver/default.nix b/pkgs/development/python-modules/undetected-chromedriver/default.nix index bcb349bfe36d..7a96528c4f83 100644 --- a/pkgs/development/python-modules/undetected-chromedriver/default.nix +++ b/pkgs/development/python-modules/undetected-chromedriver/default.nix @@ -49,6 +49,6 @@ buildPythonPackage { description = "Python library for the custom Selenium ChromeDriver that passes all bot mitigation systems"; homepage = "https://github.com/ultrafunkamsterdam/undetected-chromedriver"; license = licenses.gpl3Only; - maintainers = with lib.maintainers; [ paveloom ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix index 84f605d84536..dd657405cd99 100644 --- a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix +++ b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix @@ -13,13 +13,13 @@ buildHomeAssistantComponent rec { owner = "mampfes"; domain = "waste_collection_schedule"; - version = "2.8.0"; + version = "2.9.0"; src = fetchFromGitHub { inherit owner; repo = "hacs_waste_collection_schedule"; tag = version; - hash = "sha256-2dsuDVk2vFZPKLuFdNISg3b3z7PI+Ag3c2IZRbQnrgg="; + hash = "sha256-qH880z04TKNwO+PoH4INcOjwLrts1lzg9NMwKoum2zg="; }; dependencies = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 462566e6a684..2092433f873c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -570,7 +570,7 @@ with pkgs; mysql-shell_8 = callPackage ../development/tools/mysql-shell/8.nix { antlr = antlr4_10; icu = icu73; - protobuf = protobuf_24; + protobuf = protobuf_25; stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_18.stdenv else stdenv; }; }) @@ -580,7 +580,7 @@ with pkgs; mysql-shell-innovation = callPackage ../development/tools/mysql-shell/innovation.nix { antlr = antlr4_10; icu = icu73; - protobuf = protobuf_24; + protobuf = protobuf_25; stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_18.stdenv else stdenv; }; @@ -4990,7 +4990,13 @@ with pkgs; flutter327 = flutterPackages.v3_27; flutter324 = flutterPackages.v3_24; - fpc = callPackage ../development/compilers/fpc { }; + fpc = callPackage ../development/compilers/fpc { + # https://github.com/NixOS/nixpkgs/issues/416485 + # TODO: remove when upstream issue is fixed: + # https://gitlab.com/freepascal.org/fpc/source/-/issues/41045 + stdenv = + if stdenv.cc.isClang && stdenv.hostPlatform.isx86_64 then llvmPackages_17.stdenv else stdenv; + }; gambit = callPackage ../development/compilers/gambit { }; gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { }; @@ -13198,8 +13204,6 @@ with pkgs; # a somewhat more maintained fork of ympd memento = qt6Packages.callPackage ../applications/video/memento { }; - mpc-qt = qt6Packages.callPackage ../applications/video/mpc-qt { }; - mplayer = callPackage ../applications/video/mplayer ( { libdvdnav = libdvdnav_4_2_1;