diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3bb0998c975b..6e059fbe561b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3601,6 +3601,12 @@ githubId = 37768199; name = "Christian Bergschneider"; }; + blokyk = { + email = "pro@zoeee.net"; + github = "blokyk"; + githubId = 32983140; + name = "Zoë Courvoisier"; + }; bloominstrong = { email = "github@mail.bloominstrong.net"; github = "bloominstrong"; diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md index 1ec3860bcac2..078e9450c989 100644 --- a/nixos/doc/manual/release-notes/rl-2605.section.md +++ b/nixos/doc/manual/release-notes/rl-2605.section.md @@ -34,6 +34,8 @@ - [nohang](https://github.com/hakavlad/nohang), a daemon for Linux that prevents out of memory (OOM) situations from affecting system responsiveness. Available as [services.nohang](#opt-services.nohang.enable) +- [bentopdf](https://github.com/alam00000/bentopdf), a privacy-first PDF toolkit running completely in-browser. Available as [services.bentopdf](#opt-services.bentopdf.enable). + - [DankMaterialShell](https://danklinux.com), a complete desktop shell for Wayland compositors built with Quickshell. Available as [programs.dms-shell](#opt-programs.dms-shell.enable). - [dms-greeter](https://danklinux.com), a modern display manager greeter for DankMaterialShell that works with greetd and supports multiple Wayland compositors. Available as [services.displayManager.dms-greeter](#opt-services.displayManager.dms-greeter.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 19d56efec8b8..a78164c54ade 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1591,6 +1591,7 @@ ./services/web-apps/artalk.nix ./services/web-apps/audiobookshelf.nix ./services/web-apps/baikal.nix + ./services/web-apps/bentopdf.nix ./services/web-apps/bluemap.nix ./services/web-apps/bluesky-pds.nix ./services/web-apps/bookstack.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 0e4afc8935cd..340b3095ccb6 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -109,6 +109,11 @@ in consider using `programs.pay-respects` instead. '') (mkRemovedOptionModule [ "programs" "tilp2" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ + "programs" + "unity3d" + "enable" + ] "The corresponding package was removed from nixpkgs in 2022.") (mkRemovedOptionModule [ "programs" "way-cooler" ] ( "way-cooler is abandoned by its author: " + "https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html" diff --git a/nixos/modules/security/chromium-suid-sandbox.nix b/nixos/modules/security/chromium-suid-sandbox.nix index 5d7bc3269b68..a84ea02752c0 100644 --- a/nixos/modules/security/chromium-suid-sandbox.nix +++ b/nixos/modules/security/chromium-suid-sandbox.nix @@ -9,13 +9,6 @@ let sandbox = pkgs.chromium.sandbox; in { - imports = [ - (lib.mkRenamedOptionModule - [ "programs" "unity3d" "enable" ] - [ "security" "chromiumSuidSandbox" "enable" ] - ) - ]; - options.security.chromiumSuidSandbox.enable = lib.mkOption { type = lib.types.bool; default = false; diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix index 2512f4643c68..59581daeb721 100644 --- a/nixos/modules/services/backup/borgbackup.nix +++ b/nixos/modules/services/backup/borgbackup.nix @@ -206,16 +206,17 @@ let original, name, set ? { }, + extraArgs ? null, }: pkgs.runCommand "${name}-wrapper" { nativeBuildInputs = [ pkgs.makeWrapper ]; } - '' makeWrapper "${original}" "$out/bin/${name}" \ ${lib.concatStringsSep " \\\n " ( - lib.mapAttrsToList (name: value: ''--set ${name} "${value}"'') set + (lib.mapAttrsToList (name: value: ''--set ${name} "${value}"'') set) + ++ (lib.optional (extraArgs != null) ''--add-flags "${extraArgs}"'') )} ''; @@ -230,6 +231,7 @@ let } // (mkPassEnv cfg) // cfg.environment; + extraArgs = cfg.extraArgs or null; }); # Paths listed in ReadWritePaths must exist before service is started @@ -778,6 +780,9 @@ in description = '' Additional arguments for all {command}`borg` calls the service has. Handle with care. + + These extra arguments also get included in the wrapper + script for this job. ''; default = [ ]; example = [ "--remote-path=/path/to/borg" ]; diff --git a/nixos/modules/services/web-apps/bentopdf.nix b/nixos/modules/services/web-apps/bentopdf.nix new file mode 100644 index 000000000000..651896c41ea4 --- /dev/null +++ b/nixos/modules/services/web-apps/bentopdf.nix @@ -0,0 +1,112 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.bentopdf; +in +{ + options.services.bentopdf = { + enable = lib.mkEnableOption "bentopdf Privacy First PDF Toolkit"; + + package = lib.mkPackageOption pkgs "bentopdf" { + extraDescription = '' + To use the "normal mode" variant of bentopdf, which includes all socials, marketing and explanatory texts, set this option to `pkgs.bentopdf.override { simpleMode = false; }`. + ''; + }; + + domain = lib.mkOption { + description = "Domain to use for the virtual host."; + type = lib.types.str; + }; + + nginx = { + enable = lib.mkEnableOption "a virtualhost to serve bentopdf through nginx"; + + virtualHost = lib.mkOption { + type = lib.types.submodule (import ../web-servers/nginx/vhost-options.nix { inherit config lib; }); + default = { }; + example = lib.literalExpression '' + { + serverAliases = [ "bentopdf.''${config.networking.domain}" ]; + } + ''; + description = "Extra configuration for the nginx virtual host of bentopdf."; + }; + }; + + caddy = { + enable = lib.mkEnableOption "a virtualhost to serve bentopdf through caddy"; + + virtualHost = lib.mkOption { + type = lib.types.submodule ( + import ../web-servers/caddy/vhost-options.nix { cfg = config.services.caddy; } + ); + default = { }; + example = lib.literalExpression '' + { + serverAliases = [ "bentopdf.''${config.networking.domain}" ]; + } + ''; + description = "Extra configuration for the caddy virtual host of bentopdf."; + }; + }; + }; + + config = lib.mkIf cfg.enable { + services.nginx = lib.mkIf cfg.nginx.enable { + enable = lib.mkDefault true; + virtualHosts."${cfg.domain}" = lib.mkMerge [ + cfg.nginx.virtualHost + { + root = lib.mkForce "${cfg.package}"; + + locations."/" = { + index = "index.html"; + extraConfig = '' + try_files $uri $uri/ /index.html; + ''; + }; + + locations."~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$".extraConfig = '' + expires 1y; + add_header Cache-Control "public, immutable"; + ''; + } + ]; + }; + + services.caddy = lib.mkIf cfg.caddy.enable { + enable = lib.mkDefault true; + virtualHosts."${cfg.domain}" = lib.mkMerge [ + cfg.caddy.virtualHost + { + hostName = lib.mkForce cfg.domain; + extraConfig = '' + root * ${cfg.package} + try_files {path} /index.html + file_server + + @static { + path_regexp static \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ + } + handle @static { + header { + Cache-Control "public, immutable" + } + header Cache-Control max-age=31536000 + } + ''; + } + ]; + }; + }; + + meta.maintainers = with lib.maintainers; [ + charludo + stunkymonkey + ]; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 0df0f410b0f4..067215131414 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -275,6 +275,7 @@ in beanstalkd = runTest ./beanstalkd.nix; bees = runTest ./bees.nix; benchexec = runTest ./benchexec.nix; + bentopdf = handleTest ./bentopdf { }; beszel = runTest ./beszel.nix; binary-cache = runTest { imports = [ ./binary-cache.nix ]; diff --git a/nixos/tests/bentopdf/caddy.nix b/nixos/tests/bentopdf/caddy.nix new file mode 100644 index 000000000000..0f4fc88063db --- /dev/null +++ b/nixos/tests/bentopdf/caddy.nix @@ -0,0 +1,28 @@ +import ../make-test-python.nix ( + { lib, ... }: + + { + name = "bentopdf-caddy"; + meta.maintainers = with lib.maintainers; [ stunkymonkey ]; + + nodes.machine = + { pkgs, ... }: + { + services.bentopdf = { + enable = true; + domain = "localhost:80"; + caddy.enable = true; + caddy.virtualHost.extraConfig = "tls internal"; + }; + # disable letsencrypt cert fetching + services.caddy.globalConfig = "auto_https disable_certs"; + }; + + testScript = '' + machine.wait_for_unit("caddy.service") + machine.wait_for_open_port(80) + machine.succeed("curl -vvv --fail --show-error --silent --location --insecure http://localhost/") + assert "BentoPDF - The Privacy First PDF Toolkit" in machine.succeed("curl --fail --show-error --silent --location --insecure http://localhost/") + ''; + } +) diff --git a/nixos/tests/bentopdf/default.nix b/nixos/tests/bentopdf/default.nix new file mode 100644 index 000000000000..fee30e520c7f --- /dev/null +++ b/nixos/tests/bentopdf/default.nix @@ -0,0 +1,6 @@ +{ system, pkgs, ... }: + +{ + caddy = import ./caddy.nix { inherit system pkgs; }; + nginx = import ./nginx.nix { inherit system pkgs; }; +} diff --git a/nixos/tests/bentopdf/nginx.nix b/nixos/tests/bentopdf/nginx.nix new file mode 100644 index 000000000000..257dc909894e --- /dev/null +++ b/nixos/tests/bentopdf/nginx.nix @@ -0,0 +1,24 @@ +import ../make-test-python.nix ( + { lib, ... }: + + { + name = "bentopdf-nginx"; + meta.maintainers = with lib.maintainers; [ stunkymonkey ]; + + nodes.machine = + { pkgs, ... }: + { + services.bentopdf = { + enable = true; + domain = "localhost"; + nginx.enable = true; + }; + }; + + testScript = '' + machine.wait_for_unit("nginx.service") + machine.wait_for_open_port(80) + assert "BentoPDF - The Privacy First PDF Toolkit" in machine.succeed("curl --fail --show-error --silent --location --insecure http://localhost:80/") + ''; + } +) diff --git a/nixos/tests/borgbackup.nix b/nixos/tests/borgbackup.nix index d26ad166de5d..a52b9d80ee84 100644 --- a/nixos/tests/borgbackup.nix +++ b/nixos/tests/borgbackup.nix @@ -131,7 +131,8 @@ in repo = remoteRepo; encryption.mode = "none"; startAt = [ ]; - environment.BORG_RSH = "ssh -oStrictHostKeyChecking=no -i /root/id_ed25519"; + # This uses extraArgs instead of BORG_RSH to test propagation of these args + extraArgs = [ "--rsh=ssh -oStrictHostKeyChecking=no -i /root/id_ed25519" ]; }; commandFail = { diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index cb9dc2535e19..2d19d6dbf5f6 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2615,8 +2615,8 @@ let mktplcRef = { name = "language-julia"; publisher = "julialang"; - version = "1.182.2"; - hash = "sha256-PIhaYlGxOGycuE9YKyJ0xD7QEjKgmtHX7l4x/xs0GjU="; + version = "1.187.2"; + hash = "sha256-LYpcccJy+asBicetU6WD4yIvMDQTbg4b9GY20+TYsnc="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/julialang.language-julia/changelog"; @@ -3301,8 +3301,8 @@ let mktplcRef = { name = "cpptools-extension-pack"; publisher = "ms-vscode"; - version = "1.3.1"; - hash = "sha256-HbI0UdN8uwHS2MPH1SGZhxNaN18cWzjMyWYcgVE7FjY="; + version = "1.5.1"; + hash = "sha256-5jmv/CnuAMwG8asvW2iW8j837ldnLZ3rJSQbNsNvN0M="; }; meta = { description = "Popular extensions for C++ development in Visual Studio Code"; diff --git a/pkgs/applications/emulators/libretro/cores/beetle-vb.nix b/pkgs/applications/emulators/libretro/cores/beetle-vb.nix index e6af3a42ae21..b67a2d2bee05 100644 --- a/pkgs/applications/emulators/libretro/cores/beetle-vb.nix +++ b/pkgs/applications/emulators/libretro/cores/beetle-vb.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mednafen-vb"; - version = "0-unstable-2024-10-21"; + version = "0-unstable-2026-02-19"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-vb-libretro"; - rev = "8f837ebc077afdd6652efb2827fd8308a07113ca"; - hash = "sha256-eAnBubNhj78G4r8OHVqwFXGOSA9wEYI6ZwNyiwDW8W8="; + rev = "65debc7c4c7b85e2fd988d2be53496c2cf0b5f44"; + hash = "sha256-9LIGNbF0TuWm07TkTsRX8i7cBtJrOfSgBa8swKHddPQ="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/stella.nix b/pkgs/applications/emulators/libretro/cores/stella.nix index a8381287556b..e9a917a84592 100644 --- a/pkgs/applications/emulators/libretro/cores/stella.nix +++ b/pkgs/applications/emulators/libretro/cores/stella.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "stella"; - version = "0-unstable-2026-02-13"; + version = "0-unstable-2026-02-18"; src = fetchFromGitHub { owner = "stella-emu"; repo = "stella"; - rev = "9d7d1d2d6cc571821a8aa2459b9c1c914947cbd6"; - hash = "sha256-YE+LTuGUJN1mGEyK+aJgivYkMEjI+1ISwmWYDypm/a0="; + rev = "30b15892eec8aac36075e07b2f719bf7ff494344"; + hash = "sha256-mgu7JmZ9veng6WauFEUW5nON9vlrnXsgmLU7wzTZhTY="; }; makefile = "Makefile"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index bc539b258add..400145f4c207 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -400,13 +400,13 @@ "vendorHash": null }, "fastly_fastly": { - "hash": "sha256-FZNwWjgxdJ/g3ByjbsD5isMan7e7QUX2w5ZHR4qHJKw=", + "hash": "sha256-KPEgLMxKyiepNb5A9uJmcOEDDbE+L0k6Cz3hAVg0H08=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v8.6.0", + "rev": "v8.7.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-YgmjUSKq9wAkixq9oL5dXwNY2Yt/QRdOLj75M8UWj1w=" + "vendorHash": "sha256-xgIAmxi9VvPsWqBtQHchv5UvwALkayxmoMsUp0aYJVs=" }, "flexibleenginecloud_flexibleengine": { "hash": "sha256-yEZ9JiUSqFFbfqzOOD59ZBv4yFCeUBBKlp6aiUqDqiM=", @@ -1301,11 +1301,11 @@ "vendorHash": "sha256-Hzq97ElAjs7Y4tmJ2x7+g4j74MEdEvI2bD8pkvi5ZXg=" }, "temporalio_temporalcloud": { - "hash": "sha256-bqUANWb+8XyY6iRGudSHKOHsErg40TY9SoaJArFqWNM=", + "hash": "sha256-ZoDn6s4YlgoMrrAeUVmKx0rASEDoZVbcV4eFjZxaFQA=", "homepage": "https://registry.terraform.io/providers/temporalio/temporalcloud", "owner": "temporalio", "repo": "terraform-provider-temporalcloud", - "rev": "v1.2.0", + "rev": "v1.2.1", "spdx": "MPL-2.0", "vendorHash": "sha256-omxEb+ntQuHDfS2Rmt0rj0BF0Q2T8DLhobLua2uU/0o=" }, diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index b9cba535c37a..d32465afcf4a 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ''; env = { - NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration -Wno-error=implicit-int -Wno-error=incompatible-pointer-types -DPROTOTYPES=1"; } # https://github.com/ygrek/mldonkey/issues/117 // lib.optionalAttrs stdenv.cc.isClang { diff --git a/pkgs/applications/video/anilibria-winmaclinux/0001-fix-installation-paths.patch b/pkgs/by-name/an/anilibria-winmaclinux/0001-fix-installation-paths.patch similarity index 100% rename from pkgs/applications/video/anilibria-winmaclinux/0001-fix-installation-paths.patch rename to pkgs/by-name/an/anilibria-winmaclinux/0001-fix-installation-paths.patch diff --git a/pkgs/applications/video/anilibria-winmaclinux/0002-disable-version-check.patch b/pkgs/by-name/an/anilibria-winmaclinux/0002-disable-version-check.patch similarity index 100% rename from pkgs/applications/video/anilibria-winmaclinux/0002-disable-version-check.patch rename to pkgs/by-name/an/anilibria-winmaclinux/0002-disable-version-check.patch diff --git a/pkgs/applications/video/anilibria-winmaclinux/default.nix b/pkgs/by-name/an/anilibria-winmaclinux/package.nix similarity index 80% rename from pkgs/applications/video/anilibria-winmaclinux/default.nix rename to pkgs/by-name/an/anilibria-winmaclinux/package.nix index edc86454c5ef..bb11f1fe635f 100644 --- a/pkgs/applications/video/anilibria-winmaclinux/default.nix +++ b/pkgs/by-name/an/anilibria-winmaclinux/package.nix @@ -2,14 +2,9 @@ lib, stdenv, fetchFromGitHub, - qmake, + libsForQt5, pkg-config, - qtbase, - qtquickcontrols2, - qtwebsockets, - qtmultimedia, gst_all_1, - wrapQtAppsHook, makeDesktopItem, copyDesktopItems, @@ -19,18 +14,18 @@ mpv-unwrapped, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "anilibria-winmaclinux"; version = "2.2.34"; src = fetchFromGitHub { owner = "anilibria"; repo = "anilibria-winmaclinux"; - rev = version; + tag = finalAttrs.version; hash = "sha256-58NFlB6viWXG13J+RBzMj6LlYFClpWpGQ/aCNxJ5wKQ="; }; - sourceRoot = "${src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; qmakeFlags = [ "PREFIX=${placeholder "out"}" @@ -64,17 +59,17 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - qmake + libsForQt5.qmake pkg-config - wrapQtAppsHook + libsForQt5.wrapQtAppsHook copyDesktopItems ]; buildInputs = [ - qtbase - qtquickcontrols2 - qtwebsockets - qtmultimedia + libsForQt5.qtbase + libsForQt5.qtquickcontrols2 + libsForQt5.qtwebsockets + libsForQt5.qtmultimedia ] ++ (with gst_all_1; [ gst-plugins-bad @@ -87,11 +82,11 @@ stdenv.mkDerivation rec { ++ lib.optionals withMPV [ mpv-unwrapped.dev ]; desktopItems = [ - (makeDesktopItem rec { + (makeDesktopItem { name = "AniLibria"; - desktopName = name; + desktopName = "AniLibria"; icon = "anilibria"; - comment = meta.description; + comment = finalAttrs.meta.description; genericName = "AniLibria desktop client"; categories = [ "Qt" @@ -99,7 +94,7 @@ stdenv.mkDerivation rec { "Player" ]; keywords = [ "anime" ]; - exec = name; + exec = "AniLibria"; terminal = false; }) ]; @@ -109,7 +104,7 @@ stdenv.mkDerivation rec { description = "AniLibria cross platform desktop client"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ _3JlOy-PYCCKUi ]; - inherit (qtbase.meta) platforms; + inherit (libsForQt5.qtbase.meta) platforms; mainProgram = "AniLibria"; }; -} +}) diff --git a/pkgs/by-name/ar/argocd/package.nix b/pkgs/by-name/ar/argocd/package.nix index 0ca10501e6db..6ac44a044363 100644 --- a/pkgs/by-name/ar/argocd/package.nix +++ b/pkgs/by-name/ar/argocd/package.nix @@ -13,13 +13,13 @@ buildGoModule (finalAttrs: { pname = "argocd"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; tag = "v${finalAttrs.version}"; - hash = "sha256-FvN4JCG/5SxpnmdEH9X1sMX5dNlp/x0ALNysv+LWroU="; + hash = "sha256-tk8R1StNqYWNadGKrhUXmjoCxb0bwdMyWjokHFtFWEc="; }; ui = stdenv.mkDerivation { diff --git a/pkgs/by-name/au/autobrr/package.nix b/pkgs/by-name/au/autobrr/package.nix index c91eafa9d865..c0b8be90107d 100644 --- a/pkgs/by-name/au/autobrr/package.nix +++ b/pkgs/by-name/au/autobrr/package.nix @@ -6,7 +6,7 @@ stdenvNoCC, nix-update-script, nodejs, - pnpm_9, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, typescript, @@ -15,12 +15,12 @@ let pname = "autobrr"; - version = "1.71.0"; + version = "1.73.0"; src = fetchFromGitHub { owner = "autobrr"; repo = "autobrr"; tag = "v${version}"; - hash = "sha256-JAWnH0S7gDBwmQXpogiTCIWWfQkrI5wOjWkV6+ANcnc="; + hash = "sha256-wBD44lkh+OX0x6eZmPMAMJDpKOzrdheXo8Ar+iyTXOw="; }; autobrr-web = stdenvNoCC.mkDerivation { @@ -30,7 +30,7 @@ let nativeBuildInputs = [ nodejs pnpmConfigHook - pnpm_9 + pnpm_10 typescript ]; @@ -43,9 +43,9 @@ let src sourceRoot ; - pnpm = pnpm_9; - fetcherVersion = 1; - hash = "sha256-LOY8fLGsX966MyH4w+pa9tm/5HS6LnGwd51cj8TG6Mk="; + pnpm = pnpm_10; + fetcherVersion = 3; + hash = "sha256-2medzt9mraxB+ZmyHL3cSyFEQh3k2NnMookHqE1S51o="; }; postBuild = '' @@ -65,7 +65,7 @@ buildGoModule (finalAttrs: { src ; - vendorHash = "sha256-avgMRD5WSjXVVJ8r0Rq0IhfwPvxc/Sq9JxzX0rQimWI="; + vendorHash = "sha256-ENxUQz2Pn7dgRzZc86AUNkm9Gvi0+CJKxYNI4j6xPxg="; preBuild = '' cp -r ${autobrr-web}/* web/dist diff --git a/pkgs/by-name/be/bentopdf/package.nix b/pkgs/by-name/be/bentopdf/package.nix new file mode 100644 index 000000000000..9032644598ab --- /dev/null +++ b/pkgs/by-name/be/bentopdf/package.nix @@ -0,0 +1,54 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nixosTests, + simpleMode ? true, +}: +buildNpmPackage (finalAttrs: { + pname = "bentopdf"; + # We intentionally don't update the version, due to: + # https://github.com/NixOS/nixpkgs/issues/484067 + # nixpkgs-update: no auto update + version = "1.11.2"; + + src = fetchFromGitHub { + owner = "alam00000"; + repo = "bentopdf"; + tag = "v${finalAttrs.version}"; + hash = "sha256-br4My0Q4zoA+ZIrXM4o4oQjZ7IpSdwg+iKiAUdc2B/s="; + }; + npmDepsHash = "sha256-UNNNYO7e7qdumI0/ka2ieFZzKURPl1V3981vHCPcVfY="; + + npmBuildFlags = [ + "--" + "--mode" + "production" + ]; + + env.SIMPLE_MODE = lib.boolToString simpleMode; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -r dist/* $out/ + + runHook postInstall + ''; + + passthru.tests = { + inherit (nixosTests.bentopdf) caddy nginx; + }; + + meta = { + description = "Privacy-first PDF toolkit"; + homepage = "https://bentopdf.com"; + changelog = "https://github.com/alam00000/bentopdf/releases"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ + charludo + stunkymonkey + ]; + }; +}) diff --git a/pkgs/by-name/bl/bluebubbles/package.nix b/pkgs/by-name/bl/bluebubbles/package.nix index 777f06610383..c238286763f8 100644 --- a/pkgs/by-name/bl/bluebubbles/package.nix +++ b/pkgs/by-name/bl/bluebubbles/package.nix @@ -55,6 +55,7 @@ flutter329.buildFlutterApplication rec { sed -i 's#Icon=.*/bluebubbles.png#Icon=bluebubbles#g' snap/gui/bluebubbles.desktop install -Dm0644 snap/gui/bluebubbles.desktop $out/share/applications/bluebubbles.desktop install -Dm0644 snap/gui/bluebubbles.png -t $out/share/icons/hicolor/1024x1024/apps + install -Dm0644 flatpak/icon/128x128.png $out/share/icons/hicolor/128x128/apps/bluebubbles.png ''; extraWrapProgramArgs = '' diff --git a/pkgs/by-name/co/cockpit-files/package.nix b/pkgs/by-name/co/cockpit-files/package.nix index fdcebd486a01..ec70a5b0bf33 100644 --- a/pkgs/by-name/co/cockpit-files/package.nix +++ b/pkgs/by-name/co/cockpit-files/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cockpit-files"; - version = "35"; + version = "36"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit-files"; tag = finalAttrs.version; - hash = "sha256-ziFtsWZPdzkqc3UEaoIfwsIe8q/H0lyLtEropA2w+pc="; + hash = "sha256-JuGYEF+XIxHP2ACfujAglFk/rocEc7HL3Tjl3txPLjA="; fetchSubmodules = true; postFetch = "cp $out/node_modules/.package-lock.json $out/package-lock.json"; diff --git a/pkgs/by-name/co/cockpit-podman/package.nix b/pkgs/by-name/co/cockpit-podman/package.nix index d4e0d7c6191c..dd33eabc71ac 100644 --- a/pkgs/by-name/co/cockpit-podman/package.nix +++ b/pkgs/by-name/co/cockpit-podman/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cockpit-podman"; - version = "120"; + version = "121"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit-podman"; tag = finalAttrs.version; - hash = "sha256-1PXz+zHuj5fjzDe194+sgBlLhQnS9jzv9FbM9RfNIVc="; + hash = "sha256-xjBt+4WbbLYOUJwjKhQMayXfLOqS1xw6klo99WH/0vM="; fetchSubmodules = true; postFetch = "cp $out/node_modules/.package-lock.json $out/package-lock.json"; diff --git a/pkgs/by-name/co/collada-dom/package.nix b/pkgs/by-name/co/collada-dom/package.nix index 4b2c56122f12..685f01304dba 100644 --- a/pkgs/by-name/co/collada-dom/package.nix +++ b/pkgs/by-name/co/collada-dom/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "collada-dom"; - version = "2.5.2"; + version = "2.5.3"; __structuredAttrs = true; strictDeps = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "Gepetto"; repo = "collada-dom"; tag = "v${finalAttrs.version}"; - hash = "sha256-53Gf6OLwrflZcrWKPuNPS0k+jlj5yTzCkI/QYQFta48="; + hash = "sha256-vkbQvgY1ISOhbDeEmLuOWRfwQsOZRffUi3tpT/G33KY="; }; postInstall = '' diff --git a/pkgs/by-name/dp/dpkg/package.nix b/pkgs/by-name/dp/dpkg/package.nix index c2e6b0ed08ed..618649f16e56 100644 --- a/pkgs/by-name/dp/dpkg/package.nix +++ b/pkgs/by-name/dp/dpkg/package.nix @@ -15,7 +15,7 @@ pkg-config, diffutils, versionCheckHook, - glibc ? !stdenv.hostPlatform.isDarwin, + glibc, }: stdenv.mkDerivation (finalAttrs: { @@ -91,10 +91,20 @@ stdenv.mkDerivation (finalAttrs: { # which makes some tests fail. sed -i '/opts normalize/a AT_SKIP_IF([true])' src/at/chdir.at '' - + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' - substituteInPlace src/main/help.c \ - --replace-fail '"ldconfig"' \"${glibc.bin}/bin/ldconfig\" - ''; + + + lib.optionalString + ( + stdenv.hostPlatform.libc == "glibc" + || stdenv.hostPlatform.libc == "uclibc" + || stdenv.hostPlatform.isFreeBSD + || stdenv.hostPlatform.isOpenBSD + || stdenv.hostPlatform.isNetBSD + ) + '' + # See + substituteInPlace src/main/help.c \ + --replace-fail '"ldconfig"' \"${glibc.bin}/bin/ldconfig\" + ''; buildInputs = [ perl diff --git a/pkgs/by-name/go/go2tv/package.nix b/pkgs/by-name/go/go2tv/package.nix index f1e93e5b88b7..8c4a92543ad4 100644 --- a/pkgs/by-name/go/go2tv/package.nix +++ b/pkgs/by-name/go/go2tv/package.nix @@ -16,16 +16,16 @@ buildGoModule rec { pname = "go2tv" + lib.optionalString (!withGui) "-lite"; - version = "2.0.2"; + version = "2.1.0"; src = fetchFromGitHub { owner = "alexballas"; repo = "go2tv"; tag = "v${version}"; - hash = "sha256-oyd6H3U799el9xcte3mOJo0m2YQTZ/vZjFdM2F7Cha8="; + hash = "sha256-nAvfWRXPYX5AcJ0S3QXlcOtEEIUQK0FZqSSBNxDtGu4="; }; - vendorHash = "sha256-2eEB6yfWFD7X3+qQenRoMiyzHH9i/gDg0IuOo/gUBFw="; + vendorHash = "sha256-vxWvv7PE3VlU2Z9WEAvKiUgJCrK0a6QerMA3Vw+CLZo="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/go/gogdl/package.nix b/pkgs/by-name/go/gogdl/package.nix index f27bef651e35..8d10143de43d 100644 --- a/pkgs/by-name/go/gogdl/package.nix +++ b/pkgs/by-name/go/gogdl/package.nix @@ -6,16 +6,15 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "gogdl"; - version = "1.2.0"; + version = "1.2.1"; pyproject = true; src = fetchFromGitHub { owner = "Heroic-Games-Launcher"; repo = "heroic-gogdl"; - # two commits after the v1.2.0 tag, because the release messed up submodule fetching - rev = "9759dfb1f50e0c68854f938e9568d84cab59652c"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-yjiPHEiZjs9TnBRaKzm1TpLcPK0tfIrzM30DX66m+1Y="; + hash = "sha256-qYarDcwrVrTpLHQYdWQvXL5+V1wMyL06+n5t6LXKBHI="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/gr/grayjay/deps.json b/pkgs/by-name/gr/grayjay/deps.json index 51247df06851..c761e2390413 100644 --- a/pkgs/by-name/gr/grayjay/deps.json +++ b/pkgs/by-name/gr/grayjay/deps.json @@ -4,11 +4,6 @@ "version": "3.1.2", "hash": "sha256-v7ZoEFZyhF8VcRZj1uim4HNiRsG+XdJ4x/dwPBIWUz8=" }, - { - "pname": "coverlet.collector", - "version": "6.0.0", - "hash": "sha256-IEmweTMapcPhFHpmJsPXfmMhravYOrWupgjeOvMmQ4o=" - }, { "pname": "Dapper", "version": "2.1.28", @@ -16,8 +11,8 @@ }, { "pname": "FCastSenderSDKDotnet", - "version": "0.0.5", - "hash": "sha256-UTCgJ1M0n7PcVoU/7slh5sFitJ+t7ZdgkdUDZ5CVvGk=" + "version": "0.0.7", + "hash": "sha256-/eHsYJd+7cqDVMW+XiKBPBrjR+eVLUpYazb96Bh3fac=" }, { "pname": "Fizzler", @@ -94,11 +89,6 @@ "version": "17.3.2", "hash": "sha256-APxmbKMNQKWuFQMJjkVr2zIqv/bLUTMm5NRGVLegBbg=" }, - { - "pname": "Microsoft.CodeCoverage", - "version": "17.6.0", - "hash": "sha256-sYk+9Gj1M1HI6yEB8ZJQ4fiqGjYos+orebV8blFDSQs=" - }, { "pname": "Microsoft.CSharp", "version": "4.0.1", @@ -124,11 +114,6 @@ "version": "17.3.2", "hash": "sha256-1fZ/rrSbuyYUfvwyA3otFQdL0Y/H48goAVyhiLs1oF4=" }, - { - "pname": "Microsoft.NET.Test.Sdk", - "version": "17.6.0", - "hash": "sha256-pogseJyMGIikTZORsDXKwyAhRPTkxiOAAV+ceR6/3K4=" - }, { "pname": "Microsoft.NETCore.Platforms", "version": "1.1.0", @@ -144,21 +129,11 @@ "version": "17.3.2", "hash": "sha256-wdLQSEjvFjApEKU82Ev+y1kHVxeIlrjkuj3wNktGQy8=" }, - { - "pname": "Microsoft.TestPlatform.ObjectModel", - "version": "17.6.0", - "hash": "sha256-weQPisiWSuM5VEeZco4S0QHEXd2bZZwlbyHoaCET4uc=" - }, { "pname": "Microsoft.TestPlatform.TestHost", "version": "17.3.2", "hash": "sha256-ySBqawHGZ/Dwoj2UnAzk1Ezxt4qR1AuEY73U/buqNiE=" }, - { - "pname": "Microsoft.TestPlatform.TestHost", - "version": "17.6.0", - "hash": "sha256-Ee2SKz5/571l1aYP0b/Gfamsz+v6cjzyu2sKTC6Ld5s=" - }, { "pname": "Microsoft.Win32.Primitives", "version": "4.3.0", @@ -169,21 +144,11 @@ "version": "2.2.10", "hash": "sha256-xpt9NDMDkoV/SzTWLgpKbqMOnhbUKZlBrdFwMGwpzHA=" }, - { - "pname": "MSTest.TestAdapter", - "version": "3.0.4", - "hash": "sha256-cxynZ6I681YIclJeGtv1OiAxMOdx7FDyVIzNOg10Tgo=" - }, { "pname": "MSTest.TestFramework", "version": "2.2.10", "hash": "sha256-PEoY4N5F+xhQa6wXiX8SaVHAxw9C7fN+zSNfoModt0g=" }, - { - "pname": "MSTest.TestFramework", - "version": "3.0.4", - "hash": "sha256-aJqGvGfM2fl2dG05PFgPth/1qMhVpDRBMWuNu4yt4Dc=" - }, { "pname": "NETStandard.Library", "version": "1.6.1", diff --git a/pkgs/by-name/gr/grayjay/package.nix b/pkgs/by-name/gr/grayjay/package.nix index 090a20d27575..56a9a2dc8563 100644 --- a/pkgs/by-name/gr/grayjay/package.nix +++ b/pkgs/by-name/gr/grayjay/package.nix @@ -41,13 +41,13 @@ _experimental-update-script-combinators, }: let - version = "13"; + version = "16"; src = fetchFromGitLab { domain = "gitlab.futo.org"; owner = "videostreaming"; repo = "Grayjay.Desktop"; tag = version; - hash = "sha256-cnOhyaeoDXPaeRJnJpx1HcegWitcfMJe/vezxZ/zpFQ="; + hash = "sha256-2PCa9nP98htK9p5N6QPPZT6aYqaoAEBmag9JGnoujso="; fetchSubmodules = true; fetchLFS = true; }; @@ -58,7 +58,7 @@ let sourceRoot = "source/Grayjay.Desktop.Web"; npmBuildScript = "build"; - npmDepsHash = "sha256-3nPzQcDWhPCdLrPvwGY+K0t1OSxWrVwQ3hH7i0eynRU="; + npmDepsHash = "sha256-3yJIPkuEvkFL9Wb4y/r0yEULQbXx/wHqicFBLzOPj68="; installPhase = '' runHook preInstall @@ -114,7 +114,6 @@ buildDotnetModule (finalAttrs: { ]; testProjectFile = [ - "Grayjay.Desktop.Tests/Grayjay.Desktop.Tests.csproj" "Grayjay.Engine/Grayjay.Engine.Tests/Grayjay.Engine.Tests.csproj" ]; diff --git a/pkgs/by-name/he/heroic-unwrapped/legendary.nix b/pkgs/by-name/he/heroic-unwrapped/legendary.nix index 831c3a8b405d..5054286fdabf 100644 --- a/pkgs/by-name/he/heroic-unwrapped/legendary.nix +++ b/pkgs/by-name/he/heroic-unwrapped/legendary.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "legendary-heroic"; - version = "0.20.39"; + version = "0.20.41"; pyproject = true; src = fetchFromGitHub { owner = "Heroic-Games-Launcher"; repo = "legendary"; tag = finalAttrs.version; - hash = "sha256-2+9MRbwugBlBdZQQo6BUcLmwCqVdTAv9CZ+sPu5VAxY="; + hash = "sha256-zX5Lyj8IDHETFyEpUaFnGaYZVs1hDy9rtwab1+rNlrw="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/he/heroic-unwrapped/package.nix b/pkgs/by-name/he/heroic-unwrapped/package.nix index 888dd21715c4..1168dc3d1c7b 100644 --- a/pkgs/by-name/he/heroic-unwrapped/package.nix +++ b/pkgs/by-name/he/heroic-unwrapped/package.nix @@ -30,13 +30,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "heroic-unwrapped"; - version = "2.19.1"; + version = "2.20.0"; src = fetchFromGitHub { owner = "Heroic-Games-Launcher"; repo = "HeroicGamesLauncher"; tag = "v${finalAttrs.version}"; - hash = "sha256-e+/FRvG9u6ZQsMGD5hqY+yLPjsbLSrjC9Wp0xdxVk6w="; + hash = "sha256-gjQPQ/PwpDlBUfNF1JAlWUDGJa+7hwoQtouihdSCDqI="; }; pnpmDeps = fetchPnpmDeps { @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { ; inherit pnpm; fetcherVersion = 3; - hash = "sha256-uwJYOm+2wGNRHAiIw1UjCBLBW6kjtj6AFLWihCqtL28="; + hash = "sha256-JLUiPNxcOpwkYaabl2kP73fgr+WFyXQW8y6qDIb5gt4="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/monitoring/prometheus/kthxbye.nix b/pkgs/by-name/kt/kthxbye/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/kthxbye.nix rename to pkgs/by-name/kt/kthxbye/package.nix diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/by-name/li/linode-cli/package.nix similarity index 71% rename from pkgs/tools/virtualization/linode-cli/default.nix rename to pkgs/by-name/li/linode-cli/package.nix index 831e8dbf2440..532f4c9cb1d8 100644 --- a/pkgs/tools/virtualization/linode-cli/default.nix +++ b/pkgs/by-name/li/linode-cli/package.nix @@ -1,19 +1,10 @@ { stdenv, - buildPythonApplication, - colorclass, fetchPypi, fetchurl, installShellFiles, lib, - linode-metadata, - openapi3, - packaging, - pyyaml, - requests, - rich, - setuptools, - terminaltables, + python3Packages, }: let @@ -28,48 +19,51 @@ let in -buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "linode-cli"; version = "5.56.2"; pyproject = true; src = fetchPypi { pname = "linode_cli"; - inherit version; + inherit (finalAttrs) version; hash = hash; }; + build-system = [ + python3Packages.setuptools + ]; + patches = [ ./remove-update-check.patch ]; # remove need for git history prePatch = '' substituteInPlace setup.py \ - --replace "version = get_version()" "version='${version}'," + --replace "version = get_version()" "version='${finalAttrs.version}'," ''; postConfigure = '' python3 -m linodecli bake ${spec} --skip-config cp data-3 linodecli/ - echo "${version}" > baked_version + echo "${finalAttrs.version}" > baked_version ''; nativeBuildInputs = [ installShellFiles ]; - propagatedBuildInputs = [ - colorclass - linode-metadata - pyyaml - requests - setuptools - terminaltables - rich - openapi3 - packaging + dependencies = [ + python3Packages.colorclass + python3Packages.linode-metadata + python3Packages.pyyaml + python3Packages.requests + python3Packages.terminaltables + python3Packages.rich + python3Packages.openapi3 + python3Packages.packaging ]; doInstallCheck = true; installCheckPhase = '' - $out/bin/linode-cli --skip-config --version | grep ${version} > /dev/null + $out/bin/linode-cli --skip-config --version | grep ${finalAttrs.version} > /dev/null ''; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' @@ -83,7 +77,7 @@ buildPythonApplication rec { meta = { description = "Linode Command Line Interface"; - changelog = "https://github.com/linode/linode-cli/releases/tag/v${version}"; + changelog = "https://github.com/linode/linode-cli/releases/tag/v${finalAttrs.version}"; downloadPage = "https://pypi.org/project/linode-cli"; homepage = "https://github.com/linode/linode-cli"; license = lib.licenses.bsd3; @@ -93,4 +87,4 @@ buildPythonApplication rec { ]; mainProgram = "linode-cli"; }; -} +}) diff --git a/pkgs/tools/virtualization/linode-cli/remove-update-check.patch b/pkgs/by-name/li/linode-cli/remove-update-check.patch similarity index 100% rename from pkgs/tools/virtualization/linode-cli/remove-update-check.patch rename to pkgs/by-name/li/linode-cli/remove-update-check.patch diff --git a/pkgs/tools/virtualization/linode-cli/update.sh b/pkgs/by-name/li/linode-cli/update.sh similarity index 100% rename from pkgs/tools/virtualization/linode-cli/update.sh rename to pkgs/by-name/li/linode-cli/update.sh diff --git a/pkgs/by-name/lu/lunar/package.nix b/pkgs/by-name/lu/lunar/package.nix index de5244bfefc4..d14faf6a0b11 100644 --- a/pkgs/by-name/lu/lunar/package.nix +++ b/pkgs/by-name/lu/lunar/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "lunar"; - version = "6.9.5"; + version = "6.9.7"; src = fetchurl { url = "https://github.com/alin23/Lunar/releases/download/v${finalAttrs.version}/Lunar-${finalAttrs.version}.dmg"; - hash = "sha256-1Y0SFfGliGf1zf4k9iolotMzoAbBH27R0ablMmfeyDM="; + hash = "sha256-CqxhLUL/Vnt665xcZFaXg/MWywca6j/pr03oLoyofYQ="; }; sourceRoot = "."; diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix index 811f5ab8b997..e552b2beebd7 100644 --- a/pkgs/by-name/mo/models-dev/package.nix +++ b/pkgs/by-name/mo/models-dev/package.nix @@ -9,12 +9,12 @@ }: let pname = "models-dev"; - version = "0-unstable-2026-02-14"; + version = "0-unstable-2026-02-21"; src = fetchFromGitHub { owner = "anomalyco"; repo = "models.dev"; - rev = "5a008354709f3331f1070cb2c70c184ac8845996"; - hash = "sha256-XMblZXkqrtZSHa0d96sbPtcMQCJfnHZdnQEpaZqc0O0="; + rev = "c36b8e94339b004bddc0d84f816bcac14babe1ba"; + hash = "sha256-z8yswVNWuf/aDbwirp99nCw4VCfzCVIOB4+5s5CKo3I="; }; node_modules = stdenvNoCC.mkDerivation { diff --git a/pkgs/by-name/nn/nnn/darwin-fix-file-mime-opts.patch b/pkgs/by-name/nn/nnn/darwin-fix-file-mime-opts.patch index f1bf71e6b912..3175da31e4b9 100644 --- a/pkgs/by-name/nn/nnn/darwin-fix-file-mime-opts.patch +++ b/pkgs/by-name/nn/nnn/darwin-fix-file-mime-opts.patch @@ -1,12 +1,12 @@ diff --git a/src/nnn.c b/src/nnn.c -index b3c0f986..c74e1ec9 100644 +index 108e2995..eb5a440d 100644 --- a/src/nnn.c +++ b/src/nnn.c -@@ -508,9 +508,7 @@ alignas(max_align_t) static char g_pipepath[TMP_LEN_MAX]; +@@ -572,9 +572,7 @@ alignas(max_align_t) static char g_pipepath[TMP_LEN_MAX]; static runstate g_state; /* Options to identify file MIME */ --#if defined(__APPLE__) +-#ifdef __APPLE__ -#define FILE_MIME_OPTS "-bIL" -#elif !defined(__sun) /* no MIME option for 'file' */ +#if !defined(__sun) /* no MIME option for 'file' */ diff --git a/pkgs/by-name/nn/nnn/package.nix b/pkgs/by-name/nn/nnn/package.nix index 001d9725bb88..1577cb19589d 100644 --- a/pkgs/by-name/nn/nnn/package.nix +++ b/pkgs/by-name/nn/nnn/package.nix @@ -10,7 +10,7 @@ readline, which, musl-fts, - pcre, + pcre2, gnused, # options conf ? null, @@ -28,13 +28,13 @@ assert withEmojis -> (!withIcons && !withNerdIcons); stdenv.mkDerivation (finalAttrs: { pname = "nnn"; - version = "5.1"; + version = "5.2"; src = fetchFromGitHub { owner = "jarun"; repo = "nnn"; tag = "v${finalAttrs.version}"; - hash = "sha256-+2lFFBtaqRPBkEspCFtKl9fllbSR5MBB+4ks3Xh7vp4="; + hash = "sha256-u+88aDHfOZ6bSkg6ahS6eNZWj2QCwJXKW+8nHR99kic="; }; patches = [ @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { ncurses ] ++ lib.optional stdenv.hostPlatform.isMusl musl-fts - ++ lib.optional withPcre pcre; + ++ lib.optional withPcre pcre2; env = lib.optionalAttrs stdenv.hostPlatform.isMusl { NIX_CFLAGS_COMPILE = "-I${musl-fts}/include"; @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals withIcons [ "O_ICONS=1" ] ++ lib.optionals withNerdIcons [ "O_NERD=1" ] ++ lib.optionals withEmojis [ "O_EMOJI=1" ] - ++ lib.optionals withPcre [ "O_PCRE=1" ] + ++ lib.optionals withPcre [ "O_PCRE2=1" ] ++ extraMakeFlags; binPath = lib.makeBinPath [ @@ -101,6 +101,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/jarun/nnn/blob/v${finalAttrs.version}/CHANGELOG"; license = lib.licenses.bsd2; platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ sikmir ]; mainProgram = "nnn"; }; }) diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix index 4340ae1f6002..d4c8c74c9d20 100644 --- a/pkgs/by-name/op/openscad-unstable/package.nix +++ b/pkgs/by-name/op/openscad-unstable/package.nix @@ -10,6 +10,7 @@ bison, boost, cairo, + catch2_3, cgal, clipper2, double-conversion, @@ -56,12 +57,13 @@ let in clangStdenv.mkDerivation rec { pname = "openscad-unstable"; - version = "2021.01-unstable-2025-10-27"; + unstable_date = "2026-02-18"; + version = "2021.01-unstable-${unstable_date}"; src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "aa785fe4ab3d52450a5e51eb73585ac9bbcc8798"; - hash = "sha256-TngfItArYtm8243DdYkQlkfc/MBTZGYrf08hfloWRWk="; + rev = "231f4f8d5e3a0697825455cccbd2edb2fb9491cd"; + hash = "sha256-YAKXU3z4ZBviGnt0LFgrS6yeEMm3REdkhyfJ4bZ4Vo8="; fetchSubmodules = true; # Only really need sanitizers-cmake and MCAD and manifold }; @@ -80,6 +82,7 @@ clangStdenv.mkDerivation rec { with libsForQt5; with qt5; [ + catch2_3 clipper2 glm onetbb @@ -121,7 +124,8 @@ clangStdenv.mkDerivation rec { "-DUSE_BUILTIN_OPENCSG=OFF" "-DUSE_BUILTIN_MANIFOLD=OFF" "-DUSE_BUILTIN_CLIPPER2=OFF" - "-DOPENSCAD_VERSION=\"${builtins.replaceStrings [ "-" ] [ "." ] (lib.strings.getVersion version)}\"" + # Derive version from our unstable date + "-DOPENSCAD_VERSION='${builtins.replaceStrings [ "-" ] [ "." ] unstable_date}-unstable'" "-DCMAKE_UNITY_BUILD=OFF" # broken compile with unity # IPO "-DCMAKE_EXE_LINKER_FLAGS=-fuse-ld=lld" @@ -148,6 +152,8 @@ clangStdenv.mkDerivation rec { ''; postPatch = '' + patchShebangs scripts/ + # Take Python3 executable as passed sed -e '/set(VENV_DIR /d' -i tests/cmake/ImageCompare.cmake sed -e '/find_path(VENV_BIN_PATH /d' -i tests/cmake/ImageCompare.cmake @@ -193,6 +199,7 @@ clangStdenv.mkDerivation rec { license = lib.licenses.gpl3; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ + hzeller pca006132 raskin ]; diff --git a/pkgs/by-name/pi/picoshare/package.nix b/pkgs/by-name/pi/picoshare/package.nix new file mode 100644 index 000000000000..b0663e81cf87 --- /dev/null +++ b/pkgs/by-name/pi/picoshare/package.nix @@ -0,0 +1,46 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, + litestream, + litestreamSupport ? false, +}: + +buildGoModule (finalAttrs: { + pname = "picoshare"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = "mtlynch"; + repo = "picoshare"; + tag = finalAttrs.version; + hash = "sha256-8mgrwnY0Y1CggAtc7BrAqC32+Wu82FQNhoK0ijM1RKw="; + }; + + vendorHash = "sha256-Wf0qKs/9XKnO2nx2KmTGPdqI0iFih30AGvOi94RPEjw="; + + ldflags = [ + # make sure build time is always set to 0 to make the build reproducible + "-X github.com/mtlynch/picoshare/v2/build.unixTime=0" + # the app displays the version in the "system > information" menu + "-X github.com/mtlynch/picoshare/v2/build.Version=${finalAttrs.version}" + ]; + + buildInputs = lib.optional litestreamSupport litestream; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Minimalist, easy-to-host service for sharing images and other files"; + homepage = "https://github.com/mtlynch/picoshare"; + license = lib.licenses.agpl3Only; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + mainProgram = "picoshare"; + maintainers = with lib.maintainers; [ + blokyk + ]; + }; +}) diff --git a/pkgs/by-name/pl/plasma-plugin-blurredwallpaper/package.nix b/pkgs/by-name/pl/plasma-plugin-blurredwallpaper/package.nix index 54b057a9e45f..cff991ada664 100644 --- a/pkgs/by-name/pl/plasma-plugin-blurredwallpaper/package.nix +++ b/pkgs/by-name/pl/plasma-plugin-blurredwallpaper/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "plasma-plugin-blurredwallpaper"; - version = "3.5.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "bouteillerAlan"; repo = "blurredwallpaper"; rev = "v${finalAttrs.version}"; - hash = "sha256-xnO1C3jPkrooD7WUcclDrQp+iRXgOS4BRLB1tAdJRYk="; + hash = "sha256-T0fE0Jqw3lIbGCK6kteU1pv1clzU8mMmrJr/UN5e0hg="; }; installPhase = '' diff --git a/pkgs/by-name/po/ponyc/package.nix b/pkgs/by-name/po/ponyc/package.nix index ede259fbab2c..504a975c7ed1 100644 --- a/pkgs/by-name/po/ponyc/package.nix +++ b/pkgs/by-name/po/ponyc/package.nix @@ -99,6 +99,20 @@ stdenv.mkDerivation rec { --replace-fail "https://github.com/google/googletest/releases/download/v$googletestRev/googletest-$googletestRev.tar.gz" "$NIX_BUILD_TOP/deps/googletest-$googletestRev.tar" ''; + # We do not concern ourselves with darwin as the ponyc compiler + # has logic which overrides this environmental variable in this + # case. + env.arch = + if stdenv.hostPlatform.isx86_64 then + "x86-64" + else if stdenv.hostPlatform.isAarch64 then + "armv8-a" + else + lib.warn '' + architecture '${stdenv.hostPlatform.system}' compiles with native optimizations, + this may result in crashes on incompatible CPUs! + '' "native"; + preBuild = '' extraFlags=(build_flags=-j$NIX_BUILD_CORES) '' diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/by-name/pr/prom2json/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/prom2json.nix rename to pkgs/by-name/pr/prom2json/package.nix diff --git a/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix b/pkgs/by-name/pr/prometheus-apcupsd-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix rename to pkgs/by-name/pr/prometheus-apcupsd-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix b/pkgs/by-name/pr/prometheus-artifactory-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/artifactory-exporter.nix rename to pkgs/by-name/pr/prometheus-artifactory-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/atlas-exporter.nix b/pkgs/by-name/pr/prometheus-atlas-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/atlas-exporter.nix rename to pkgs/by-name/pr/prometheus-atlas-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix b/pkgs/by-name/pr/prometheus-aws-s3-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix rename to pkgs/by-name/pr/prometheus-aws-s3-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/bind-exporter.nix b/pkgs/by-name/pr/prometheus-bind-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/bind-exporter.nix rename to pkgs/by-name/pr/prometheus-bind-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/bird-exporter.nix b/pkgs/by-name/pr/prometheus-bird-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/bird-exporter.nix rename to pkgs/by-name/pr/prometheus-bird-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix b/pkgs/by-name/pr/prometheus-bitcoin-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix rename to pkgs/by-name/pr/prometheus-bitcoin-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/by-name/pr/prometheus-blackbox-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/blackbox-exporter.nix rename to pkgs/by-name/pr/prometheus-blackbox-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/cloudflare-exporter.nix b/pkgs/by-name/pr/prometheus-cloudflare-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/cloudflare-exporter.nix rename to pkgs/by-name/pr/prometheus-cloudflare-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/by-name/pr/prometheus-collectd-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/collectd-exporter.nix rename to pkgs/by-name/pr/prometheus-collectd-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/consul-exporter.nix b/pkgs/by-name/pr/prometheus-consul-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/consul-exporter.nix rename to pkgs/by-name/pr/prometheus-consul-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/pkgs/by-name/pr/prometheus-dnsmasq-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix rename to pkgs/by-name/pr/prometheus-dnsmasq-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/domain-exporter.nix b/pkgs/by-name/pr/prometheus-domain-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/domain-exporter.nix rename to pkgs/by-name/pr/prometheus-domain-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/fastly-exporter.nix b/pkgs/by-name/pr/prometheus-fastly-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/fastly-exporter.nix rename to pkgs/by-name/pr/prometheus-fastly-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/flow-exporter.nix b/pkgs/by-name/pr/prometheus-flow-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/flow-exporter.nix rename to pkgs/by-name/pr/prometheus-flow-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/pkgs/by-name/pr/prometheus-fritzbox-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix rename to pkgs/by-name/pr/prometheus-fritzbox-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix b/pkgs/by-name/pr/prometheus-gitlab-ci-pipelines-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix rename to pkgs/by-name/pr/prometheus-gitlab-ci-pipelines-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/graphite-exporter.nix b/pkgs/by-name/pr/prometheus-graphite-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/graphite-exporter.nix rename to pkgs/by-name/pr/prometheus-graphite-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/by-name/pr/prometheus-haproxy-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/haproxy-exporter.nix rename to pkgs/by-name/pr/prometheus-haproxy-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/idrac-exporter/config-from-environment.patch b/pkgs/by-name/pr/prometheus-idrac-exporter/config-from-environment.patch similarity index 100% rename from pkgs/servers/monitoring/prometheus/idrac-exporter/config-from-environment.patch rename to pkgs/by-name/pr/prometheus-idrac-exporter/config-from-environment.patch diff --git a/pkgs/servers/monitoring/prometheus/idrac-exporter.nix b/pkgs/by-name/pr/prometheus-idrac-exporter/package.nix similarity index 92% rename from pkgs/servers/monitoring/prometheus/idrac-exporter.nix rename to pkgs/by-name/pr/prometheus-idrac-exporter/package.nix index 67f6b18508a2..cdd49bbace55 100644 --- a/pkgs/servers/monitoring/prometheus/idrac-exporter.nix +++ b/pkgs/by-name/pr/prometheus-idrac-exporter/package.nix @@ -18,7 +18,7 @@ buildGoModule rec { vendorHash = "sha256-iNV4VrdQONq7LXwAc6AaUROHy8TmmloUAL8EmuPtF/o="; - patches = [ ./idrac-exporter/config-from-environment.patch ]; + patches = [ ./config-from-environment.patch ]; ldflags = [ "-s" diff --git a/pkgs/servers/monitoring/prometheus/imap-mailstat-exporter.nix b/pkgs/by-name/pr/prometheus-imap-mailstat-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/imap-mailstat-exporter.nix rename to pkgs/by-name/pr/prometheus-imap-mailstat-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix b/pkgs/by-name/pr/prometheus-influxdb-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/influxdb-exporter.nix rename to pkgs/by-name/pr/prometheus-influxdb-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix b/pkgs/by-name/pr/prometheus-ipmi-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/ipmi-exporter.nix rename to pkgs/by-name/pr/prometheus-ipmi-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/jitsi-exporter.nix b/pkgs/by-name/pr/prometheus-jitsi-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/jitsi-exporter.nix rename to pkgs/by-name/pr/prometheus-jitsi-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix b/pkgs/by-name/pr/prometheus-jmx-httpserver/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/jmx-httpserver.nix rename to pkgs/by-name/pr/prometheus-jmx-httpserver/package.nix diff --git a/pkgs/servers/monitoring/prometheus/json-exporter.nix b/pkgs/by-name/pr/prometheus-json-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/json-exporter.nix rename to pkgs/by-name/pr/prometheus-json-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix b/pkgs/by-name/pr/prometheus-junos-czerwonk-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix rename to pkgs/by-name/pr/prometheus-junos-czerwonk-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/kea-exporter.nix b/pkgs/by-name/pr/prometheus-kea-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/kea-exporter.nix rename to pkgs/by-name/pr/prometheus-kea-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/keylight-exporter.nix b/pkgs/by-name/pr/prometheus-keylight-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/keylight-exporter.nix rename to pkgs/by-name/pr/prometheus-keylight-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/knot-exporter.nix b/pkgs/by-name/pr/prometheus-knot-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/knot-exporter.nix rename to pkgs/by-name/pr/prometheus-knot-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/lnd-exporter.nix b/pkgs/by-name/pr/prometheus-lnd-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/lnd-exporter.nix rename to pkgs/by-name/pr/prometheus-lnd-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/mail-exporter.nix b/pkgs/by-name/pr/prometheus-mail-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/mail-exporter.nix rename to pkgs/by-name/pr/prometheus-mail-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix b/pkgs/by-name/pr/prometheus-mikrotik-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix rename to pkgs/by-name/pr/prometheus-mikrotik-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix b/pkgs/by-name/pr/prometheus-modemmanager-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix rename to pkgs/by-name/pr/prometheus-modemmanager-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix b/pkgs/by-name/pr/prometheus-mongodb-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/mongodb-exporter.nix rename to pkgs/by-name/pr/prometheus-mongodb-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/nats-exporter.nix b/pkgs/by-name/pr/prometheus-nats-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/nats-exporter.nix rename to pkgs/by-name/pr/prometheus-nats-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix b/pkgs/by-name/pr/prometheus-nextcloud-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix rename to pkgs/by-name/pr/prometheus-nextcloud-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/by-name/pr/prometheus-nginx-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/nginx-exporter.nix rename to pkgs/by-name/pr/prometheus-nginx-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix b/pkgs/by-name/pr/prometheus-nginxlog-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix rename to pkgs/by-name/pr/prometheus-nginxlog-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/nut-exporter.nix b/pkgs/by-name/pr/prometheus-nut-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/nut-exporter.nix rename to pkgs/by-name/pr/prometheus-nut-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix b/pkgs/by-name/pr/prometheus-pgbouncer-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix rename to pkgs/by-name/pr/prometheus-pgbouncer-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/php-fpm-exporter.nix b/pkgs/by-name/pr/prometheus-php-fpm-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/php-fpm-exporter.nix rename to pkgs/by-name/pr/prometheus-php-fpm-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/pihole-exporter.nix b/pkgs/by-name/pr/prometheus-pihole-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/pihole-exporter.nix rename to pkgs/by-name/pr/prometheus-pihole-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/ping-exporter.nix b/pkgs/by-name/pr/prometheus-ping-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/ping-exporter.nix rename to pkgs/by-name/pr/prometheus-ping-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/by-name/pr/prometheus-postfix-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/postfix-exporter.nix rename to pkgs/by-name/pr/prometheus-postfix-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix b/pkgs/by-name/pr/prometheus-postgres-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/postgres-exporter.nix rename to pkgs/by-name/pr/prometheus-postgres-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/process-exporter.nix b/pkgs/by-name/pr/prometheus-process-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/process-exporter.nix rename to pkgs/by-name/pr/prometheus-process-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/pve-exporter.nix b/pkgs/by-name/pr/prometheus-pve-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/pve-exporter.nix rename to pkgs/by-name/pr/prometheus-pve-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/pkgs/by-name/pr/prometheus-rabbitmq-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix rename to pkgs/by-name/pr/prometheus-rabbitmq-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/by-name/pr/prometheus-redis-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/redis-exporter.nix rename to pkgs/by-name/pr/prometheus-redis-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/rtl_433-exporter.nix b/pkgs/by-name/pr/prometheus-rtl_433-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/rtl_433-exporter.nix rename to pkgs/by-name/pr/prometheus-rtl_433-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/sabnzbd-exporter.nix b/pkgs/by-name/pr/prometheus-sabnzbd-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/sabnzbd-exporter.nix rename to pkgs/by-name/pr/prometheus-sabnzbd-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/sachet.nix b/pkgs/by-name/pr/prometheus-sachet/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/sachet.nix rename to pkgs/by-name/pr/prometheus-sachet/package.nix diff --git a/pkgs/servers/monitoring/prometheus/script-exporter.nix b/pkgs/by-name/pr/prometheus-script-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/script-exporter.nix rename to pkgs/by-name/pr/prometheus-script-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/shelly-exporter.nix b/pkgs/by-name/pr/prometheus-shelly-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/shelly-exporter.nix rename to pkgs/by-name/pr/prometheus-shelly-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/smokeping-prober.nix b/pkgs/by-name/pr/prometheus-smokeping-prober/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/smokeping-prober.nix rename to pkgs/by-name/pr/prometheus-smokeping-prober/package.nix diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/by-name/pr/prometheus-snmp-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/snmp-exporter.nix rename to pkgs/by-name/pr/prometheus-snmp-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/sql-exporter.nix b/pkgs/by-name/pr/prometheus-sql-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/sql-exporter.nix rename to pkgs/by-name/pr/prometheus-sql-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix b/pkgs/by-name/pr/prometheus-statsd-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/statsd-exporter.nix rename to pkgs/by-name/pr/prometheus-statsd-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/systemd-exporter.nix b/pkgs/by-name/pr/prometheus-systemd-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/systemd-exporter.nix rename to pkgs/by-name/pr/prometheus-systemd-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/unbound-exporter.nix b/pkgs/by-name/pr/prometheus-unbound-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/unbound-exporter.nix rename to pkgs/by-name/pr/prometheus-unbound-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/v2ray-exporter.nix b/pkgs/by-name/pr/prometheus-v2ray-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/v2ray-exporter.nix rename to pkgs/by-name/pr/prometheus-v2ray-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/by-name/pr/prometheus-varnish-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/varnish-exporter.nix rename to pkgs/by-name/pr/prometheus-varnish-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/by-name/pr/prometheus-wireguard-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/wireguard-exporter.nix rename to pkgs/by-name/pr/prometheus-wireguard-exporter/package.nix diff --git a/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix b/pkgs/by-name/pr/prometheus-xmpp-alerts/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/xmpp-alerts.nix rename to pkgs/by-name/pr/prometheus-xmpp-alerts/package.nix diff --git a/pkgs/servers/monitoring/prometheus/zfs-exporter.nix b/pkgs/by-name/pr/prometheus-zfs-exporter/package.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/zfs-exporter.nix rename to pkgs/by-name/pr/prometheus-zfs-exporter/package.nix diff --git a/pkgs/by-name/pr/proton-pass-cli/package.nix b/pkgs/by-name/pr/proton-pass-cli/package.nix index 6b1660ce2808..69c4c26bf659 100644 --- a/pkgs/by-name/pr/proton-pass-cli/package.nix +++ b/pkgs/by-name/pr/proton-pass-cli/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "proton-pass-cli"; - version = "1.4.3"; + version = "1.5.1"; src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system}; @@ -47,19 +47,19 @@ stdenv.mkDerivation (finalAttrs: { sources = { "aarch64-darwin" = fetchurl { url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-macos-aarch64"; - hash = "sha256-j1RvWfF+85am64110VnXlyq52aPc/BnlPTw1o/CQepU="; + hash = "sha256-9EYufGQtnu68NjrBZ4Sb/MUB546rr6MKPrDGqkIQSUg="; }; "aarch64-linux" = fetchurl { url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-aarch64"; - hash = "sha256-RF3k3FPq3TL7bpjTxjnQUN6Pe8CXrM+J6NTY78jBO3o="; + hash = "sha256-TQiIzN5Y93hzQKdbjw0sq4ayi+KQc1dO7B9WbxXLCy0="; }; "x86_64-darwin" = fetchurl { url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-macos-x86_64"; - hash = "sha256-CJm4LoR6H37zjW+L6c0W+awkeOhf5JNhzR7MfAxZH9I="; + hash = "sha256-i3EOR6R6wRsJD+WXDfHE6JT+3vppSYIMkOh+9VauZi0="; }; "x86_64-linux" = fetchurl { url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-x86_64"; - hash = "sha256-rDMI7Ex8yc5w3HKyRB4KjN3xfeoUfFtBCLyPvSr+ugg="; + hash = "sha256-8pndh8MzBtrOYg1qXZOaV2HibA6yyryP2/NzLgcHrMA="; }; }; updateScript = writeShellScript "update-proton-pass-cli" '' diff --git a/pkgs/by-name/sy/syncyomi/package.nix b/pkgs/by-name/sy/syncyomi/package.nix index 32ba628f6774..08767a2d5635 100644 --- a/pkgs/by-name/sy/syncyomi/package.nix +++ b/pkgs/by-name/sy/syncyomi/package.nix @@ -9,26 +9,40 @@ pnpmConfigHook, esbuild, }: -buildGoModule rec { +let + lockedEsbuild = esbuild.overrideAttrs ( + finalAttrs: prevAttrs: { + version = "0.19.11"; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${finalAttrs.version}"; + hash = "sha256-NUwjzOpHA0Ijuh0E69KXx8YVS5GTnKmob9HepqugbIU="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + } + ); +in +buildGoModule (finalAttrs: { pname = "syncyomi"; - version = "1.1.2"; + version = "1.1.4"; src = fetchFromGitHub { owner = "SyncYomi"; repo = "SyncYomi"; - tag = "v${version}"; - hash = "sha256-PPE6UXHo2ZlN0A0VkUH+8pkdfm6WEvpofusk6c3RBHk="; + tag = "v${finalAttrs.version}"; + hash = "sha256-pU3zxzixKoYnJsGpfvC/SVWIu0adsaiiVcLn0IZe64w="; }; - vendorHash = "sha256-/rpT6SatIZ+GVzmVg6b8Zy32pGybprObotyvEgvdL2w="; + vendorHash = "sha256-fzPEljXFskr1/qzTsnASFNNc+8vA7kqO21mhMqwT44w="; - web = stdenvNoCC.mkDerivation (finalAttrs: { - pname = "${pname}-web"; - inherit src version; - sourceRoot = "${finalAttrs.src.name}/web"; + web = stdenvNoCC.mkDerivation (webFinalAttrs: { + pname = "${finalAttrs.pname}-web"; + inherit (finalAttrs) src version; + sourceRoot = "${webFinalAttrs.src.name}/web"; pnpmDeps = fetchPnpmDeps { - inherit (finalAttrs) + inherit (webFinalAttrs) pname version src @@ -36,7 +50,7 @@ buildGoModule rec { ; pnpm = pnpm_9; fetcherVersion = 1; - hash = "sha256-edcZIqshnvM3jJpZWIR/UncI0VCMLq26h/n3VvV/384="; + hash = "sha256-Gg4nOxqWb692GvvwE7AJKQzGrrLLW7haaooEkUZW7FQ="; }; nativeBuildInputs = [ @@ -45,25 +59,7 @@ buildGoModule rec { pnpm_9 ]; - env.ESBUILD_BINARY_PATH = lib.getExe ( - esbuild.override { - buildGoModule = - args: - buildGoModule ( - args - // rec { - version = "0.17.19"; - src = fetchFromGitHub { - owner = "evanw"; - repo = "esbuild"; - rev = "v${version}"; - hash = "sha256-PLC7OJLSOiDq4OjvrdfCawZPfbfuZix4Waopzrj8qsU="; - }; - vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; - } - ); - } - ); + env.ESBUILD_BINARY_PATH = lib.getExe lockedEsbuild; buildPhase = '' runHook preBuild @@ -85,7 +81,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X main.version=v${version}" + "-X main.version=v${finalAttrs.version}" ]; postInstall = lib.optionalString (!stdenvNoCC.hostPlatform.isDarwin) '' @@ -95,10 +91,10 @@ buildGoModule rec { meta = { description = "Open-source project to synchronize Tachiyomi manga reading progress and library across multiple devices"; homepage = "https://github.com/SyncYomi/SyncYomi"; - changelog = "https://github.com/SyncYomi/SyncYomi/releases/tag/v${version}"; + changelog = "https://github.com/SyncYomi/SyncYomi/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ eriedaberrie ]; mainProgram = "syncyomi"; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/ty/typos/package.nix b/pkgs/by-name/ty/typos/package.nix index 72c52d210be8..7f52d9312fd1 100644 --- a/pkgs/by-name/ty/typos/package.nix +++ b/pkgs/by-name/ty/typos/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "typos"; - version = "1.43.4"; + version = "1.43.5"; src = fetchFromGitHub { owner = "crate-ci"; repo = "typos"; tag = "v${finalAttrs.version}"; - hash = "sha256-P6LmKEpD8FExU5f/r5cGkeefHR+w24NyZyrz0aoBmPY="; + hash = "sha256-lRh7f04DJx3DSmRUA0XpL1aQWrxcqY87yz/9jx512nA="; }; - cargoHash = "sha256-qOcrj9Ysu4VqizPChoTLUHaPuysHMwbvzcgyAuHtc0A="; + cargoHash = "sha256-mfdKF1Nup/RqANRQzRtezr6iwgMJwqKHSEgeReD3EoY="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/z3/z3/package.nix b/pkgs/by-name/z3/z3/package.nix index cf0f94c02bf2..6378631ee7fc 100644 --- a/pkgs/by-name/z3/z3/package.nix +++ b/pkgs/by-name/z3/z3/package.nix @@ -29,13 +29,13 @@ assert stdenv.mkDerivation (finalAttrs: { pname = "z3"; - version = "4.15.7"; + version = "4.15.8"; src = fetchFromGitHub { owner = "Z3Prover"; repo = "z3"; rev = "z3-${finalAttrs.version}"; - hash = "sha256-bK02PkJ+gmexfqY8hLMhbFlX1AIhs8Cd08NaTGP7D3A="; + hash = "sha256-6HCymxICyxGUWD1aq5Vb1t/AYODFQ6ZzoOr3owr+nvY="; }; patches = lib.optionals useCmakeBuild [ diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 4a975d25f7c0..ef77200d4607 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -814,15 +814,15 @@ final: prev: { }: buildLuarocksPackage { pname = "fzf-lua"; - version = "0.0.2475-1"; + version = "0.0.2484-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/fzf-lua-0.0.2475-1.rockspec"; - sha256 = "0lpmyffc5g7sl1smb59pqmd8zrkcp367mgsiarscqbqc6yilrvky"; + url = "mirror://luarocks/fzf-lua-0.0.2484-1.rockspec"; + sha256 = "04cqaymz0h7wkv3mb0wzxzzmv3px380431fjrcyaxs8ppy5kdqqz"; }).outPath; src = fetchzip { - url = "https://github.com/ibhagwan/fzf-lua/archive/739330f48ca64b4283f5228e9dc9c0c8f9a37110.zip"; - sha256 = "1pwzaak9q7cacw2qvcs80qxqfpxc60jvspw4ykmws6sh3rbi5c36"; + url = "https://github.com/ibhagwan/fzf-lua/archive/b2c0603216adb92c6bba81053bc996d7ae95b77a.zip"; + sha256 = "0qqh74dbr88y4m9hvmd5v743iapz4f7d6k0s0afcwpy7mjsfvkgd"; }; disabled = luaOlder "5.1"; @@ -3210,17 +3210,17 @@ final: prev: { }: buildLuarocksPackage { pname = "luasystem"; - version = "0.6.3-1"; + version = "0.7.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luasystem-0.6.3-1.rockspec"; - sha256 = "0zqmrrnvpvy0bmvdc26lgcabx525xq0xy1ysh91d74hdvnznn2jc"; + url = "mirror://luarocks/luasystem-0.7.0-1.rockspec"; + sha256 = "1c50g495s2xzf041p9yl58idxa1mv28sxbgymy05jyp30g0ifqw5"; }).outPath; src = fetchFromGitHub { owner = "lunarmodules"; repo = "luasystem"; - tag = "v0.6.3"; - hash = "sha256-8d2835/EcyDJX9yTn6MTfaZryjY1wkSP+IIIKGPDXMk="; + tag = "v0.7.0"; + hash = "sha256-/hob/bDP3CQeMZuz29a4XTRzlU7I7O2W/EszJEueq8c="; }; disabled = luaOlder "5.1"; @@ -4645,21 +4645,21 @@ final: prev: { }: buildLuarocksPackage { pname = "rustaceanvim"; - version = "7.1.9-2"; + version = "8.0.1-2"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rustaceanvim-7.1.9-2.rockspec"; - sha256 = "1j4n6xf1w542fsyp3jm4h72kv4lrh4g85zal03snjzzl35zslqbq"; + url = "mirror://luarocks/rustaceanvim-8.0.1-2.rockspec"; + sha256 = "0z68k6amqdk5nrj8zrz5a0084nmrx9y4lhr85996ln07877ah2hc"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/rustaceanvim/archive/refs/tags/v7.1.9.zip"; - sha256 = "1s2b44wfk3imbp0vcvldfxq3zx9875jyl7l5bnxhgihdksaxdy7p"; + url = "https://github.com/mrcjkb/rustaceanvim/archive/refs/tags/v8.0.1.zip"; + sha256 = "1sizi01bll3bqgaf6fva5grsp5nlvmp5mj57qkbsm75iyj2cz1dp"; }; disabled = lua.luaversion != "5.1"; meta = { - homepage = "https://github.com/mrcjkb/rustaceanvim/archive/refs/tags/v7.1.9.zip"; + homepage = "https://github.com/mrcjkb/rustaceanvim/archive/refs/tags/v8.0.1.zip"; description = "🦀 Supercharge your Rust experience in Neovim! A heavily modified fork of rust-tools.nvim"; maintainers = with lib.maintainers; [ mrcjkb ]; license.fullName = "GPL-2.0-only"; @@ -5001,8 +5001,8 @@ final: prev: { src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "ad7d9580338354ccc136e5b8f0aa4f880434dcdc"; - hash = "sha256-Z5wmLGMd+GODObFOYU7CrucwDnBpT5rJjfE5vHwjRxE="; + rev = "5255aa27c422de944791318024167ad5d40aad20"; + hash = "sha256-dOU6nQaq4W3KZrC2o2wv0NJ2LNWJgvuoNyWOYP2i4vo="; }; disabled = lua.luaversion != "5.1"; diff --git a/pkgs/development/python-modules/bambi/default.nix b/pkgs/development/python-modules/bambi/default.nix index 238901ec4cde..1c18a6c6bc9f 100644 --- a/pkgs/development/python-modules/bambi/default.nix +++ b/pkgs/development/python-modules/bambi/default.nix @@ -41,6 +41,9 @@ buildPythonPackage (finalAttrs: { setuptools-scm ]; + pythonRelaxDeps = [ + "sparse" + ]; dependencies = [ arviz-plots formulae diff --git a/pkgs/development/python-modules/elevenlabs/default.nix b/pkgs/development/python-modules/elevenlabs/default.nix index 9e17cd8fe451..53ef0a574751 100644 --- a/pkgs/development/python-modules/elevenlabs/default.nix +++ b/pkgs/development/python-modules/elevenlabs/default.nix @@ -14,14 +14,14 @@ buildPythonPackage (finalAttrs: { pname = "elevenlabs"; - version = "2.35.0"; + version = "2.36.1"; pyproject = true; src = fetchFromGitHub { owner = "elevenlabs"; repo = "elevenlabs-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-8O/gpG0XAJeD6g52mdO7T43NBHfpctuHm8mu4CVvZ78="; + hash = "sha256-xZzzzCdJ/jWVcdrhDr4/j6zYO2dQBOpRI9zyZ+Jdx+0="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/greenback/default.nix b/pkgs/development/python-modules/greenback/default.nix index fcf90d4ce115..3cbf47a7a5a1 100644 --- a/pkgs/development/python-modules/greenback/default.nix +++ b/pkgs/development/python-modules/greenback/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "greenback"; - version = "1.2.1"; + version = "1.3.0"; pyproject = true; src = fetchFromGitHub { owner = "oremanj"; repo = "greenback"; tag = "v${version}"; - hash = "sha256-u7kihdE5EH3Xbq4dQGY4ojiootjw3muYnoI7d2MrMkE="; + hash = "sha256-YAQEG3Lnyy9O+d58zZatDOeF+rxk34VqJ09XikqTyQk="; }; build-system = [ diff --git a/pkgs/development/python-modules/icalendar-searcher/default.nix b/pkgs/development/python-modules/icalendar-searcher/default.nix index 7f74cb63aa2c..10925aecbec3 100644 --- a/pkgs/development/python-modules/icalendar-searcher/default.nix +++ b/pkgs/development/python-modules/icalendar-searcher/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "icalendar-searcher"; - version = "1.0.3"; + version = "1.0.4"; pyproject = true; src = fetchFromGitHub { owner = "python-caldav"; repo = "icalendar-searcher"; tag = "v${version}"; - hash = "sha256-RwWm41+7AyoqwVGBaa+50ljUILJG5kCD4LMsULWjVEM="; + hash = "sha256-CHW1++VHoTfNw5GkRfDDTERZGA/RJxc8iME8OPx1q/o="; }; build-system = [ diff --git a/pkgs/development/python-modules/manim/default.nix b/pkgs/development/python-modules/manim/default.nix index 560975af90a0..be20a1abbe51 100644 --- a/pkgs/development/python-modules/manim/default.nix +++ b/pkgs/development/python-modules/manim/default.nix @@ -185,16 +185,16 @@ let ] ); in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "manim"; pyproject = true; - version = "0.19.2"; + version = "0.20.0"; src = fetchFromGitHub { owner = "ManimCommunity"; repo = "manim"; - tag = "v${version}"; - hash = "sha256-sM2IQdrqWVopo5Yzjmv6/KTHkgb/7Fma+plAc+gGwaM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-sn33kI0AswuvE653hWmke+7+qdJo5COzPaL8Y2aGbsU="; }; build-system = [ @@ -205,6 +205,9 @@ buildPythonPackage rec { buildInputs = [ cairo ]; + pythonRelaxDeps = [ + "skia-pathops" + ]; dependencies = [ av beautifulsoup4 @@ -236,10 +239,6 @@ buildPythonPackage rec { audioop-lts ]; - pythonRelaxDeps = [ - "skia-pathops" - ]; - optional-dependencies = { jupyterlab = [ jupyterlab @@ -282,7 +281,7 @@ buildPythonPackage rec { manim. ''; mainProgram = "manim"; - changelog = "https://github.com/ManimCommunity/manim/releases/tag/${src.tag}"; + changelog = "https://github.com/ManimCommunity/manim/releases/tag/${finalAttrs.src.tag}"; homepage = "https://github.com/ManimCommunity/manim"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ @@ -290,4 +289,4 @@ buildPythonPackage rec { ivyfanchiang ]; }; -} +}) diff --git a/pkgs/development/python-modules/oelint-parser/default.nix b/pkgs/development/python-modules/oelint-parser/default.nix index 5b55844b1feb..18a46ffcf91d 100644 --- a/pkgs/development/python-modules/oelint-parser/default.nix +++ b/pkgs/development/python-modules/oelint-parser/default.nix @@ -13,14 +13,14 @@ buildPythonPackage (finalAttrs: { pname = "oelint-parser"; - version = "8.8.1"; + version = "8.8.2"; pyproject = true; src = fetchFromGitHub { owner = "priv-kweihmann"; repo = "oelint-parser"; tag = finalAttrs.version; - hash = "sha256-r2MleUgfElyUyq/lEoOOJqdxlTkmY1zlgi2RcW70LzI="; + hash = "sha256-Oy9Mzz5/UUgUyoZFuSgjJhDlOmrqrK5Fc4pBmjxlllw="; }; pythonRelaxDeps = [ "regex" ]; diff --git a/pkgs/development/python-modules/onepassword-sdk/default.nix b/pkgs/development/python-modules/onepassword-sdk/default.nix new file mode 100644 index 000000000000..9b2538dd873d --- /dev/null +++ b/pkgs/development/python-modules/onepassword-sdk/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + pydantic, +}: + +buildPythonPackage (finalAttrs: { + pname = "onepassword-sdk"; + version = "0.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "1Password"; + repo = "onepassword-sdk-python"; + tag = "v${finalAttrs.version}"; + hash = "sha256-mMmHC5zBY1w+Y+NAZJkP7m1CqErwCv2bMNAo1TTNm6E="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + pydantic + ]; + + # Tests require a live 1Password service account token. + doCheck = false; + + pythonImportsCheck = [ "onepassword" ]; + + meta = { + description = "1Password Python SDK for programmatic secret management"; + homepage = "https://github.com/1Password/onepassword-sdk-python"; + changelog = "https://github.com/1Password/onepassword-sdk-python/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mahyarmirrashed ]; + }; +}) diff --git a/pkgs/development/python-modules/posthog/default.nix b/pkgs/development/python-modules/posthog/default.nix index 38bd1c820230..361fe861a03e 100644 --- a/pkgs/development/python-modules/posthog/default.nix +++ b/pkgs/development/python-modules/posthog/default.nix @@ -22,14 +22,14 @@ buildPythonPackage (finalAttrs: { pname = "posthog"; - version = "7.8.3"; + version = "7.9.3"; pyproject = true; src = fetchFromGitHub { owner = "PostHog"; repo = "posthog-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-JDt4lLocX+i1WAuY1SUqzmGX5Mt0CcktAsyuGSsTs6Y="; + hash = "sha256-IOyXM167ppLFKRubJc1JsoCA+95fcME/BakbFY90jGs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyoxigraph/default.nix b/pkgs/development/python-modules/pyoxigraph/default.nix index 2eb7f7d276f5..adb701b53cc1 100644 --- a/pkgs/development/python-modules/pyoxigraph/default.nix +++ b/pkgs/development/python-modules/pyoxigraph/default.nix @@ -11,19 +11,19 @@ buildPythonPackage rec { pname = "pyoxigraph"; pyproject = true; - version = "0.5.4"; + version = "0.5.5"; src = fetchFromGitHub { owner = "oxigraph"; repo = "oxigraph"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-WAwgZNEaemf0QN1cG+6nhz4PlGFXkiBaqZb6VxH3gUw="; + hash = "sha256-Sg4C9NW2grrlLFY2mDGOdsucX7cdT2028erJL8xaqLE="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-OeUXHTcHK7GHB+qV7fq5+0DbGR/PLx05Cp7aSyW0iFE="; + hash = "sha256-fR3s3RSYlpUVqsPOyPwZaCjTSNWoOYwFDBzcYxTE8kY="; }; buildAndTestSubdir = "python"; diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix index 35a3e4066dd3..2693af7d471e 100644 --- a/pkgs/development/python-modules/sparse/default.nix +++ b/pkgs/development/python-modules/sparse/default.nix @@ -18,16 +18,16 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sparse"; - version = "0.17.0"; + version = "0.18.0"; pyproject = true; src = fetchFromGitHub { owner = "pydata"; repo = "sparse"; - tag = version; - hash = "sha256-LYJ7YnR7WtzamK6py1NRPBe+h28L7JT+52wmourAc/c="; + tag = finalAttrs.version; + hash = "sha256-HHZ47TAgNbEEZj1sEe85yQRleW4Un2wfwQyFp4BPCbI="; }; build-system = [ @@ -53,8 +53,8 @@ buildPythonPackage rec { description = "Sparse n-dimensional arrays computations"; homepage = "https://sparse.pydata.org/"; changelog = "https://sparse.pydata.org/en/stable/changelog.html"; - downloadPage = "https://github.com/pydata/sparse/releases/tag/${version}"; + downloadPage = "https://github.com/pydata/sparse/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ GaetanLepage ]; }; -} +}) diff --git a/pkgs/development/python-modules/tinygrad/default.nix b/pkgs/development/python-modules/tinygrad/default.nix index 09028ce8733a..6a9b7bfffb5b 100644 --- a/pkgs/development/python-modules/tinygrad/default.nix +++ b/pkgs/development/python-modules/tinygrad/default.nix @@ -253,6 +253,15 @@ buildPythonPackage (finalAttrs: { # AttributeError: module 'tinygrad.runtime.autogen.libclang' has no attribute 'clang_parseTranslationUnit' "test_gen_from_header" "test_struct_ordering" + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ + # AssertionError: Expected 1 operations, got 3 + # assert 3 == 1 + # + where 3 = len([ExecItem(ast=UOp(Ops.SINK, dtypes.void, arg=None, src=... + # + and 1 = len([{'cnt': 3, 'type': 'graph'}]) + # + # test/test_jit.py:695: AssertionError + "TestJitGraphSplit" ]; disabledTestPaths = [ diff --git a/pkgs/servers/home-assistant/custom-components/powercalc/package.nix b/pkgs/servers/home-assistant/custom-components/powercalc/package.nix index 517ea4ec9d21..a343146adc2a 100644 --- a/pkgs/servers/home-assistant/custom-components/powercalc/package.nix +++ b/pkgs/servers/home-assistant/custom-components/powercalc/package.nix @@ -17,13 +17,13 @@ buildHomeAssistantComponent rec { owner = "bramstroker"; domain = "powercalc"; - version = "1.20.5"; + version = "1.20.6"; src = fetchFromGitHub { inherit owner; repo = "homeassistant-powercalc"; tag = "v${version}"; - hash = "sha256-qcUeFZWCXSbftElVmYl2KDFjdd0+Bh1b1IiB6oGVRRo="; + hash = "sha256-OOTqek+0CoAPHJugrzhpvOAvNNxZxG/KUjNxfsq71qQ="; }; dependencies = [ numpy ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e58fcb164be..20f32ed6e88f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8503,113 +8503,6 @@ with pkgs; postgres-websockets = haskellPackages.postgres-websockets.bin; postgrest = haskellPackages.postgrest.bin; - prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { }; - prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { }; - prometheus-artifactory-exporter = - callPackage ../servers/monitoring/prometheus/artifactory-exporter.nix - { }; - prometheus-atlas-exporter = callPackage ../servers/monitoring/prometheus/atlas-exporter.nix { }; - prometheus-aws-s3-exporter = callPackage ../servers/monitoring/prometheus/aws-s3-exporter.nix { }; - prometheus-bind-exporter = callPackage ../servers/monitoring/prometheus/bind-exporter.nix { }; - prometheus-bird-exporter = callPackage ../servers/monitoring/prometheus/bird-exporter.nix { }; - prometheus-bitcoin-exporter = callPackage ../servers/monitoring/prometheus/bitcoin-exporter.nix { }; - prometheus-blackbox-exporter = - callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix - { }; - prometheus-cloudflare-exporter = - callPackage ../servers/monitoring/prometheus/cloudflare-exporter.nix - { }; - prometheus-collectd-exporter = - callPackage ../servers/monitoring/prometheus/collectd-exporter.nix - { }; - prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { }; - prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { }; - prometheus-domain-exporter = callPackage ../servers/monitoring/prometheus/domain-exporter.nix { }; - prometheus-fastly-exporter = callPackage ../servers/monitoring/prometheus/fastly-exporter.nix { }; - prometheus-flow-exporter = callPackage ../servers/monitoring/prometheus/flow-exporter.nix { }; - prometheus-fritzbox-exporter = - callPackage ../servers/monitoring/prometheus/fritzbox-exporter.nix - { }; - prometheus-gitlab-ci-pipelines-exporter = - callPackage ../servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix - { }; - prometheus-graphite-exporter = - callPackage ../servers/monitoring/prometheus/graphite-exporter.nix - { }; - prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { }; - prometheus-idrac-exporter = callPackage ../servers/monitoring/prometheus/idrac-exporter.nix { }; - prometheus-imap-mailstat-exporter = - callPackage ../servers/monitoring/prometheus/imap-mailstat-exporter.nix - { }; - prometheus-influxdb-exporter = - callPackage ../servers/monitoring/prometheus/influxdb-exporter.nix - { }; - prometheus-ipmi-exporter = callPackage ../servers/monitoring/prometheus/ipmi-exporter.nix { }; - prometheus-jitsi-exporter = callPackage ../servers/monitoring/prometheus/jitsi-exporter.nix { }; - prometheus-jmx-httpserver = callPackage ../servers/monitoring/prometheus/jmx-httpserver.nix { }; - prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { }; - prometheus-junos-czerwonk-exporter = - callPackage ../servers/monitoring/prometheus/junos-czerwonk-exporter.nix - { }; - prometheus-kea-exporter = callPackage ../servers/monitoring/prometheus/kea-exporter.nix { }; - prometheus-keylight-exporter = - callPackage ../servers/monitoring/prometheus/keylight-exporter.nix - { }; - prometheus-knot-exporter = callPackage ../servers/monitoring/prometheus/knot-exporter.nix { }; - prometheus-lnd-exporter = callPackage ../servers/monitoring/prometheus/lnd-exporter.nix { }; - prometheus-mail-exporter = callPackage ../servers/monitoring/prometheus/mail-exporter.nix { }; - prometheus-mikrotik-exporter = - callPackage ../servers/monitoring/prometheus/mikrotik-exporter.nix - { }; - prometheus-modemmanager-exporter = - callPackage ../servers/monitoring/prometheus/modemmanager-exporter.nix - { }; - prometheus-mongodb-exporter = callPackage ../servers/monitoring/prometheus/mongodb-exporter.nix { }; - prometheus-nats-exporter = callPackage ../servers/monitoring/prometheus/nats-exporter.nix { }; - prometheus-nextcloud-exporter = - callPackage ../servers/monitoring/prometheus/nextcloud-exporter.nix - { }; - prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { }; - prometheus-nginxlog-exporter = - callPackage ../servers/monitoring/prometheus/nginxlog-exporter.nix - { }; - prometheus-nut-exporter = callPackage ../servers/monitoring/prometheus/nut-exporter.nix { }; - prometheus-pgbouncer-exporter = - callPackage ../servers/monitoring/prometheus/pgbouncer-exporter.nix - { }; - prometheus-php-fpm-exporter = callPackage ../servers/monitoring/prometheus/php-fpm-exporter.nix { }; - prometheus-pihole-exporter = callPackage ../servers/monitoring/prometheus/pihole-exporter.nix { }; - prometheus-ping-exporter = callPackage ../servers/monitoring/prometheus/ping-exporter.nix { }; - prometheus-postfix-exporter = callPackage ../servers/monitoring/prometheus/postfix-exporter.nix { }; - prometheus-postgres-exporter = - callPackage ../servers/monitoring/prometheus/postgres-exporter.nix - { }; - prometheus-process-exporter = callPackage ../servers/monitoring/prometheus/process-exporter.nix { }; - prometheus-pve-exporter = callPackage ../servers/monitoring/prometheus/pve-exporter.nix { }; - prometheus-redis-exporter = callPackage ../servers/monitoring/prometheus/redis-exporter.nix { }; - prometheus-rabbitmq-exporter = - callPackage ../servers/monitoring/prometheus/rabbitmq-exporter.nix - { }; - prometheus-rtl_433-exporter = callPackage ../servers/monitoring/prometheus/rtl_433-exporter.nix { }; - prometheus-sabnzbd-exporter = callPackage ../servers/monitoring/prometheus/sabnzbd-exporter.nix { }; - prometheus-sachet = callPackage ../servers/monitoring/prometheus/sachet.nix { }; - prometheus-script-exporter = callPackage ../servers/monitoring/prometheus/script-exporter.nix { }; - prometheus-shelly-exporter = callPackage ../servers/monitoring/prometheus/shelly-exporter.nix { }; - prometheus-smokeping-prober = callPackage ../servers/monitoring/prometheus/smokeping-prober.nix { }; - prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { }; - prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-exporter.nix { }; - prometheus-sql-exporter = callPackage ../servers/monitoring/prometheus/sql-exporter.nix { }; - prometheus-systemd-exporter = callPackage ../servers/monitoring/prometheus/systemd-exporter.nix { }; - prometheus-unbound-exporter = callPackage ../servers/monitoring/prometheus/unbound-exporter.nix { }; - prometheus-v2ray-exporter = callPackage ../servers/monitoring/prometheus/v2ray-exporter.nix { }; - prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { }; - prometheus-wireguard-exporter = - callPackage ../servers/monitoring/prometheus/wireguard-exporter.nix - { - }; - prometheus-zfs-exporter = callPackage ../servers/monitoring/prometheus/zfs-exporter.nix { }; - prometheus-xmpp-alerts = callPackage ../servers/monitoring/prometheus/xmpp-alerts.nix { }; - public-inbox = perlPackages.callPackage ../servers/mail/public-inbox { }; pypiserver = with python3Packages; toPythonApplication pypiserver; @@ -9434,8 +9327,6 @@ with pkgs; activitywatch = callPackage ../applications/office/activitywatch/wrapper.nix { }; - anilibria-winmaclinux = libsForQt5.callPackage ../applications/video/anilibria-winmaclinux { }; - masterpdfeditor4 = libsForQt5.callPackage ../applications/misc/masterpdfeditor4 { }; inherit @@ -10175,8 +10066,6 @@ with pkgs; callPackage ../applications/networking/cluster/kubectl-view-allocations { }; - kthxbye = callPackage ../servers/monitoring/prometheus/kthxbye.nix { }; - linkerd = callPackage ../applications/networking/cluster/linkerd { }; linkerd_edge = callPackage ../applications/networking/cluster/linkerd/edge.nix { }; linkerd_stable = linkerd; @@ -12701,8 +12590,6 @@ with pkgs; chrome-token-signing = libsForQt5.callPackage ../tools/security/chrome-token-signing { }; - linode-cli = python3Packages.callPackage ../tools/virtualization/linode-cli { }; - phonetisaurus = callPackage ../development/libraries/phonetisaurus { # https://github.com/AdolfVonKleist/Phonetisaurus/issues/70 openfst = openfst.overrideAttrs rec { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6d2364c7d3de..6b0982194de2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11303,6 +11303,8 @@ self: super: with self; { onedrive-personal-sdk = callPackage ../development/python-modules/onedrive-personal-sdk { }; + onepassword-sdk = callPackage ../development/python-modules/onepassword-sdk { }; + onetimepad = callPackage ../development/python-modules/onetimepad { }; onetimepass = callPackage ../development/python-modules/onetimepass { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index ab674985fe11..9f09c1c044b5 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -11,7 +11,7 @@ with super; bootstrapped-pip = toPythonModule (callPackage ../development/python2-modules/bootstrapped-pip { }); - cffi = disabed super.cffi; + cffi = disabled super.cffi; configparser = disabled super.configparser;