From f7d21be1d3aae0c4b1e32145b57cb50f4d965850 Mon Sep 17 00:00:00 2001 From: Alois Wohlschlager Date: Thu, 1 Feb 2024 18:42:56 +0100 Subject: [PATCH 01/66] nixos/wrapper: pass trusted argv[0] to the privileged executable Vulnerabilities caused by argv[0] mishandling in privileged code keep coming up, recently CVE-2021-4034 in polkit and CVE-2023-6246 in glibc. On the other hand, legitimate handling of argv[0] is mostly limited to logging and multiplexing different functionality depending on the basename of the link (an example for the latter is sudo/sudoedit). On NixOS, by far the most common source of untrusted argv[0] to privileged processes should be the wrapper, and it is not used for multiplexing (separate wrappers are used instead). So we always pass the path of the wrapped program as argv[0]. Obsolete mitigations for older argv[0]-based issues are deleted. --- nixos/modules/security/wrappers/wrapper.c | 25 +++++++++++++---------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/nixos/modules/security/wrappers/wrapper.c b/nixos/modules/security/wrappers/wrapper.c index 3e126875c687..6d0be0879440 100644 --- a/nixos/modules/security/wrappers/wrapper.c +++ b/nixos/modules/security/wrappers/wrapper.c @@ -170,15 +170,6 @@ static int make_caps_ambient(const char *self_path) { "MALLOC_ARENA_TEST\0" int main(int argc, char **argv) { - ASSERT(argc >= 1); - - // argv[0] goes into a lot of places, to a far greater degree than other elements - // of argv. glibc has had buffer overflows relating to argv[0], eg CVE-2023-6246. - // Since we expect the wrappers to be invoked from either $PATH or /run/wrappers/bin, - // there should be no reason to pass any particularly large values here, so we can - // be strict for strictness' sake. - ASSERT(strlen(argv[0]) < 512); - int debug = getenv(wrapper_debug) != NULL; // Drop insecure environment variables explicitly @@ -209,10 +200,22 @@ int main(int argc, char **argv) { return 1; } + char *replacement_argv[2] = {SOURCE_PROG, NULL}; + char *old_argv0; + // Replace untrusted or missing argv[0] by the wrapped program path. + // This mitigates vulnerabilities caused by incorrect handling in privileged code. + if (argv[0]) { + old_argv0 = argv[0]; + argv[0] = SOURCE_PROG; + } else { + old_argv0 = "«nullptr»"; + argv = replacement_argv; + } + execve(SOURCE_PROG, argv, environ); - + fprintf(stderr, "%s: cannot run `%s': %s\n", - argv[0], SOURCE_PROG, strerror(errno)); + old_argv0, SOURCE_PROG, strerror(errno)); return 1; } From 1ed59a4eb8a0d5694bc7f67b3770e664433730e7 Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Sun, 3 Nov 2024 20:14:31 -0800 Subject: [PATCH 02/66] lix: only use LTO with GCC Enabling LTO causes test failures when compiling for x86_64-darwin (at least under Rosetta 2). The Nix package only enables LTO when using GCC, so we'll copy that for now. I don't feel safe leaving it on for aarch64-darwin unless we can understand why it's failing on x86_64-darwin in case this is an indication of UB. Fixes #337036. --- pkgs/tools/package-management/lix/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/lix/common.nix b/pkgs/tools/package-management/lix/common.nix index 521c27b7e7bc..73853738d882 100644 --- a/pkgs/tools/package-management/lix/common.nix +++ b/pkgs/tools/package-management/lix/common.nix @@ -190,7 +190,7 @@ stdenv.mkDerivation { [ # Enable LTO, since it improves eval performance a fair amount # LTO is disabled on static due to strange linking errors - (lib.mesonBool "b_lto" (!stdenv.hostPlatform.isStatic)) + (lib.mesonBool "b_lto" (!stdenv.hostPlatform.isStatic && stdenv.cc.isGNU)) (lib.mesonEnable "gc" true) (lib.mesonBool "enable-tests" true) (lib.mesonBool "enable-docs" enableDocumentation) From 7578f3833bf6f4bfac41449444885ccd952345c0 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Sat, 17 Aug 2024 19:45:42 +0000 Subject: [PATCH 03/66] plasma-panel-spacer-extended: init at 1.9.0 --- .../plasma-panel-spacer-extended/package.nix | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix diff --git a/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix b/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix new file mode 100644 index 000000000000..b6877859a793 --- /dev/null +++ b/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + kdePackages, + glib, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "plasma-panel-spacer-extended"; + version = "1.9.0"; + + src = fetchFromGitHub { + owner = "luisbocanegra"; + repo = "plasma-panel-spacer-extended"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-3ediynClboG6/dBQTih6jJPGjsTBZhZKOPQAjGLRNmk="; + }; + + nativeBuildInputs = [ + cmake + kdePackages.extra-cmake-modules + ]; + + buildInputs = [ + kdePackages.kdeplasma-addons + kdePackages.plasma-desktop + ]; + + strictDeps = true; + + cmakeFlags = [ (lib.cmakeFeature "Qt6_DIR" "${kdePackages.qtbase}/lib/cmake/Qt6") ]; + + propagatedUserEnvPkgs = [ glib ]; + + dontWrapQtApps = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Spacer with mouse gestures for the KDE Plasma Panel"; + homepage = "https://github.com/luisbocanegra/plasma-panel-spacer-extended"; + changelog = "https://github.com/luisbocanegra/plasma-panel-spacer-extended/blob/main/CHANGELOG.md"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ HeitorAugustoLN ]; + inherit (kdePackages.kwindowsystem.meta) platforms; + }; +}) From 415b0ea85b2cb2dbd5f6ffaf769fa66dfe9b5630 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Nov 2024 04:23:48 +0000 Subject: [PATCH 04/66] python312Packages.datalad: 1.1.3 -> 1.1.4 --- pkgs/development/python-modules/datalad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datalad/default.nix b/pkgs/development/python-modules/datalad/default.nix index c61c0566c163..5021b2e1c302 100644 --- a/pkgs/development/python-modules/datalad/default.nix +++ b/pkgs/development/python-modules/datalad/default.nix @@ -52,13 +52,13 @@ buildPythonPackage rec { pname = "datalad"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "datalad"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Y7P9vRfFUJ5ZhVRTAYeImI9cv1LtWVAeBoBl6wANnrc="; + hash = "sha256-l3II9xebSq09He5e4GGGiGtfe6ERtIQD00eHKGx46WA="; }; postPatch = '' From 53b61e7a0ea65e009f2135d6d3474dcadf8209db Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 22 Nov 2024 09:24:45 +0900 Subject: [PATCH 05/66] python312Packages.datalad: refactor --- .../python-modules/datalad/default.nix | 70 +++++++++---------- 1 file changed, 33 insertions(+), 37 deletions(-) diff --git a/pkgs/development/python-modules/datalad/default.nix b/pkgs/development/python-modules/datalad/default.nix index 5021b2e1c302..1df8ee11bf65 100644 --- a/pkgs/development/python-modules/datalad/default.nix +++ b/pkgs/development/python-modules/datalad/default.nix @@ -34,16 +34,15 @@ python-dateutil, # duecredit duecredit, - # python>=3.8 distro, # win colorama, # python-version-dependent pythonOlder, - importlib-resources, importlib-metadata, typing-extensions, # tests + pytest-xdist, pytestCheckHook, p7zip, curl, @@ -53,10 +52,11 @@ buildPythonPackage rec { pname = "datalad"; version = "1.1.4"; + pyproject = true; src = fetchFromGitHub { owner = "datalad"; - repo = pname; + repo = "datalad"; rev = "refs/tags/${version}"; hash = "sha256-l3II9xebSq09He5e4GGGiGtfe6ERtIQD00eHKGx46WA="; }; @@ -79,49 +79,44 @@ buildPythonPackage rec { ]; dependencies = - [ - # core - platformdirs - chardet - iso8601 - humanize - fasteners - packaging - patool - tqdm - annexremote - looseversion - setuptools - git-annex + optional-dependencies.core ++ optional-dependencies.downloaders ++ optional-dependencies.publish; - # downloaders-extra - # requests-ftp # not in nixpkgs yet - - # downloaders + optional-dependencies = { + core = + [ + platformdirs + chardet + distro + iso8601 + humanize + fasteners + packaging + patool + tqdm + annexremote + looseversion + ] + ++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ] + ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ] + ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]; + downloaders = [ boto3 keyrings-alt keyring msgpack requests - - # publish - python-gitlab - - # misc + ]; + downloaders-extra = [ + # requests-ftp # not in nixpkgs yet + ]; + publish = [ python-gitlab ]; + misc = [ argcomplete pyperclip python-dateutil - - # duecredit - duecredit - - # python>=3.8 - distro - ] - ++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ] - ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ] - ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ] - ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]; + ]; + duecredit = [ duecredit ]; + }; postInstall = '' installShellCompletion --cmd datalad \ @@ -228,6 +223,7 @@ buildPythonPackage rec { nativeCheckInputs = [ p7zip + pytest-xdist pytestCheckHook git-annex curl From b5442735ff0f715f1d4ab1ca60905a721f23d98b Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 25 Nov 2024 07:58:06 +0000 Subject: [PATCH 06/66] buffybox: init at 3.2.0-unstable-2024-11-10 [buffybox](https://gitlab.postmarketos.org/postmarketOS/buffybox/) is a suite of graphical applications for the terminal. notably for nixpkgs, this includes `buffyboard`: an on-screen framebuffer keyboard especially useful for touch-only devices like mobile phones. `buffyboard` can be built and launched (as root) with no arguments: then tab to an unused TTY (e.g. Ctrl+Alt+F2) where an on-screen keyboard should now be visible (if not, try clicking in the bottom of the terminal to force a redraw). further configuration of buffyboard is possible by editing `/etc/buffyboard.conf` or passing CLI flags. --- pkgs/by-name/bu/buffybox/package.nix | 60 ++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 pkgs/by-name/bu/buffybox/package.nix diff --git a/pkgs/by-name/bu/buffybox/package.nix b/pkgs/by-name/bu/buffybox/package.nix new file mode 100644 index 000000000000..8dcef1f1f0f4 --- /dev/null +++ b/pkgs/by-name/bu/buffybox/package.nix @@ -0,0 +1,60 @@ +{ + fetchFromGitLab, + inih, + lib, + libdrm, + libinput, + libxkbcommon, + meson, + ninja, + pkg-config, + scdoc, + stdenv, + unstableGitUpdater, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "buffybox"; + version = "3.2.0-unstable-2024-11-10"; + + src = fetchFromGitLab { + domain = "gitlab.postmarketos.org"; + owner = "postmarketOS"; + repo = "buffybox"; + fetchSubmodules = true; # to use its vendored lvgl + rev = "07e324c17564cb9aab573259a8e0824a6806a751"; + hash = "sha256-JY9WqtRjDsQf1UVFnM6oTwyAuhlJvrhcSNJdEZ0zIus="; + }; + + depsBuildBuild = [ + pkg-config + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + scdoc + ]; + + buildInputs = [ + inih + libdrm + libinput + libxkbcommon + ]; + + env.PKG_CONFIG_SYSTEMD_SYSTEMD_SYSTEM_UNIT_DIR = "${placeholder "out"}/lib/systemd/system"; + + strictDeps = true; + + passthru.updateScript = unstableGitUpdater { }; + + meta = with lib; { + description = "A suite of graphical applications for the terminal"; + homepage = "https://gitlab.postmarketos.org/postmarketOS/buffybox"; + license = licenses.gpl3Plus; + maintainers = with lib.maintainers; [ colinsane ]; + platforms = platforms.linux; + }; +}) From 900bd0d8e6203f51c25456e493a3b61cca59ac8b Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 25 Nov 2024 09:21:20 +0000 Subject: [PATCH 07/66] nixos/buffyboard: init [buffyboard](https://gitlab.postmarketos.org/postmarketOS/buffybox/-/tree/master/buffyboard) is the on-screen framebuffer keyboard provided by postmarketOS's buffybox project. enable this with `services.buffybox.enable = true;`: any additional settings are strictly optional. once enabled, tab to an unused TTY (e.g. Ctrl+Alt+F2) and use the mouse/touchpad/touchscreen to use the virtual keyboard. may require a manual `systemctl start buffybox` if enabled on an already-booted device. Co-authored-by: Luflosi --- .../manual/release-notes/rl-2505.section.md | 2 + nixos/modules/module-list.nix | 1 + .../modules/services/hardware/buffyboard.nix | 138 ++++++++++++++++++ 3 files changed, 141 insertions(+) create mode 100644 nixos/modules/services/hardware/buffyboard.nix diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index d55b5bfd42a7..b811b03f06de 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -16,6 +16,8 @@ - [Amazon CloudWatch Agent](https://github.com/aws/amazon-cloudwatch-agent), the official telemetry collector for AWS CloudWatch and AWS X-Ray. Available as [services.amazon-cloudwatch-agent](#opt-services.amazon-cloudwatch-agent.enable). +- [Buffyboard](https://gitlab.postmarketos.org/postmarketOS/buffybox/-/tree/master/buffyboard), a framebuffer on-screen keyboard. Available as [services.buffyboard](option.html#opt-services.buffyboard). + ## Backward Incompatibilities {#sec-release-25.05-incompatibilities} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 91ecee0ef265..767531f9e8ef 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -588,6 +588,7 @@ ./services/hardware/bluetooth.nix ./services/hardware/bolt.nix ./services/hardware/brltty.nix + ./services/hardware/buffyboard.nix ./services/hardware/ddccontrol.nix ./services/hardware/display.nix ./services/hardware/fancontrol.nix diff --git a/nixos/modules/services/hardware/buffyboard.nix b/nixos/modules/services/hardware/buffyboard.nix new file mode 100644 index 000000000000..f6cab16138c0 --- /dev/null +++ b/nixos/modules/services/hardware/buffyboard.nix @@ -0,0 +1,138 @@ +# INTEGRATION NOTES: +# Buffyboard integrates as a virtual device in /dev/input +# which reads touch or pointer events from other input devices +# and generates events based on where those map to the keys it renders to the framebuffer. +# +# Buffyboard generates these events whether or not its onscreen keyboard is actually visible. +# Hence special care is needed if running anything which claims ownership of the display (such as a desktop environment), +# to avoid unwanted input events being triggered during normal desktop operation. +# +# Desktop users are recommended to either: +# 1. Stop buffyboard once your DE is started. +# e.g. `services.buffyboard.unitConfig.Conflicts = [ "my-de.service" ];` +# 2. Configure your DE to ignore input events from buffyboard (product-id=25209; vendor-id=26214; name=rd) +# e.g. `echo 'input "26214:25209:rd" events disabled' > ~/.config/sway/config` + +{ + config, + lib, + pkgs, + utils, + ... +}: +let + cfg = config.services.buffyboard; + ini = pkgs.formats.ini { }; +in +{ + meta.maintainers = with lib.maintainers; [ colinsane ]; + + options = { + services.buffyboard = with lib; { + enable = mkEnableOption "buffyboard framebuffer keyboard (on-screen keyboard)"; + package = mkPackageOption pkgs "buffybox" { }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = [ ]; + description = '' + Extra CLI arguments to pass to buffyboard. + ''; + example = [ + "--geometry=1920x1080@640,0" + "--dpi=192" + "--rotate=2" + "--verbose" + ]; + }; + + configFile = mkOption { + type = lib.types.path; + default = ini.generate "buffyboard.conf" (lib.filterAttrsRecursive (_: v: v != null) cfg.settings); + defaultText = lib.literalExpression ''ini.generate "buffyboard.conf" cfg.settings''; + description = '' + Path to an INI format configuration file to provide Buffyboard. + By default, this is generated from whatever you've set in `settings`. + If specified manually, then `settings` is ignored. + + For an example config file see [here](https://gitlab.postmarketos.org/postmarketOS/buffybox/-/blob/master/buffyboard/buffyboard.conf) + ''; + }; + + settings = mkOption { + description = '' + Settings to include in /etc/buffyboard.conf. + Every option here is strictly optional: + Buffyboard will use its own baked-in defaults for those options left unset. + ''; + type = types.submodule { + freeformType = ini.type; + + options.input.pointer = mkOption { + type = types.nullOr types.bool; + default = null; + description = '' + Enable or disable the use of a hardware mouse or other pointing device. + ''; + }; + options.input.touchscreen = mkOption { + type = types.nullOr types.bool; + default = null; + description = '' + Enable or disable the use of the touchscreen. + ''; + }; + + options.theme.default = mkOption { + type = types.either types.str ( + types.enum [ + null + "adwaita-dark" + "breezy-dark" + "breezy-light" + "nord-dark" + "nord-light" + "pmos-dark" + "pmos-light" + ] + ); + default = null; + description = '' + Selects the default theme on boot. Can be changed at runtime to the alternative theme. + ''; + }; + options.quirks.fbdev_force_refresh = mkOption { + type = types.nullOr types.bool; + default = null; + description = '' + If true and using the framebuffer backend, this triggers a display refresh after every draw operation. + This has a negative performance impact. + ''; + }; + }; + default = { }; + }; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.packages = [ cfg.package ]; + systemd.services.buffyboard = { + # upstream provides the service (including systemd hardening): we just configure it to start by default + # and override ExecStart so as to optionally pass extra arguments + serviceConfig.ExecStart = [ + "" # clear default ExecStart + (utils.escapeSystemdExecArgs ( + [ + (lib.getExe' cfg.package "buffyboard") + "--config-override" + cfg.configFile + ] + ++ cfg.extraFlags + )) + ]; + wantedBy = [ "getty.target" ]; + before = [ "getty.target" ]; + }; + }; +} From c826dbd65f1955ff5e757d931159449824a3d782 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Nov 2024 21:30:08 +0000 Subject: [PATCH 08/66] python312Packages.tinydb: 4.8.0 -> 4.8.2 --- .../python-modules/tinydb/default.nix | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/tinydb/default.nix b/pkgs/development/python-modules/tinydb/default.nix index 5ad3e1fb4cda..f62cefdbbd9f 100644 --- a/pkgs/development/python-modules/tinydb/default.nix +++ b/pkgs/development/python-modules/tinydb/default.nix @@ -5,43 +5,41 @@ fetchFromGitHub, poetry-core, pytestCheckHook, - pycodestyle, + pytest-cov-stub, pyyaml, }: buildPythonPackage rec { pname = "tinydb"; - version = "4.8.0"; - disabled = pythonOlder "3.5"; - format = "pyproject"; + version = "4.8.2"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "msiemens"; - repo = pname; + repo = "tinydb"; rev = "refs/tags/v${version}"; - hash = "sha256-sdWcpkjC8LtOI1k0Wyk4vLXBcwYe1vuQON9J7P8JPxA="; + hash = "sha256-N/45XB7ZuZiq25v6DQx4K9NRVnBbUHPeiKKbxQ9YB3E="; }; - nativeBuildInputs = [ poetry-core ]; - - postPatch = '' - substituteInPlace pytest.ini \ - --replace "--cov-append --cov-report term --cov tinydb" "" - ''; + build-system = [ + poetry-core + ]; nativeCheckInputs = [ pytestCheckHook - pycodestyle + pytest-cov-stub pyyaml ]; pythonImportsCheck = [ "tinydb" ]; - meta = with lib; { + meta = { description = "Lightweight document oriented database written in Python"; homepage = "https://tinydb.readthedocs.org/"; changelog = "https://tinydb.readthedocs.io/en/latest/changelog.html"; - license = licenses.mit; - maintainers = with maintainers; [ marcus7070 ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ marcus7070 ]; }; } From c4a7f5477b2baf2b37a944481e81c3888e0340a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Nov 2024 07:05:54 +0000 Subject: [PATCH 09/66] python312Packages.art: 6.3 -> 6.4 --- pkgs/development/python-modules/art/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/art/default.nix b/pkgs/development/python-modules/art/default.nix index b0d50295a8aa..3a9874f037c6 100644 --- a/pkgs/development/python-modules/art/default.nix +++ b/pkgs/development/python-modules/art/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "art"; - version = "6.3"; + version = "6.4"; pyproject = true; src = fetchFromGitHub { owner = "sepandhaghighi"; repo = "art"; rev = "refs/tags/v${version}"; - hash = "sha256-9kz6uyLdcrQqgWzT9g2qI9a+IituY/OFmbot+HlQsCE="; + hash = "sha256-qA1fhqNJbhSOvsPSgbnuRTs40OJsn7tYHWzujN2RVK8="; }; build-system = [ setuptools ]; From f1f9a54031dbc95b6e924772fddd125debb697bb Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Sun, 24 Nov 2024 15:23:26 +0100 Subject: [PATCH 10/66] cups-filters: 1.28.17 -> 2.0.1 --- nixos/modules/services/printing/cupsd.nix | 8 ++- pkgs/by-name/cu/cups-browsed/package.nix | 47 ++++++++++++++ pkgs/by-name/li/libcupsfilters/package.nix | 64 +++++++++++++++++++ pkgs/by-name/li/libppd/package.nix | 48 ++++++++++++++ pkgs/misc/cups/filters.nix | 63 +++++------------- .../misc/system-config-printer/default.nix | 4 +- pkgs/top-level/perl-packages.nix | 8 ++- 7 files changed, 190 insertions(+), 52 deletions(-) create mode 100644 pkgs/by-name/cu/cups-browsed/package.nix create mode 100644 pkgs/by-name/li/libcupsfilters/package.nix create mode 100644 pkgs/by-name/li/libppd/package.nix diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index a1fb0b3951e4..45bb841c317b 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -4,7 +4,7 @@ with lib; let - inherit (pkgs) cups-pk-helper cups-filters xdg-utils; + inherit (pkgs) cups-pk-helper libcupsfilters cups-filters xdg-utils; cfg = config.services.printing; cups = cfg.package; @@ -35,7 +35,7 @@ let bindir = pkgs.buildEnv { name = "cups-progs"; paths = - [ cups.out additionalBackends cups-filters pkgs.ghostscript ] + [ cups.out additionalBackends libcupsfilters cups-filters pkgs.ghostscript ] ++ cfg.drivers; pathsToLink = [ "/lib" "/share/cups" "/bin" ]; postBuild = cfg.bindirCmds; @@ -278,6 +278,8 @@ in ''; }; + browsed.package = lib.mkPackageOption pkgs "cups-browsed" {}; + browsedConf = mkOption { type = types.lines; default = ""; @@ -438,7 +440,7 @@ in path = [ cups ]; - serviceConfig.ExecStart = "${cups-filters}/bin/cups-browsed"; + serviceConfig.ExecStart = "${cfg.browsed.package}/bin/cups-browsed"; restartTriggers = [ browsedFile ]; }; diff --git a/pkgs/by-name/cu/cups-browsed/package.nix b/pkgs/by-name/cu/cups-browsed/package.nix new file mode 100644 index 000000000000..66564ac60053 --- /dev/null +++ b/pkgs/by-name/cu/cups-browsed/package.nix @@ -0,0 +1,47 @@ +{ + autoreconfHook, + avahi, + cups, + fetchFromGitHub, + glib, + lib, + libcupsfilters, + libppd, + pkg-config, + stdenv, +}: + +stdenv.mkDerivation rec { + pname = "cups-browsed"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "OpenPrinting"; + repo = "cups-browsed"; + rev = version; + hash = "sha256-UkPJqVWG6obIW0jGXsnnYB2lmIm/uiMuPYSGY3+M4Gw="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + cups + ]; + + buildInputs = [ + avahi + libcupsfilters + libppd + glib + ]; + + configureFlags = [ + "--with-rcdir=no" + ]; + + makeFlags = [ + "CUPS_SERVERBIN=$(out)/lib/cups" + "CUPS_DATADIR=$(out)/share/cups" + "CUPS_SERVERROOT=$(out)/etc/cups" + ]; +} diff --git a/pkgs/by-name/li/libcupsfilters/package.nix b/pkgs/by-name/li/libcupsfilters/package.nix new file mode 100644 index 000000000000..dfd17f890c47 --- /dev/null +++ b/pkgs/by-name/li/libcupsfilters/package.nix @@ -0,0 +1,64 @@ +{ + autoreconfHook, + cups, + dbus, + dejavu_fonts, + fetchFromGitHub, + fontconfig, + ghostscript, + lcms2, + libexif, + libjpeg, + libpng, + libtiff, + mupdf, + pkg-config, + poppler, + poppler_utils, + qpdf, + stdenv, +}: + +stdenv.mkDerivation rec { + pname = "libcupsfilters"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "OpenPrinting"; + repo = "libcupsfilters"; + rev = "2.1.0"; + hash = "sha256-tnQqM4stUJseDO9BG+PRUSFafjgpQQklTDsDsB9zQ4Y="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + cups + ]; + buildInputs = [ + dbus + fontconfig + ghostscript + lcms2 + libexif + libjpeg + libpng + libtiff + mupdf + poppler + poppler_utils + qpdf + ]; + configureFlags = [ + "--with-mutool-path=${mupdf}/bin/mutool" + "--with-gs-path=${ghostscript}/bin/gs" + "--with-ippfind-path=${cups}/bin/ippfind" + "--enable-imagefilters" + "--with-test-font-path=${dejavu_fonts}/share/fonts/truetype/DejaVuSans.ttf" + ]; + makeFlags = [ + "CUPS_SERVERBIN=$(out)/lib/cups" + "CUPS_DATADIR=$(out)/share/cups" + "CUPS_SERVERROOT=$(out)/etc/cups" + ]; +} diff --git a/pkgs/by-name/li/libppd/package.nix b/pkgs/by-name/li/libppd/package.nix new file mode 100644 index 000000000000..39383430208c --- /dev/null +++ b/pkgs/by-name/li/libppd/package.nix @@ -0,0 +1,48 @@ +{ + autoreconfHook, + cups, + fetchFromGitHub, + ghostscript, + libcupsfilters, + libz, + mupdf, + pkg-config, + poppler_utils, + stdenv, +}: + +stdenv.mkDerivation rec { + pname = "libppd"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "OpenPrinting"; + repo = "libppd"; + rev = version; + hash = "sha256-vT4h3dnMu4yHNk0ExGZjuChdu0kAcxsla7vJupZpLaY="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + cups + ]; + buildInputs = [ + ghostscript + libcupsfilters + mupdf + libz + ]; + configureFlags = [ + "--with-mutool-path=${mupdf}/bin/mutool" + "--with-pdftops=pdftops" + "--with-pdftops-path=${poppler_utils}/bin/pdftops" + "--with-gs-path=${ghostscript}/bin/gs" + "--with-pdftocairo-path=${poppler_utils}/bin/pdftocairo" + ]; + makeFlags = [ + "CUPS_SERVERBIN=$(out)/lib/cups" + "CUPS_DATADIR=$(out)/share/cups" + "CUPS_SERVERROOT=$(out)/etc/cups" + ]; +} diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index d5688d3bc351..e4f44dbf2947 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -1,18 +1,18 @@ { lib -, avahi , bc , coreutils , cups , dbus , dejavu_fonts -, fetchurl -, fetchpatch +, fetchFromGitHub , fontconfig , gawk , ghostscript , gnugrep , gnused , ijs +, libcupsfilters +, libppd , libexif , libjpeg , liblouis @@ -30,70 +30,41 @@ , withAvahi ? true }: -let +(if !withAvahi then lib.warn "the 'withAvahi' parameter to 'cups-filters' is deprecated, as the cups-browsed component (which does not make sense without avahi) has been split out of the cups-filters package (which no longer needs avahi)" else lib.id) + +(let binPath = lib.makeBinPath [ bc coreutils gawk gnused gnugrep which ]; in stdenv.mkDerivation rec { pname = "cups-filters"; - version = "1.28.17"; + version = "2.0.1"; - src = fetchurl { - url = "https://github.com/OpenPrinting/cups-filters/releases/download/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-Jwo3UqlgNoqpnUMftdNPQDmyrJQ8V22EBhLR2Bhcm7k="; + src = fetchFromGitHub { + owner = "OpenPrinting"; + repo = "cups-filters"; + rev = version; + hash = "sha256-bLOl64bdeZ10JLcQ7GbU+VffJu3Lzo0ves7O7GQIOWY="; }; - patches = [ - (fetchpatch { - name = "CVE-2023-24805.patch"; - url = "https://github.com/OpenPrinting/cups-filters/commit/93e60d3df358c0ae6f3dba79e1c9684657683d89.patch"; - hash = "sha256-KgWTYFr2uShL040azzE+KaNyBPy7Gs/hCnEgQmmPCys="; - }) - (fetchpatch { - name = "CVE-2024-47076.patch"; - url = "https://github.com/OpenPrinting/libcupsfilters/commit/95576ec3d20c109332d14672a807353cdc551018.patch"; - hash = "sha256-MXWllrdWt8n7zqvumQNg34dBgWMwMTwf9lrD+ZZP8Wk="; - }) - (fetchpatch { - name = "remove-cups-ldap-browse-protocols_CVE-2024-47176_CVE-2024-47850.patch"; - url = "https://github.com/OpenPrinting/cups-filters/commit/6fd2bdfbdce76149af531ce9fca9062304238451.patch"; - hash = "sha256-XS1ODy7i7ilgEjsKuEvOUiRN9pqsj+bOktKoshKcg8Q="; - }) - ]; - nativeBuildInputs = [ pkg-config makeWrapper autoreconfHook ]; buildInputs = [ cups - dbus - fontconfig ghostscript - ijs - libexif - libjpeg - liblouis # braille embosser support - libpng + libcupsfilters + libppd mupdf - perl - poppler - poppler_utils - qpdf - ] ++ lib.optionals withAvahi [ avahi ]; + ]; configureFlags = [ "--with-mutool-path=${mupdf}/bin/mutool" - "--with-pdftops=pdftops" - "--with-pdftops-path=${poppler_utils}/bin/pdftops" "--with-gs-path=${ghostscript}/bin/gs" - "--with-pdftocairo-path=${poppler_utils}/bin/pdftocairo" "--with-ippfind-path=${cups}/bin/ippfind" - "--enable-imagefilters" - "--with-rcdir=no" "--with-shell=${stdenv.shell}" - "--with-test-font-path=${dejavu_fonts}/share/fonts/truetype/DejaVuSans.ttf" "--localstatedir=/var" "--sysconfdir=/etc" - ] ++ lib.optionals (!withAvahi) [ "--disable-avahi" ]; + ]; makeFlags = [ "CUPS_SERVERBIN=$(out)/lib/cups" "CUPS_DATADIR=$(out)/share/cups" "CUPS_SERVERROOT=$(out)/etc/cups" ]; @@ -130,4 +101,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index c94f94f55f2e..595882b9b500 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -2,7 +2,7 @@ , docbook_xml_dtd_412, docbook_xsl , libxml2, desktop-file-utils, libusb1, cups, gdk-pixbuf, pango, atk, libnotify , gobject-introspection, libsecret, packagekit -, cups-filters, gettext, libtool, autoconf-archive +, libcupsfilters, gettext, libtool, autoconf-archive , python3Packages, autoreconfHook, bash, fetchpatch }: @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { buildPythonPath "$out $pythonPath" gappsWrapperArgs+=( --prefix PATH : "$program_PATH" - --set CUPS_DATADIR "${cups-filters}/share/cups" + --set CUPS_DATADIR "${libcupsfilters}/share/cups" ) find $out/share/system-config-printer -name \*.py -type f -perm -0100 -print0 | while read -d "" f; do diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fa15b777e3a5..957cbfbd28cb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18677,7 +18677,13 @@ with self; { url = "mirror://cpan/authors/id/N/NI/NINE/Net-CUPS-0.64.tar.gz"; hash = "sha256-17x3/w9iv4dMhDxZDrEqgLvUR0mi+3Tb7URcNdDoWoU="; }; - buildInputs = [ pkgs.cups pkgs.cups-filters ]; + patches = [ + (fetchpatch { + url = "https://git.launchpad.net/ubuntu/+source/libnet-cups-perl/plain/debian/patches/cupsfilters-2.0.patch?id=a47b8df8551853c12a7f965ae60bb52333883c88"; + hash = "sha256-ouOrUsRHD1qxu8B6rZiqs9LXYIymX5kSuu99KnmP8Bo="; + }) + ]; + buildInputs = [ pkgs.cups pkgs.libcupsfilters ]; NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.cups}/lib -lcups"; meta = { description = "Common Unix Printing System Interface"; From dd90a1d99b28804a7590e2589fc8977c1651861b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Nov 2024 10:17:53 +0000 Subject: [PATCH 11/66] mlflow-server: 2.17.2 -> 2.18.0 --- pkgs/development/python-modules/mlflow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 6e0b46f058eb..c52166ac7b72 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -70,14 +70,14 @@ buildPythonPackage rec { pname = "mlflow"; - version = "2.17.2"; + version = "2.18.0"; pyproject = true; src = fetchFromGitHub { owner = "mlflow"; repo = "mlflow"; rev = "refs/tags/v${version}"; - hash = "sha256-s3t6RAJh129d5XJKtMNxS0wgGO4mKbAfMCXDBXEKBxM="; + hash = "sha256-etfgdSf3pbcKtCOk9MOgcR+Tzg4cmLbdadAOtQqN4PM="; }; # Remove currently broken dependency `shap`, a model explainability package. From 7f6e867bfe13ecc73a78ff53301e8300d1a73de8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Nov 2024 18:49:44 +0000 Subject: [PATCH 12/66] commitizen: 3.30.0 -> 4.0.0 --- pkgs/development/python-modules/commitizen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/commitizen/default.nix b/pkgs/development/python-modules/commitizen/default.nix index 039880f363dd..06a42d63887c 100644 --- a/pkgs/development/python-modules/commitizen/default.nix +++ b/pkgs/development/python-modules/commitizen/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "commitizen"; - version = "3.30.0"; + version = "4.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "commitizen-tools"; repo = "commitizen"; rev = "refs/tags/v${version}"; - hash = "sha256-8ULIoFKrDAGHwz0EZzYJtl/4h6UVUECLUDbvTJbdD60="; + hash = "sha256-M6JoBVst2aJwxr/SyMpXXOnMKIl9gX0ltg3H0SpU7uQ="; }; pythonRelaxDeps = [ From 79fdb67f884dfbeeb2538b667be23e35b27e92d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Nov 2024 23:00:40 +0000 Subject: [PATCH 13/66] python312Packages.marimo: 0.9.14 -> 0.9.27 --- pkgs/development/python-modules/marimo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index 3d135bd357f0..02755b8ed342 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -30,13 +30,13 @@ buildPythonPackage rec { pname = "marimo"; - version = "0.9.14"; + version = "0.9.27"; pyproject = true; # The github archive does not include the static assets src = fetchPypi { inherit pname version; - hash = "sha256-Q3dnRuAS8B4cWvF04GGg5OOZtmAJPKa2fHwnoO2DXDs="; + hash = "sha256-vs1miLjM/xRrnFYpHte65CfDt4ZRoCKjFMClWukIWZY="; }; build-system = [ hatchling ]; From 4bdf760ad3adda23210c11c45d160f844b48e715 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Nov 2024 21:52:36 +0000 Subject: [PATCH 14/66] python312Packages.langsmith: 0.1.137 -> 0.1.147 --- pkgs/development/python-modules/langsmith/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index 83c78c9bbc07..12a731af5f30 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.1.137"; + version = "0.1.147"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-nR3fb3MHBxFvI4qrsTpElLWTDUESZ8J78GsVoCGTIyQ="; + hash = "sha256-d0PJaC1MhVS3i4AtXUjSkkq/Yj2Pi42H/cW/XML/94o="; }; sourceRoot = "${src.name}/python"; From 79662325cb64c7effec13993aa0c322baa80bde3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Nov 2024 13:47:03 +0000 Subject: [PATCH 15/66] python312Packages.optimum: 1.23.0 -> 1.23.3 --- pkgs/development/python-modules/optimum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/optimum/default.nix b/pkgs/development/python-modules/optimum/default.nix index 02485462a8b1..2bdef53e1ff6 100644 --- a/pkgs/development/python-modules/optimum/default.nix +++ b/pkgs/development/python-modules/optimum/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "optimum"; - version = "1.23.0"; + version = "1.23.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "optimum"; rev = "refs/tags/v${version}"; - hash = "sha256-1A430tvuUsMiVmDbISdj2g5l05D6FswGKsjdUBpZrP0="; + hash = "sha256-GJp1ukrYxEEwmkge31b02ROWZW5V23TtoEUjhycHpSg="; }; build-system = [ setuptools ]; From 4ebdf1edaafe4367a10b081b72c83a870276b73b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Nov 2024 22:37:16 +0000 Subject: [PATCH 16/66] python312Packages.replicate: 1.0.1 -> 1.0.4 --- pkgs/development/python-modules/replicate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/replicate/default.nix b/pkgs/development/python-modules/replicate/default.nix index f2b6f3d00b4c..4a5614afe4b8 100644 --- a/pkgs/development/python-modules/replicate/default.nix +++ b/pkgs/development/python-modules/replicate/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "replicate"; - version = "1.0.1"; + version = "1.0.4"; pyproject = true; src = fetchFromGitHub { owner = "replicate"; repo = "replicate-python"; rev = "refs/tags/${version}"; - hash = "sha256-q//RV4Y9k2KXXgZGfBF/XObxsBfAHE50oG+r/Vvu9BY="; + hash = "sha256-VXJBArFzVPls0ZWL8o6hkOiTtjYRxkdNDiWCPN/hW48="; }; build-system = [ setuptools ]; From 1b0f797f91c5e6343097a6c071d686d0a820677c Mon Sep 17 00:00:00 2001 From: Ritiek Malhotra Date: Sat, 30 Nov 2024 16:07:12 +0530 Subject: [PATCH 17/66] discordchatexporter-cli: support all unix platforms --- pkgs/by-name/di/discordchatexporter-cli/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/di/discordchatexporter-cli/package.nix b/pkgs/by-name/di/discordchatexporter-cli/package.nix index 68722d2c6142..81a3b2fa09df 100644 --- a/pkgs/by-name/di/discordchatexporter-cli/package.nix +++ b/pkgs/by-name/di/discordchatexporter-cli/package.nix @@ -40,7 +40,7 @@ buildDotnetModule rec { license = licenses.gpl3Plus; changelog = "https://github.com/Tyrrrz/DiscordChatExporter/blob/${version}/Changelog.md"; maintainers = with maintainers; [ ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.unix; mainProgram = "discordchatexporter-cli"; }; } From d1589acd8a8765e498f43f0e027d4a9e2057b472 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gy=C3=B6rgy=20Kurucz?= Date: Sat, 30 Nov 2024 21:15:14 +0100 Subject: [PATCH 18/66] lsb-release: rewrite with `replaceVars`, and use `@runtimeShell@` --- pkgs/by-name/ls/lsb-release/lsb_release.sh | 2 +- pkgs/by-name/ls/lsb-release/package.nix | 44 ++++++++++++---------- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/ls/lsb-release/lsb_release.sh b/pkgs/by-name/ls/lsb-release/lsb_release.sh index ae524181e88a..2031efc8b654 100644 --- a/pkgs/by-name/ls/lsb-release/lsb_release.sh +++ b/pkgs/by-name/ls/lsb-release/lsb_release.sh @@ -1,4 +1,4 @@ -#! @shell@ +#! @runtimeShell@ set -o errexit set -o nounset diff --git a/pkgs/by-name/ls/lsb-release/package.nix b/pkgs/by-name/ls/lsb-release/package.nix index f79c6527539a..6973d50e99aa 100644 --- a/pkgs/by-name/ls/lsb-release/package.nix +++ b/pkgs/by-name/ls/lsb-release/package.nix @@ -1,22 +1,26 @@ -{ substituteAll, lib -, coreutils, getopt +{ + replaceVars, + runCommand, + lib, + runtimeShell, + coreutils, + getopt, }: -substituteAll { - name = "lsb_release"; - - src = ./lsb_release.sh; - - dir = "bin"; - isExecutable = true; - - inherit coreutils getopt; - - meta = with lib; { - description = "Prints certain LSB (Linux Standard Base) and Distribution information"; - mainProgram = "lsb_release"; - license = [ licenses.mit ]; - maintainers = with maintainers; [ primeos ]; - platforms = platforms.linux; - }; -} +runCommand "lsb_release" + { + meta = with lib; { + description = "Prints certain LSB (Linux Standard Base) and Distribution information"; + mainProgram = "lsb_release"; + license = [ licenses.mit ]; + maintainers = with maintainers; [ primeos ]; + platforms = platforms.linux; + }; + } + '' + install -Dm 555 ${ + replaceVars ./lsb_release.sh { + inherit runtimeShell coreutils getopt; + } + } $out/bin/lsb_release + '' From 8f6ebec4dd22acbdce6e70a2d15b74bacc31ee56 Mon Sep 17 00:00:00 2001 From: haruki7049 Date: Sat, 16 Nov 2024 04:28:55 +0900 Subject: [PATCH 19/66] mitra: Init at 3.9.0 --- pkgs/by-name/mi/mitra/package.nix | 41 +++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 pkgs/by-name/mi/mitra/package.nix diff --git a/pkgs/by-name/mi/mitra/package.nix b/pkgs/by-name/mi/mitra/package.nix new file mode 100644 index 000000000000..b27b13490a04 --- /dev/null +++ b/pkgs/by-name/mi/mitra/package.nix @@ -0,0 +1,41 @@ +{ + lib, + rustPlatform, + fetchFromGitea, +}: + +rustPlatform.buildRustPackage rec { + pname = "mitra"; + version = "3.9.0"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "silverpill"; + repo = "mitra"; + rev = "v${version}"; + hash = "sha256-reBG9h3jI4ONxYIwM2QdXlTC8ohmSrPm18sLOeI/2wY="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-WoJzFhxBDHuUNGaNsqieev93hg0Eo604tAM0HZJv9tA="; + + # MEMO: mitra v3.9.0 tests failed with cargo option, "--offline" + doCheck = false; + + RUSTFLAGS = [ + # MEMO: mitra use ammonia crate with unstable rustc flag + "--cfg=ammonia_unstable" + ]; + + buildFeatures = [ + "production" + ]; + + meta = { + description = "Federated micro-blogging platform"; + homepage = "https://codeberg.org/silverpill/mitra"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ haruki7049 ]; + mainProgram = "mitra"; + }; +} From b18ef326a0a19e58cf60d6cebe58f61516f3d986 Mon Sep 17 00:00:00 2001 From: qubitnano <146656568+qubitnano@users.noreply.github.com> Date: Sun, 1 Dec 2024 13:18:44 -0500 Subject: [PATCH 20/66] mongodb-6_0: 6.0.18 -> 6.0.19 --- pkgs/servers/nosql/mongodb/6.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/mongodb/6.0.nix b/pkgs/servers/nosql/mongodb/6.0.nix index 6c56f007354b..1143a4f50b68 100644 --- a/pkgs/servers/nosql/mongodb/6.0.nix +++ b/pkgs/servers/nosql/mongodb/6.0.nix @@ -10,8 +10,8 @@ let in buildMongoDB { inherit avxSupport; - version = "6.0.18"; - sha256 = "sha256-Nq3xwR/z11HsZs8cC9Yr0Xkjg0l1MLb0YRFHsAeQKTM="; + version = "6.0.19"; + sha256 = "sha256-qcf+6hMg0LASeOoZJPoRCQ9ajCJBqSsBDg2Wp+2SMKY="; patches = [ # Patches a bug that it couldn't build MongoDB 6.0 on gcc 13 because a include in ctype.h was missing ./fix-gcc-13-ctype-6_0.patch From 969a4f9afdfefd857e2cf9a302cc383783a8fad6 Mon Sep 17 00:00:00 2001 From: qubitnano <146656568+qubitnano@users.noreply.github.com> Date: Thu, 21 Nov 2024 17:35:21 -0500 Subject: [PATCH 21/66] mongodb-7_0: 7.0.14 -> 7.0.15 --- pkgs/servers/nosql/mongodb/7.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/mongodb/7.0.nix b/pkgs/servers/nosql/mongodb/7.0.nix index 42a425f4288e..83f02ecb4a54 100644 --- a/pkgs/servers/nosql/mongodb/7.0.nix +++ b/pkgs/servers/nosql/mongodb/7.0.nix @@ -25,8 +25,8 @@ let in buildMongoDB { inherit avxSupport; - version = "7.0.14"; - sha256 = "sha256-3NUv/Rr6V0rH6zHCXJwHZ7ZQOqMJvYGessNVemUF6g0="; + version = "7.0.15"; + sha256 = "sha256-oVH0pBV22J//hVhrwx3uuBT/ML8W2N2HvzqYhuRuM68="; patches = [ # ModuleNotFoundError: No module named 'mongo_tooling_metrics': # NameError: name 'SConsToolingMetrics' is not defined: From 0277b5e57ad888fc15242b3e5795a0dd47b8c306 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Dec 2024 22:26:14 +0000 Subject: [PATCH 22/66] discordo: 0-unstable-2024-10-13 -> 0-unstable-2024-11-30 --- pkgs/applications/networking/discordo/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/discordo/default.nix b/pkgs/applications/networking/discordo/default.nix index 0116680f01eb..5c0ca836eab7 100644 --- a/pkgs/applications/networking/discordo/default.nix +++ b/pkgs/applications/networking/discordo/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "discordo"; - version = "0-unstable-2024-10-13"; + version = "0-unstable-2024-11-30"; src = fetchFromGitHub { owner = "ayn2op"; repo = pname; - rev = "26b77d9385daa2dc056930fa302a3c06595680ba"; - hash = "sha256-zXqYj8IBDVeDKjm0m8CYEX+tmHLpY2u7A4g38IiDNZk="; + rev = "3286ebecaab3c05ddbab9e6b502a750d07cea5aa"; + hash = "sha256-DaD6Rv/dzky3gjjqtjObTFZp7EJ8+UK6CoFpqZ/HO9U="; }; - vendorHash = "sha256-68NGcdyKuabSdW6CKAJUaJ0k2dpO0bm3OfNQ7qEVcqk="; + vendorHash = "sha256-66Y5hmEEQUBsSfYaj6UzCsFhDkwCDs6y2WOsnYby1gE="; CGO_ENABLED = 0; From ee19f3a3648a5b4248dce07bfc9d3258fd2d80d5 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Tue, 3 Dec 2024 17:18:36 +0900 Subject: [PATCH 23/66] lima: format with nixfmt-rfc-style --- .../virtualization/lima/default.nix | 58 ++++++++++--------- 1 file changed, 32 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 9878b425329b..cd6ed327fbc1 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -1,13 +1,14 @@ -{ lib -, stdenv -, buildGoModule -, fetchFromGitHub -, installShellFiles -, qemu -, sigtool -, makeWrapper -, nix-update-script -, apple-sdk_15 +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + installShellFiles, + qemu, + sigtool, + makeWrapper, + nix-update-script, + apple-sdk_15, }: buildGoModule rec { @@ -23,8 +24,10 @@ buildGoModule rec { vendorHash = "sha256-nNSBwvhKSWs6to37+RLziYQqVOYfvjYib3fRRALACho="; - nativeBuildInputs = [ makeWrapper installShellFiles ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ]; + nativeBuildInputs = [ + makeWrapper + installShellFiles + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 ]; @@ -48,20 +51,23 @@ buildGoModule rec { export LIMA_HOME="$(mktemp -d)" ''; - installPhase = '' - runHook preInstall - mkdir -p $out - cp -r _output/* $out - wrapProgram $out/bin/limactl \ - --prefix PATH : ${lib.makeBinPath [ qemu ]} - '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd limactl \ - --bash <($out/bin/limactl completion bash) \ - --fish <($out/bin/limactl completion fish) \ - --zsh <($out/bin/limactl completion zsh) - '' + '' - runHook postInstall - ''; + installPhase = + '' + runHook preInstall + mkdir -p $out + cp -r _output/* $out + wrapProgram $out/bin/limactl \ + --prefix PATH : ${lib.makeBinPath [ qemu ]} + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd limactl \ + --bash <($out/bin/limactl completion bash) \ + --fish <($out/bin/limactl completion fish) \ + --zsh <($out/bin/limactl completion zsh) + '' + + '' + runHook postInstall + ''; doInstallCheck = true; installCheckPhase = '' From 2b5db6273584eba44a8b20783f4630c700aafbec Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Tue, 3 Dec 2024 17:23:10 +0900 Subject: [PATCH 24/66] lima: add passthru.tests.version --- pkgs/applications/virtualization/lima/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index cd6ed327fbc1..5869fa6bb3b5 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -7,8 +7,10 @@ qemu, sigtool, makeWrapper, + testers, nix-update-script, apple-sdk_15, + lima, }: buildGoModule rec { @@ -74,7 +76,10 @@ buildGoModule rec { USER=nix $out/bin/limactl validate templates/default.yaml ''; - passthru.updateScript = nix-update-script { }; + passthru = { + tests.version = testers.testVersion { package = lima; }; + updateScript = nix-update-script { }; + }; meta = with lib; { homepage = "https://github.com/lima-vm/lima"; From 3bef6979b2592cafd88b9b2de05fb62f3a55d978 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Tue, 3 Dec 2024 17:37:20 +0900 Subject: [PATCH 25/66] lima: 1.0.1 -> 1.0.2 Release: https://github.com/lima-vm/lima/releases/tag/v1.0.2 Diff: https://github.com/lima-vm/lima/compare/v1.0.1...v1.0.2 --- pkgs/applications/virtualization/lima/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 5869fa6bb3b5..a9a297ced97d 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -15,16 +15,16 @@ buildGoModule rec { pname = "lima"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XYB8Nxbs76xmiiZ7IYfgn+UgUr6CLOalQrl6Ibo+DRc="; + sha256 = "sha256-LNsxMrbEgdosGDDUNvMZq/hpP5azNiIHjKTp0Iw/PC0="; }; - vendorHash = "sha256-nNSBwvhKSWs6to37+RLziYQqVOYfvjYib3fRRALACho="; + vendorHash = "sha256-taozyQBJvkCsJAaOHg1gFK4qOnepRbzIn4jHzxfAn6A="; nativeBuildInputs = [ makeWrapper From e24b70c2833669e55cb92706128b44a84b4e63c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 04:49:31 +0000 Subject: [PATCH 26/66] mpd: 0.23.15 -> 0.23.16 --- pkgs/servers/mpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 124297a9b752..a8decc0a33ba 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -118,13 +118,13 @@ let in stdenv.mkDerivation rec { pname = "mpd"; - version = "0.23.15"; + version = "0.23.16"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "sha256-QURq7ysSsxmBOtoBlPTPWiloXQpjEdxnM0L1fLwXfpw="; + sha256 = "sha256-0To+V+4xLjymGpRSpsyE/Une5uUpCEiAg+d041guPA0="; }; buildInputs = [ From dfc303201701ea221b8b3183dcc997a67f4ae0b6 Mon Sep 17 00:00:00 2001 From: weriomat Date: Tue, 3 Dec 2024 19:55:39 +0100 Subject: [PATCH 27/66] pingvin-share: 1.4.0 -> 1.6.1 --- pkgs/servers/pingvin-share/backend.nix | 2 +- pkgs/servers/pingvin-share/default.nix | 4 ++-- pkgs/servers/pingvin-share/frontend.nix | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/pingvin-share/backend.nix b/pkgs/servers/pingvin-share/backend.nix index 25e49179db47..390540ea6e12 100644 --- a/pkgs/servers/pingvin-share/backend.nix +++ b/pkgs/servers/pingvin-share/backend.nix @@ -31,7 +31,7 @@ buildNpmPackage { prisma ]; - npmDepsHash = "sha256-IeryDlBFG+fu0FyqlNujkF+O+YwfQm0hoMMvp/vN0IQ="; + npmDepsHash = "sha256-2q+3NgXkpqdljW/AnBU44002arMc0K/Rl15eqr+oa9E="; makeCacheWritable = true; npmFlags = [ "--legacy-peer-deps" ]; diff --git a/pkgs/servers/pingvin-share/default.nix b/pkgs/servers/pingvin-share/default.nix index cea79820fef5..ddf32bcadfe9 100644 --- a/pkgs/servers/pingvin-share/default.nix +++ b/pkgs/servers/pingvin-share/default.nix @@ -5,12 +5,12 @@ }: let - version = "1.4.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "stonith404"; repo = "pingvin-share"; rev = "v${version}"; - hash = "sha256-5tu81kB9UDui2/n5KJLRug4IHeDihuv8+HWeo0saqAM="; + hash = "sha256-uoOkr5awBa7MQA4tNUzFp7we5zVnBpjX6V6fNcTI84o="; }; in diff --git a/pkgs/servers/pingvin-share/frontend.nix b/pkgs/servers/pingvin-share/frontend.nix index 3f23adb167e4..1b1a5bd51aeb 100644 --- a/pkgs/servers/pingvin-share/frontend.nix +++ b/pkgs/servers/pingvin-share/frontend.nix @@ -23,7 +23,7 @@ buildNpmPackage { buildInputs = [ vips ]; nativeBuildInputs = [ pkg-config ]; - npmDepsHash = "sha256-G9UzA/laXEiU101ehFwhi0i6PAeErNWqmb1fu4W+cII="; + npmDepsHash = "sha256-TC3I3suUJTCmKykitpf2vvO6aGUSoYWOnB3jFwV2W/4="; makeCacheWritable = true; npmFlags = [ "--legacy-peer-deps" ]; From 51c4a6cd8b7c18eab0ff5fabd901467b33089634 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=9B=A7-440729=20=5Bsophie=5D?= Date: Thu, 5 Dec 2024 09:07:53 +0100 Subject: [PATCH 28/66] fedifetcher: 7.1.12 -> 7.1.14 --- pkgs/by-name/fe/fedifetcher/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fe/fedifetcher/package.nix b/pkgs/by-name/fe/fedifetcher/package.nix index 4eac63989761..9ef45d07a39f 100644 --- a/pkgs/by-name/fe/fedifetcher/package.nix +++ b/pkgs/by-name/fe/fedifetcher/package.nix @@ -2,14 +2,14 @@ python3.pkgs.buildPythonApplication rec { pname = "fedifetcher"; - version = "7.1.12"; + version = "7.1.14"; format = "other"; src = fetchFromGitHub { owner = "nanos"; repo = "FediFetcher"; rev = "refs/tags/v${version}"; - hash = "sha256-DWex4pZV9ZVR1bqYcOpTe74ZQCQCQQxjWrv0QgtRY40="; + hash = "sha256-SfR4CYVs2kLLguKCau+x5vy6ha48Zd43OJ+tsA6M9yg="; }; propagatedBuildInputs = with python3.pkgs; [ From 194c000ab52a424c7a6b73b01ee99b7b6ef79735 Mon Sep 17 00:00:00 2001 From: Builditluc Date: Wed, 4 Dec 2024 19:59:17 +0100 Subject: [PATCH 29/66] wiki-tui: 0.8.2 -> 0.9.1 --- pkgs/misc/wiki-tui/default.nix | 10 +- pkgs/misc/wiki-tui/time.patch | 211 --------------------------------- 2 files changed, 3 insertions(+), 218 deletions(-) delete mode 100644 pkgs/misc/wiki-tui/time.patch diff --git a/pkgs/misc/wiki-tui/default.nix b/pkgs/misc/wiki-tui/default.nix index 4d96c78cb560..4234894fcfd8 100644 --- a/pkgs/misc/wiki-tui/default.nix +++ b/pkgs/misc/wiki-tui/default.nix @@ -11,19 +11,15 @@ rustPlatform.buildRustPackage rec { pname = "wiki-tui"; - version = "0.8.2"; + version = "0.9.1"; src = fetchFromGitHub { owner = "Builditluc"; repo = "wiki-tui"; rev = "v${version}"; - hash = "sha256-euyg4wYWYerYT3hKdOCjokx8lJldGN7E3PHimDgQy3U="; + hash = "sha256-eTDxRrTP9vX7F1lmDCuF6g1pfaZChqB8Pv1kfrd7I9w="; }; - # Note: bump `time` dependency to be able to build with rust 1.80, should be removed on the next - # release (see: https://github.com/NixOS/nixpkgs/issues/332957) - cargoPatches = [ ./time.patch ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ @@ -31,7 +27,7 @@ rustPlatform.buildRustPackage rec { openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - cargoHash = "sha256-XovbT+KC0va7yC5j7kf6t1SnXe1uyy1KI8FRV1AwkS0="; + cargoHash = "sha256-fLA7dF91mEgjTnbhujTKaHX+qmpzYaqzL8cc/x+mrUk="; meta = with lib; { description = "Simple and easy to use Wikipedia Text User Interface"; diff --git a/pkgs/misc/wiki-tui/time.patch b/pkgs/misc/wiki-tui/time.patch deleted file mode 100644 index 09cd2a41d36e..000000000000 --- a/pkgs/misc/wiki-tui/time.patch +++ /dev/null @@ -1,211 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index e66f0ac..918c3b2 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -318,7 +318,7 @@ dependencies = [ - "log", - "num", - "owning_ref", -- "time 0.3.22", -+ "time 0.3.36", - "unicode-segmentation", - "unicode-width", - "xi-unicode", -@@ -344,7 +344,7 @@ dependencies = [ - "ident_case", - "proc-macro2", - "quote", -- "syn 2.0.23", -+ "syn 2.0.32", - ] - - [[package]] -@@ -355,7 +355,16 @@ checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" - dependencies = [ - "darling_core", - "quote", -- "syn 2.0.23", -+ "syn 2.0.32", -+] -+ -+[[package]] -+name = "deranged" -+version = "0.3.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -+dependencies = [ -+ "powerfmt", - ] - - [[package]] -@@ -427,7 +436,7 @@ checksum = "8560b409800a72d2d7860f8e5f4e0b0bd22bea6a352ea2a9ce30ccdef7f16d2f" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.23", -+ "syn 2.0.32", - ] - - [[package]] -@@ -448,7 +457,7 @@ dependencies = [ - "darling", - "proc-macro2", - "quote", -- "syn 2.0.23", -+ "syn 2.0.32", - ] - - [[package]] -@@ -1025,6 +1034,12 @@ dependencies = [ - "num-traits", - ] - -+[[package]] -+name = "num-conv" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" -+ - [[package]] - name = "num-integer" - version = "0.1.45" -@@ -1129,7 +1144,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.23", -+ "syn 2.0.32", - ] - - [[package]] -@@ -1282,6 +1297,12 @@ version = "0.3.27" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -+[[package]] -+name = "powerfmt" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" -+ - [[package]] - name = "ppv-lite86" - version = "0.2.17" -@@ -1518,9 +1539,9 @@ dependencies = [ - - [[package]] - name = "serde" --version = "1.0.167" -+version = "1.0.193" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7daf513456463b42aa1d94cff7e0c24d682b429f020b9afa4f5ba5c40a22b237" -+checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" - dependencies = [ - "serde_derive", - ] -@@ -1537,13 +1558,13 @@ dependencies = [ - - [[package]] - name = "serde_derive" --version = "1.0.167" -+version = "1.0.193" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b69b106b68bc8054f0e974e70d19984040f8a5cf9215ca82626ea4853f82c4b9" -+checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.23", -+ "syn 2.0.32", - ] - - [[package]] -@@ -1565,7 +1586,7 @@ checksum = "1d89a8107374290037607734c0b73a85db7ed80cae314b3c5791f192a496e731" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.23", -+ "syn 2.0.32", - ] - - [[package]] -@@ -1750,9 +1771,9 @@ dependencies = [ - - [[package]] - name = "syn" --version = "2.0.23" -+version = "2.0.32" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" -+checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" - dependencies = [ - "proc-macro2", - "quote", -@@ -1832,7 +1853,7 @@ checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.23", -+ "syn 2.0.32", - ] - - [[package]] -@@ -1859,13 +1880,16 @@ dependencies = [ - - [[package]] - name = "time" --version = "0.3.22" -+version = "0.3.36" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" -+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" - dependencies = [ -+ "deranged", - "itoa", - "libc", -+ "num-conv", - "num_threads", -+ "powerfmt", - "serde", - "time-core", - "time-macros", -@@ -1873,16 +1897,17 @@ dependencies = [ - - [[package]] - name = "time-core" --version = "0.1.1" -+version = "0.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" -+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - - [[package]] - name = "time-macros" --version = "0.2.9" -+version = "0.2.18" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" -+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" - dependencies = [ -+ "num-conv", - "time-core", - ] - -@@ -2133,7 +2158,7 @@ dependencies = [ - "once_cell", - "proc-macro2", - "quote", -- "syn 2.0.23", -+ "syn 2.0.32", - "wasm-bindgen-shared", - ] - -@@ -2167,7 +2192,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.23", -+ "syn 2.0.32", - "wasm-bindgen-backend", - "wasm-bindgen-shared", - ] From a0b7a4ea1e295c76f723cf16ce56100fe131c02d Mon Sep 17 00:00:00 2001 From: Shaw Vrana Date: Thu, 5 Dec 2024 11:32:36 -0800 Subject: [PATCH 30/66] eksctl: 0.194.0 -> 0.197.0 --- pkgs/by-name/ek/eksctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix index 67bb8474b9f5..1bece593d6cf 100644 --- a/pkgs/by-name/ek/eksctl/package.nix +++ b/pkgs/by-name/ek/eksctl/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.194.0"; + version = "0.197.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - hash = "sha256-BjMM2xjDA9rteT1dFE1DENEzM5226GW+Zv2gtZNCzNo="; + hash = "sha256-JHhZFcjnURgt+HqRwy/0rZ2qrzpeX/WGeXJ0arhRDq8="; }; - vendorHash = "sha256-3BVy2e2cbxtWP7yP4UTXvtH1Hr/Vl06e6Dsr+FLhtZg="; + vendorHash = "sha256-f7+IlOcGJL5G52wPZz1oeHmR8LR8XZh6ASV1qi7hXi0="; doCheck = false; From cebe48a77cf549ac990fc299af6b03e9ca3f0a9c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 00:57:53 +0000 Subject: [PATCH 31/66] ndcurves: 1.4.1 -> 2.0.0 --- pkgs/by-name/nd/ndcurves/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nd/ndcurves/package.nix b/pkgs/by-name/nd/ndcurves/package.nix index cc58991bb325..f61f5a1d179f 100644 --- a/pkgs/by-name/nd/ndcurves/package.nix +++ b/pkgs/by-name/nd/ndcurves/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ndcurves"; - version = "1.4.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "loco-3d"; repo = "ndcurves"; rev = "v${finalAttrs.version}"; - hash = "sha256-XJ3VSSGKSJ+x3jc4408PGHTYg3nC7o/EeFnbKBELefs="; + hash = "sha256-dDH2XpnlBlhG5Q8N9Aljxvf/K9jFuiAx0lyBIcXNOZE="; }; outputs = [ From 239c4467200aa9dc29cd2ffac75e33a984915678 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 6 Dec 2024 02:01:09 +0100 Subject: [PATCH 32/66] python39: 3.9.20 -> 3.9.21 https://docs.python.org/release/3.9.21/whatsnew/changelog.html --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index abed1fe0a685..486893326eb6 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -46,10 +46,10 @@ in { sourceVersion = { major = "3"; minor = "9"; - patch = "20"; + patch = "21"; suffix = ""; }; - hash = "sha256-aygSee/YUpTS1pk+FzmDpXRkwBM5Vvu7VTbslka+rww="; + hash = "sha256-MSb1lZLJsNeYWEdV8r97CB+hyjXOem/qmAEI11KgW7E="; inherit passthruFun; }; From ce5d74fbbafd709e0f75f55462c8f6ba622d0b79 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 6 Dec 2024 02:01:53 +0100 Subject: [PATCH 33/66] python310: 3.10.15 -> 3.10.16 https://docs.python.org/release/3.10.16/whatsnew/changelog.html --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 486893326eb6..5b09e4bf97b3 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -58,10 +58,10 @@ in { sourceVersion = { major = "3"; minor = "10"; - patch = "15"; + patch = "16"; suffix = ""; }; - hash = "sha256-qrCVCBdzUXJgGHmHLZN8HkkopXxAmuAjaew9kdzOvnk="; + hash = "sha256-v7JJYJmQIgSRobkoUKBxNe0IMeQXOM9oHWPPAbKo+9E="; inherit passthruFun; }; From b994f1fa5aa1d6f1491c5d6fc436bf986b624204 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Fri, 6 Dec 2024 12:19:37 +0900 Subject: [PATCH 34/66] lima: make sure it does not use pname for reponame Co-authored-by: OTABI Tomoya --- pkgs/applications/virtualization/lima/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index a9a297ced97d..0460467ea204 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "lima-vm"; - repo = pname; + repo = "lima"; rev = "v${version}"; sha256 = "sha256-LNsxMrbEgdosGDDUNvMZq/hpP5azNiIHjKTp0Iw/PC0="; }; From d90d79a605f255261c8c68ff92d34f64116cdddb Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Fri, 6 Dec 2024 12:20:43 +0900 Subject: [PATCH 35/66] lima: prefer hash rather than sha256 in fetchFromGitHub Co-authored-by: OTABI Tomoya --- pkgs/applications/virtualization/lima/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 0460467ea204..8538104effab 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { owner = "lima-vm"; repo = "lima"; rev = "v${version}"; - sha256 = "sha256-LNsxMrbEgdosGDDUNvMZq/hpP5azNiIHjKTp0Iw/PC0="; + hash = "sha256-LNsxMrbEgdosGDDUNvMZq/hpP5azNiIHjKTp0Iw/PC0="; }; vendorHash = "sha256-taozyQBJvkCsJAaOHg1gFK4qOnepRbzIn4jHzxfAn6A="; From 67d1a8ce898485739fd19ff78b96a255819dbbb6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 07:45:06 +0000 Subject: [PATCH 36/66] epic5: 3.0.1 -> 3.0.2 --- pkgs/by-name/ep/epic5/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ep/epic5/package.nix b/pkgs/by-name/ep/epic5/package.nix index f4f2ca6b2ac2..b53f6b761e48 100644 --- a/pkgs/by-name/ep/epic5/package.nix +++ b/pkgs/by-name/ep/epic5/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "epic5"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { url = "https://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/epic5-${finalAttrs.version}.tar.xz"; - hash = "sha256-F7lnxh5Yh08HdeH9CwYH+FxktjJYwaxNQInoETUqOUU="; + hash = "sha256-QiD9Lx4IxbR+w0NFw5cANqN9cvu1QR45wQ87zlV8FNU="; }; buildInputs = From 896813431f304440e4d92a3ead4f4291c77c05f0 Mon Sep 17 00:00:00 2001 From: Cryo Date: Fri, 6 Dec 2024 17:50:09 +0800 Subject: [PATCH 37/66] maintainers: add cryo --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 367ff308844a..35559aef1530 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4668,6 +4668,13 @@ name = "Carl Richard Theodor Schneider"; keys = [ { fingerprint = "2017 E152 BB81 5C16 955C E612 45BC C1E2 709B 1788"; } ]; }; + cryo = { + email = "cryo@disroot.org"; + github = "cry0ice"; + githubId = 176274027; + name = "Cryo"; + keys = [ { fingerprint = "2CF7 F8E8 2258 5751 2591 F97F 4B12 E34A 25A9 AB35"; } ]; + }; Cryolitia = { name = "Cryolitia PukNgae"; email = "Cryolitia@gmail.com"; From 44082b371a42f9e0b2250eff14233abfeab29964 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 13:09:58 +0000 Subject: [PATCH 38/66] python312Packages.globus-sdk: 3.48.0 -> 3.49.0 --- pkgs/development/python-modules/globus-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index d24794e0d17d..7e1cc1c7f737 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "3.48.0"; + version = "3.49.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "globus"; repo = "globus-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-NYDmDhsgYNMZZDiSZ5ZtRauTzzckjqtETbfs8OvkgE4="; + hash = "sha256-gqY26EoVUgpNQ83Egmnb/mBnLcB6MmFNs4W7ZsZziK0="; }; build-system = [ setuptools ]; From 81ab50ae91c3843686678294ce3088b369f73d8e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 13:19:08 +0000 Subject: [PATCH 39/66] python312Packages.django-import-export: 4.1.1 -> 4.3.3 --- .../python-modules/django-import-export/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix index d2d65daa6689..5cce017a0833 100644 --- a/pkgs/development/python-modules/django-import-export/default.nix +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -7,7 +7,6 @@ fetchFromGitHub, psycopg2, python, - pythonOlder, pytz, setuptools-scm, tablib, @@ -15,23 +14,20 @@ buildPythonPackage rec { pname = "django-import-export"; - version = "4.1.1"; + version = "4.3.3"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "django-import-export"; repo = "django-import-export"; rev = "refs/tags/${version}"; - hash = "sha256-kD/9cpFqjipP3onMHCfimu0ffzGQAoEspjc4IfyuZak="; + hash = "sha256-1vb8a0ntp5ikWrJ3aI4KsGlraXRoFa7o+sP2sJpFbVc="; }; pythonRelaxDeps = [ "tablib" ]; build-system = [ setuptools-scm ]; - dependencies = [ diff-match-patch django From f6bdeca7a72b7e2069e099d18df3921d2234e8ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 13:52:46 +0000 Subject: [PATCH 40/66] python312Packages.ihm: 1.7 -> 1.8 --- pkgs/development/python-modules/ihm/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/ihm/default.nix b/pkgs/development/python-modules/ihm/default.nix index 1d07533f536a..29cb68253625 100644 --- a/pkgs/development/python-modules/ihm/default.nix +++ b/pkgs/development/python-modules/ihm/default.nix @@ -4,30 +4,27 @@ fetchFromGitHub, setuptools, swig, - wheel, msgpack, pytestCheckHook, }: buildPythonPackage rec { pname = "ihm"; - version = "1.7"; + version = "1.8"; pyproject = true; src = fetchFromGitHub { owner = "ihmwg"; repo = "python-ihm"; rev = "refs/tags/${version}"; - hash = "sha256-jQm8Xl2yyR+y1Leyz8naT1rFJpgK5XdUd7YgnhDuBWo="; + hash = "sha256-Uz/4Egd7swY4kDl6FR564eiaYEdY9IUoz2Lv5pJ1C30="; }; - nativeBuildInputs = [ - setuptools - swig - wheel - ]; + nativeBuildInputs = [ swig ]; - propagatedBuildInputs = [ msgpack ]; + build-system = [ setuptools ]; + + dependencies = [ msgpack ]; nativeCheckInputs = [ pytestCheckHook ]; From f28ecbe89ad9011c0ab45a42a6ed361db2f084e9 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Fri, 6 Dec 2024 12:50:49 +0900 Subject: [PATCH 41/66] lima: prefer version testing in installCheckPhase rather than passthru.tests.version --- pkgs/applications/virtualization/lima/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 8538104effab..74a75ce57871 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -7,7 +7,6 @@ qemu, sigtool, makeWrapper, - testers, nix-update-script, apple-sdk_15, lima, @@ -72,14 +71,19 @@ buildGoModule rec { ''; doInstallCheck = true; + # Workaround for: "panic: $HOME is not defined" at https://github.com/lima-vm/lima/blob/v1.0.2/pkg/limayaml/defaults.go#L52 + # Don't use versionCheckHook for this package. It cannot inject environment variables. installCheckPhase = '' + if [[ "$(HOME="$(mktemp -d)" "$out/bin/limactl" --version | cut -d ' ' -f 3)" == "${version}" ]]; then + echo '${pname} smoke check passed' + else + echo '${pname} smoke check failed' + return 1 + fi USER=nix $out/bin/limactl validate templates/default.yaml ''; - passthru = { - tests.version = testers.testVersion { package = lima; }; - updateScript = nix-update-script { }; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { homepage = "https://github.com/lima-vm/lima"; From 1b59a4564376ee10ae5b45e1e955608bded318b0 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Fri, 6 Dec 2024 09:43:40 -0500 Subject: [PATCH 42/66] zizmor: 0.5.0 -> 0.7.0 Diff: https://github.com/woodruffw/zizmor/compare/v0.5.0...v0.7.0 Changelog: https://github.com/woodruffw/zizmor/releases/tag/v0.7.0 --- pkgs/by-name/zi/zizmor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/zi/zizmor/package.nix b/pkgs/by-name/zi/zizmor/package.nix index 2431c176a55d..199823473dbe 100644 --- a/pkgs/by-name/zi/zizmor/package.nix +++ b/pkgs/by-name/zi/zizmor/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "zizmor"; - version = "0.5.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "woodruffw"; repo = "zizmor"; rev = "v${version}"; - hash = "sha256-dYM8Zkri0H/olODF2weOqdVg1NcPltzu1PZ92IbGLVE="; + hash = "sha256-fZD8wXKS8bGh6P+KS2VM3pCuEDIEeNrK5iAykxzC/2Q="; }; - cargoHash = "sha256-18DWe1MHABz1SMg72NcYTSCGvevchqZ3asb8+lg5MwE="; + cargoHash = "sha256-n9VLK9i7YayiLD8pnEns19vbtlEktjFutYoKwpXgBCw="; buildInputs = [ openssl ]; From 07cb36c3f9ce61818c616b90c4e89025e63f6716 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Fri, 6 Dec 2024 18:33:16 +0200 Subject: [PATCH 43/66] yt-dlp: 2024.12.3 -> 2024.12.6 Changelog: https://github.com/yt-dlp/yt-dlp/releases/tag/2024.12.06 Diff: https://github.com/yt-dlp/yt-dlp/compare/2024.12.03...2024.12.06 --- pkgs/by-name/yt/yt-dlp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix index 7da4db2e7af3..f25fc13ed613 100644 --- a/pkgs/by-name/yt/yt-dlp/package.nix +++ b/pkgs/by-name/yt/yt-dlp/package.nix @@ -17,13 +17,13 @@ python3Packages.buildPythonApplication rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2024.12.3"; + version = "2024.12.6"; pyproject = true; src = fetchPypi { inherit version; pname = "yt_dlp"; - hash = "sha256-Nav/UcV2IDMQPyMwugqKH0jEOIpBOi2M3JuEZC/o7dQ="; + hash = "sha256-dD2+CB6ocb4/X/CD4s2V2oZt6nc/xwrmsQmDjPv3KsQ="; }; build-system = with python3Packages; [ From 96df5142416ca89bda7cf75a8b6ef68ea9403f13 Mon Sep 17 00:00:00 2001 From: Leah Amelia Chen Date: Fri, 6 Dec 2024 20:26:32 +0100 Subject: [PATCH 44/66] lazyjournal: init at 0.4.0 --- pkgs/by-name/la/lazyjournal/package.nix | 38 +++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 pkgs/by-name/la/lazyjournal/package.nix diff --git a/pkgs/by-name/la/lazyjournal/package.nix b/pkgs/by-name/la/lazyjournal/package.nix new file mode 100644 index 000000000000..6abbef38687b --- /dev/null +++ b/pkgs/by-name/la/lazyjournal/package.nix @@ -0,0 +1,38 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: +let + version = "0.4.0"; +in +buildGoModule { + pname = "lazyjournal"; + inherit version; + + src = fetchFromGitHub { + owner = "Lifailon"; + repo = "lazyjournal"; + tag = version; + hash = "sha256-Ce5xodkWgMMRRqsKLZNt0cNspsUFXTHQHXmQbphOS2w="; + }; + + vendorHash = "sha256-jh99+zlhr4ogig4Z2FFO6SZ2qTBkOUuiXo5iNk0VTi0="; + + ldflags = [ + "-s" + "-w" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "TUI for journalctl, file system logs, as well as Docker and Podman containers"; + homepage = "https://github.com/Lifailon/lazyjournal"; + license = with lib.licenses; [ mit ]; + platforms = with lib.platforms; unix ++ windows; + maintainers = with lib.maintainers; [ pluiedev ]; + mainProgram = "lazyjournal"; + }; +} From dd7d0b79b508f175c0a1be4bd5e984ae8a79fba7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 20:38:24 +0000 Subject: [PATCH 45/66] dbeaver-bin: 24.2.3 -> 24.3.0 --- pkgs/by-name/db/dbeaver-bin/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index c9cc55579986..854f9688a796 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbeaver-bin"; - version = "24.2.3"; + version = "24.3.0"; src = let @@ -30,10 +30,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { aarch64-darwin = "macos-aarch64.dmg"; }; hash = selectSystem { - x86_64-linux = "sha256-TvDpoEcnZBS8ORggFwLM80FXsJ8EXKvRSPUn+VtNTk8="; - aarch64-linux = "sha256-59khU3VQzpNeZv69pbeeE4ZAFajyI5gUUw9baOWPIFM="; - x86_64-darwin = "sha256-/YyN5daeoxq0oii6qYRpZ8cb43u6n8HuVc2JqVOhrxs="; - aarch64-darwin = "sha256-Stb76QpLnpmpBYDm+6fgkcx+TlY8hVkNtvGgdMWbaHg="; + x86_64-linux = "sha256-7tmz6ThT6oH2eMRl5XTf1+nr/ufDlp4BvGyKFICiTRw="; + aarch64-linux = "sha256-idnTeh37Ew6fg1gdJaoFF+wpgoShcJZokmWsid6g3ow="; + x86_64-darwin = "sha256-P1XseM1Al7y1JFVe/8VCIE84nMT4l9KF+Ik+rHjrv20="; + aarch64-darwin = "sha256-Xl4D8qTwB0tccuXqon4DApOOM95swxbfwSTD8gqc7jo="; }; in fetchurl { From da61cc23b502e83459619f540c34466faa4444b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 22:55:29 +0000 Subject: [PATCH 46/66] ad-miner: 1.6.1 -> 1.7.0 --- pkgs/by-name/ad/ad-miner/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ad/ad-miner/package.nix b/pkgs/by-name/ad/ad-miner/package.nix index b1aaf615c6e5..738b17374dfa 100644 --- a/pkgs/by-name/ad/ad-miner/package.nix +++ b/pkgs/by-name/ad/ad-miner/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ad-miner"; - version = "1.6.1"; + version = "1.7.0"; pyproject = true; src = fetchFromGitHub { owner = "Mazars-Tech"; repo = "AD_Miner"; rev = "refs/tags/v${version}"; - hash = "sha256-/TIG1UUfLct9MxCmahWk7F6KlypNan+zk/02zVpPV+w="; + hash = "sha256-Uzt7tKRj+iq4UR0gUpfhiTzMjecVBcp7jsXC7lSADeg="; }; # All requirements are pinned From ff1502b97d8902e4b4f0bd21b8ba024fbcbec9d0 Mon Sep 17 00:00:00 2001 From: Cryo Date: Sat, 7 Dec 2024 07:13:34 +0800 Subject: [PATCH 47/66] chsrc: init at 0.1.9 --- .../ch/chsrc/disable-static-compiling.patch | 14 ++++++ pkgs/by-name/ch/chsrc/package.nix | 46 +++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 pkgs/by-name/ch/chsrc/disable-static-compiling.patch create mode 100644 pkgs/by-name/ch/chsrc/package.nix diff --git a/pkgs/by-name/ch/chsrc/disable-static-compiling.patch b/pkgs/by-name/ch/chsrc/disable-static-compiling.patch new file mode 100644 index 000000000000..470deb32e9c9 --- /dev/null +++ b/pkgs/by-name/ch/chsrc/disable-static-compiling.patch @@ -0,0 +1,14 @@ +diff --git a/Makefile b/Makefile +index 99065da..2415738 100644 +--- a/Makefile ++++ b/Makefile +@@ -16,9 +16,6 @@ endif + ifeq ($(CC), clang) + CFLAGS += $(CLANG_FLAGS) + endif +-ifeq ($(shell uname), Linux) +- CFLAGS += -static +-endif + + Target = chsrc + diff --git a/pkgs/by-name/ch/chsrc/package.nix b/pkgs/by-name/ch/chsrc/package.nix new file mode 100644 index 000000000000..d59c2823ee20 --- /dev/null +++ b/pkgs/by-name/ch/chsrc/package.nix @@ -0,0 +1,46 @@ +{ + lib, + fetchFromGitHub, + stdenv, + texinfo, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "chsrc"; + version = "0.1.9"; + + src = fetchFromGitHub { + owner = "RubyMetric"; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; + hash = "sha256-MwT6SuDisJ2ynxlOqAUA8WjhrTeUcyoAMArehnby8Yw="; + }; + + nativeBuildInputs = [ texinfo ]; + + patches = [ + ./disable-static-compiling.patch + ]; + + installPhase = '' + runHook preInstall + install -Dm755 chsrc $out/bin/chsrc + install -Dm644 doc/chsrc.1 -t $out/share/man/man1/ + makeinfo doc/chsrc.texi --output=chsrc.info + install -Dm 644 chsrc.info -t $out/share/info/ + runHook postInstall + ''; + + meta = { + description = "Change Source everywhere for every software"; + homepage = "https://chsrc.run/"; + changelog = "https://github.com/RubyMetric/chsrc/releases/tag/v${finalAttrs.version}"; + license = with lib.licenses; [ + gpl3Plus + mit + ]; + maintainers = with lib.maintainers; [ cryo ]; + platforms = lib.platforms.all; + mainProgram = "chsrc"; + }; +}) From 36f4e01add1e7e1cf8fdcf7485a0e3aa3b568877 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Dec 2024 00:06:11 +0000 Subject: [PATCH 48/66] gpxsee: 13.26 -> 13.32 --- pkgs/applications/misc/gpxsee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 60bc8b579237..6212751184b0 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -17,13 +17,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gpxsee"; - version = "13.26"; + version = "13.32"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = finalAttrs.version; - hash = "sha256-EIeUcSHJXpd1/90fAPrP9F/DVyZhkcZk8MJd9VO1D70="; + hash = "sha256-wz5cYZe7OHfIgoHrYRj0DKNFjYjb+CGlLnDItRNu+bk="; }; buildInputs = [ From af6d0825caa50ed94722a01bf9ce97137a49a2f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Dec 2024 03:13:04 +0000 Subject: [PATCH 49/66] ttags: 0.4.1 -> 0.4.2 --- pkgs/by-name/tt/ttags/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tt/ttags/package.nix b/pkgs/by-name/tt/ttags/package.nix index b95bc53e2bea..c6bee9ae3369 100644 --- a/pkgs/by-name/tt/ttags/package.nix +++ b/pkgs/by-name/tt/ttags/package.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, rustPlatform, testers, ttags }: -let version = "0.4.1"; +let version = "0.4.2"; in rustPlatform.buildRustPackage { pname = "ttags"; inherit version; @@ -8,10 +8,10 @@ in rustPlatform.buildRustPackage { owner = "npezza93"; repo = "ttags"; rev = "${version}"; - hash = "sha256-yKg0KUA/Wa7B/sU1uxgGQR0Wat/bFv3ascqnUCdWKw0="; + hash = "sha256-z0IxGdveMtCXmCKD4jp/BEA6mtTl4CitIrVhM6BtHzA="; }; - cargoHash = "sha256-MZ9QRF5yNw+YtSEu+Qc/J3Ap7+nRDZT7aitunk+x38Y="; + cargoHash = "sha256-kyduUQcc3w5JyQICwTu9GdNRJF6H5353Ow05oKg6Ozg="; passthru.tests.version = testers.testVersion { package = ttags; From 45fe26aaf8847951df2c1c97e845bee0177ac57b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Dec 2024 03:19:08 +0000 Subject: [PATCH 50/66] minijinja: 2.4.0 -> 2.5.0 --- pkgs/by-name/mi/minijinja/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/minijinja/package.nix b/pkgs/by-name/mi/minijinja/package.nix index 7ebd3575944f..ca9ed7870579 100644 --- a/pkgs/by-name/mi/minijinja/package.nix +++ b/pkgs/by-name/mi/minijinja/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "minijinja"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "minijinja"; rev = version; - hash = "sha256-8ZAc5ALhpPyFCCsC0f22fSZKRmevFLLFFC0drUuXxg4="; + hash = "sha256-rRNikxSgr3isXkp/2oqPQ3JkugxuLgYlcT5c+4yIYBc="; }; - cargoHash = "sha256-2aeRb5jNZbpzAgpne494BMr7rkDqZUJEpITtHbdmhxY="; + cargoHash = "sha256-ksdCvl8x6KfqNRnTeIKkL6nnr4d53wMv7pr2rupVkTI="; # The tests relies on the presence of network connection doCheck = false; From 8a97d662ddc24d839f19c5f4f9dba4ecf46d8f94 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Fri, 6 Dec 2024 22:13:50 +0900 Subject: [PATCH 51/66] nixos/hostapd: remove HT40- from default capabilities The current default configuration, automatic channel selection with the HT40- capability, is explicitly disallowed by an assertion in this module. This is a result of recent change to default to automatic channel selection in 1047f0a6bf88a7eb49a1a7380e17e2077eecec73. --- nixos/modules/services/networking/hostapd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index 09f271999fc4..82ece277f187 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -300,7 +300,7 @@ in { capabilities = mkOption { type = types.listOf types.str; - default = ["HT40" "HT40-" "SHORT-GI-20" "SHORT-GI-40"]; + default = ["HT40" "SHORT-GI-20" "SHORT-GI-40"]; example = ["LDPC" "HT40+" "HT40-" "GF" "SHORT-GI-20" "SHORT-GI-40" "TX-STBC" "RX-STBC1"]; description = '' HT (High Throughput) capabilities given as a list of flags. From 5714c33244540bab6b0941da0b3379dc07f9336b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Nov 2024 17:59:30 +0000 Subject: [PATCH 52/66] python312Packages.sphinxcontrib-confluencebuilder: 2.7.1 -> 2.9.0 --- .../sphinxcontrib-confluencebuilder/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix index afbe62d9c989..1bd6de25631a 100644 --- a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix @@ -12,15 +12,15 @@ buildPythonPackage rec { pname = "sphinxcontrib-confluencebuilder"; - version = "2.7.1"; + version = "2.9.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { pname = "sphinxcontrib_confluencebuilder"; inherit version; - hash = "sha256-Tj9m0TcPkg+FIWwYixahpox27Yn+0tXPppwb5EwmBk0="; + hash = "sha256-2lF8iS8c7KXDdXT2IuApFnx0g4syWmIP1y25W5DkkJA="; }; build-system = [ flit-core ]; From 9ded9ca8eb4d0359fe3c7e47e47495a4db2d7438 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Nov 2024 10:48:10 +0000 Subject: [PATCH 53/66] python312Packages.rdflib: 7.0.0 -> 7.1.1 --- .../python-modules/rdflib/default.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index 72f6e8c8d485..4403778f3165 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -12,9 +12,6 @@ isodate, pyparsing, - # propagates <3.8 - importlib-metadata, - # extras: networkx networkx, @@ -30,25 +27,23 @@ buildPythonPackage rec { pname = "rdflib"; - version = "7.0.0"; - format = "pyproject"; + version = "7.1.1"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "RDFLib"; - repo = pname; + repo = "rdflib"; rev = "refs/tags/${version}"; - hash = "sha256-VCjvgXMun1Hs+gPeqjzLXbIX1NBQ5aMLz0aWlwsm0iY="; + hash = "sha256-/jRUV7H6JBWBv/gphjLjjifbEwMSxWke5STqkeSzwoE="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ - isodate - html5lib + dependencies = [ pyparsing - ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ] ++ lib.optionals (pythonOlder "3.11") [ isodate ]; optional-dependencies = { html = [ html5lib ]; From 3d73d0579187384901c0bd7c45f9b5281fa0e0a7 Mon Sep 17 00:00:00 2001 From: misuzu Date: Sat, 7 Dec 2024 08:04:46 +0200 Subject: [PATCH 54/66] time: fix implicit function declaration (#362226) --- pkgs/by-name/ti/time/package.nix | 5 ++++ .../time-1.9-implicit-func-decl-clang.patch | 24 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/by-name/ti/time/time-1.9-implicit-func-decl-clang.patch diff --git a/pkgs/by-name/ti/time/package.nix b/pkgs/by-name/ti/time/package.nix index 1df89b323838..2328d03e1870 100644 --- a/pkgs/by-name/ti/time/package.nix +++ b/pkgs/by-name/ti/time/package.nix @@ -9,6 +9,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-+6zwyB5iQp3z4zvaTO44dWYE8Y4B2XczjiMwaj47Uh4="; }; + patches = [ + # fixes cross-compilation to riscv64-linux + ./time-1.9-implicit-func-decl-clang.patch + ]; + meta = { description = "Tool that runs programs and summarizes the system resources they use"; longDescription = '' diff --git a/pkgs/by-name/ti/time/time-1.9-implicit-func-decl-clang.patch b/pkgs/by-name/ti/time/time-1.9-implicit-func-decl-clang.patch new file mode 100644 index 000000000000..ca76b5a50050 --- /dev/null +++ b/pkgs/by-name/ti/time/time-1.9-implicit-func-decl-clang.patch @@ -0,0 +1,24 @@ +https://lists.gnu.org/archive/html/bug-time/2022-08/msg00001.html + +From c8deae54f92d636878097063b411af9fb5262ad3 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 15 Aug 2022 07:24:24 -0700 +Subject: [PATCH] include string.h for memset() + +Fixes implicit function declaration warning e.g. + +resuse.c:103:3: error: call to undeclared library function 'memset' with type 'void *(void *, int, unsigned long)' + +Upstream-Status: Submitted [https://lists.gnu.org/archive/html/bug-time/2022-08/msg00001.html] +Signed-off-by: Khem Raj +--- a/src/resuse.c ++++ b/src/resuse.c +@@ -22,6 +22,7 @@ + */ + + #include "config.h" ++#include + #include + #include + #include + From 51da93207ee529c3eff0e719e65edc3b2f705b52 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 7 Dec 2024 15:02:42 +0900 Subject: [PATCH 55/66] python312Packages.rdflib: use default pytestCheckHook --- pkgs/development/python-modules/rdflib/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index 4403778f3165..6b52f646a78c 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -21,7 +21,7 @@ # tests pip, pytest-cov-stub, - pytest7CheckHook, + pytestCheckHook, setuptools, }: @@ -55,8 +55,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pip pytest-cov-stub - # Failed: DID NOT WARN. No warnings of type (,) were emitted. - pytest7CheckHook + pytestCheckHook setuptools ] ++ optional-dependencies.networkx ++ optional-dependencies.html; From 3dcd875c9a3623f2cdbc5f546698d5a36bacf97d Mon Sep 17 00:00:00 2001 From: con-f-use Date: Sat, 7 Dec 2024 07:17:42 +0100 Subject: [PATCH 56/66] cot: fixes for python312 (#362256) --- pkgs/development/python-modules/cot/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cot/default.nix b/pkgs/development/python-modules/cot/default.nix index fb3a138627ad..5f28ef159c4d 100644 --- a/pkgs/development/python-modules/cot/default.nix +++ b/pkgs/development/python-modules/cot/default.nix @@ -7,13 +7,14 @@ pyopenssl, pytest-mock, pytestCheckHook, - pythonAtLeast, pyvmomi, qemu, requests, + distutils, setuptools, stdenv, verboselogs, + versioneer, }: buildPythonPackage rec { @@ -26,8 +27,14 @@ buildPythonPackage rec { hash = "sha256-9LNVNBX5DarGVvidPoLnmz11F5Mjm7FzpoO0zAzrJjU="; }; + build-system = [ + setuptools + versioneer + ]; + propagatedBuildInputs = [ colorlog + distutils pyvmomi requests verboselogs @@ -46,6 +53,7 @@ buildPythonPackage rec { # argparse is part of the standardlib substituteInPlace setup.py \ --replace "'argparse'," "" + rm versioneer.py ''; disabledTests = [ @@ -84,6 +92,5 @@ buildPythonPackage rec { ''; license = lib.licenses.mit; maintainers = with lib.maintainers; [ evanjs ]; - broken = pythonAtLeast "3.12"; # Because it requires packages removed from 3.12 onwards }; } From 379aeabd483dfdd093ed2ea9b30726032b102a35 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Nov 2024 08:47:33 +0000 Subject: [PATCH 57/66] python312Packages.dm-haiku: 0.0.12 -> 0.0.13 --- .../python-modules/dm-haiku/default.nix | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/dm-haiku/default.nix b/pkgs/development/python-modules/dm-haiku/default.nix index e5f44feb69c5..715aa1f8c3a4 100644 --- a/pkgs/development/python-modules/dm-haiku/default.nix +++ b/pkgs/development/python-modules/dm-haiku/default.nix @@ -3,8 +3,10 @@ buildPythonPackage, fetchFromGitHub, fetchpatch, + setuptools, absl-py, flax, + jax, jaxlib, jmp, numpy, @@ -25,14 +27,14 @@ let dm-haiku = buildPythonPackage rec { pname = "dm-haiku"; - version = "0.0.12"; - format = "setuptools"; + version = "0.0.13"; + pyproject = true; src = fetchFromGitHub { owner = "deepmind"; repo = "dm-haiku"; rev = "refs/tags/v${version}"; - hash = "sha256-aJRXlMq4CNMH3ZSTDP8MgnVltdSc8l5raw4//KccL48="; + hash = "sha256-RJpQ9BzlbQ4X31XoJFnsZASiaC9fP2AdyuTAGINhMxs="; }; patches = [ @@ -44,15 +46,24 @@ let }) ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ absl-py - flax - jaxlib + jaxlib # implicit runtime dependency jmp numpy tabulate ]; + optional-dependencies = { + jax = [ + jax + jaxlib + ]; + flax = [ flax ]; + }; + pythonImportsCheck = [ "haiku" ]; nativeCheckInputs = [ From 6d2395e8c6dbc9a9e4c586d774836af5505cd6f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Nov 2024 15:32:57 +0000 Subject: [PATCH 58/66] python312Packages.itemadapter: 0.9.0 -> 0.10.0 --- .../python-modules/itemadapter/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/itemadapter/default.nix b/pkgs/development/python-modules/itemadapter/default.nix index b501fa5927c4..94191dd86a07 100644 --- a/pkgs/development/python-modules/itemadapter/default.nix +++ b/pkgs/development/python-modules/itemadapter/default.nix @@ -3,20 +3,23 @@ buildPythonPackage, fetchPypi, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "itemadapter"; - version = "0.9.0"; - format = "setuptools"; + version = "0.10.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-5PlYpra29YMfogc3MBADGgvX7QQp3dCbUZecARR1yv0="; + hash = "sha256-JlXIxQ8ahAXJ+nS4zcTaf+xUHKIXvIIbkKzIRRyYqdI="; }; + build-system = [ setuptools ]; + # Infinite recursion with Scrapy doCheck = false; From 5a4f44dd31e7fbab2184839df1560a33fe5e5b79 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Nov 2024 18:08:12 +0000 Subject: [PATCH 59/66] python312Packages.scikit-posthocs: 0.9.1 -> 0.11.0 --- .../python-modules/scikit-posthocs/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/scikit-posthocs/default.nix b/pkgs/development/python-modules/scikit-posthocs/default.nix index 2a25488c1557..4ed82e24de1c 100644 --- a/pkgs/development/python-modules/scikit-posthocs/default.nix +++ b/pkgs/development/python-modules/scikit-posthocs/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, setuptools, - wheel, matplotlib, numpy, pandas, @@ -16,22 +15,19 @@ buildPythonPackage rec { pname = "scikit-posthocs"; - version = "0.9.1"; + version = "0.11.0"; pyproject = true; src = fetchFromGitHub { owner = "maximtrp"; repo = "scikit-posthocs"; rev = "refs/tags/v${version}"; - hash = "sha256-ssaTd+A7lzd4tlKHGkgKixi3XjZLQBcPs6UOEzX/hrk="; + hash = "sha256-KrQqd3zChw9sxjbrTrxXInXAJLyXwPkhbPa9One6I+g="; }; - nativeBuildInputs = [ - setuptools - wheel - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ matplotlib numpy pandas From 841a952de1397fb15901ab0e1b4bda4d53672d47 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Nov 2024 23:24:36 +0000 Subject: [PATCH 60/66] python312Packages.tensorflow-metadata: 1.15.0 -> 1.16.1 --- .../tensorflow-metadata/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow-metadata/default.nix b/pkgs/development/python-modules/tensorflow-metadata/default.nix index 88f1bbe52a89..c2fb4e44e34a 100644 --- a/pkgs/development/python-modules/tensorflow-metadata/default.nix +++ b/pkgs/development/python-modules/tensorflow-metadata/default.nix @@ -4,28 +4,24 @@ fetchFromGitHub, googleapis-common-protos, protobuf, + setuptools, lib, }: buildPythonPackage rec { pname = "tensorflow-metadata"; - version = "1.15.0"; - format = "setuptools"; + version = "1.16.1"; + pyproject = true; src = fetchFromGitHub { owner = "tensorflow"; repo = "metadata"; rev = "refs/tags/v${version}"; - hash = "sha256-f3bkDTy45uwqVJaXFb0Dmaj9U1lJTP5R5Ej1yzobEV4="; + hash = "sha256-MP5P4kFACT1guZVU3f9YrnKeQaUK0Tnu7edKRy4yvlM="; }; patches = [ ./build.patch ]; - postPatch = '' - substituteInPlace setup.py \ - --replace 'protobuf>=3.13,<4' 'protobuf>=3.13' - ''; - # Default build pulls in Bazel + extra deps, given the actual build # is literally three lines (see below) - replace it with custom build. preBuild = '' @@ -34,7 +30,9 @@ buildPythonPackage rec { done ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ absl-py googleapis-common-protos protobuf From e1eb67dc93120577a80d2bab0fbebe885cb9b140 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Nov 2024 12:33:42 +0100 Subject: [PATCH 61/66] python312Packages.cement: 3.0.10 -> 3.0.12 Diff: datafolklabs/cement@refs/tags/3.0.10...3.0.12 Changelog: https://github.com/datafolklabs/cement/blob/3.0.12/CHANGELOG.md --- .../python-modules/cement/default.nix | 71 ++++++++++++++++--- 1 file changed, 60 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/cement/default.nix b/pkgs/development/python-modules/cement/default.nix index a3a131c8b8af..c16e9490b42e 100644 --- a/pkgs/development/python-modules/cement/default.nix +++ b/pkgs/development/python-modules/cement/default.nix @@ -1,33 +1,82 @@ { lib, buildPythonPackage, - fetchPypi, + colorlog, + fetchFromGitHub, + jinja2, + mock, + pdm-backend, + pylibmc, + pystache, + pytest-cov-stub, + pytestCheckHook, pythonOlder, + pyyaml, + redis, + requests, + tabulate, + watchdog, }: buildPythonPackage rec { pname = "cement"; - version = "3.0.10"; - format = "setuptools"; + version = "3.0.12"; + pyproject = true; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-c9EBXr+bjfE+a8mH7fDUvj8ci0Q4kh7qjWbLtVBK7hU="; + src = fetchFromGitHub { + owner = "datafolklabs"; + repo = "cement"; + rev = "refs/tags/${version}"; + hash = "sha256-weBqmNEjeSh5YQfHK48VVFW3UbZQmV4MiIQ3UPQKTTI="; }; - # Disable test tests since they depend on a memcached server running on - # 127.0.0.1:11211. - doCheck = false; + build-system = [ pdm-backend ]; + + optional-dependencies = { + colorlog = [ colorlog ]; + jinja2 = [ jinja2 ]; + mustache = [ pystache ]; + generate = [ pyyaml ]; + redis = [ redis ]; + memcached = [ pylibmc ]; + tabulate = [ tabulate ]; + watchdog = [ watchdog ]; + yaml = [ pyyaml ]; + cli = [ + jinja2 + pyyaml + ]; + }; + + nativeCheckInputs = [ + mock + pytest-cov-stub + pytestCheckHook + requests + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "cement" ]; + disabledTests = [ + # Test only works with the source from PyPI + "test_get_version" + ]; + + disabledTestPaths = [ + # Tests require network access + "tests/ext/test_ext_memcached.py" + "tests/ext/test_ext_redis.py" + "tests/ext/test_ext_smtp.py" + ]; + meta = with lib; { description = "CLI Application Framework for Python"; - mainProgram = "cement"; homepage = "https://builtoncement.com/"; + changelog = "https://github.com/datafolklabs/cement/blob/${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ eqyiel ]; + mainProgram = "cement"; }; } From 508a791f9ef7583531ad8145e448047b9f2c52d5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Nov 2024 14:55:39 +0100 Subject: [PATCH 62/66] awsebcli: update override for cement --- pkgs/by-name/aw/awsebcli/package.nix | 67 ++++++++++++++-------------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/pkgs/by-name/aw/awsebcli/package.nix b/pkgs/by-name/aw/awsebcli/package.nix index 21a20ad7dd16..c03f97d07d00 100644 --- a/pkgs/by-name/aw/awsebcli/package.nix +++ b/pkgs/by-name/aw/awsebcli/package.nix @@ -2,34 +2,31 @@ lib, python3, fetchFromGitHub, + fetchPypi, git, }: let - changeVersion = - overrideFunc: version: hash: - overrideFunc (oldAttrs: rec { - inherit version; - src = oldAttrs.src.override { - inherit version hash; - }; - }); - - localPython = python3.override { - self = localPython; + python = python3.override { packageOverrides = self: super: { - cement = - changeVersion super.cement.overridePythonAttrs "2.10.14" - "sha256-NC4n21SmYW3RiS7QuzWXoifO4z3C2FVgQm3xf8qQcFg="; + cement = super.cement.overridePythonAttrs (old: rec { + pname = "cement"; + version = "2.10.14"; + src = fetchPypi { + inherit pname version; + hash = "sha256-NC4n21SmYW3RiS7QuzWXoifO4z3C2FVgQm3xf8qQcFg="; + }; + build-system = old.build-system or [ ] ++ (with python.pkgs; [ setuptools ]); + doCheck = false; + }); }; }; - in -localPython.pkgs.buildPythonApplication rec { +python.pkgs.buildPythonApplication rec { pname = "awsebcli"; version = "3.21"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "aws"; @@ -38,12 +35,23 @@ localPython.pkgs.buildPythonApplication rec { hash = "sha256-VU8bXvS4m4eIamjlgGmHE2qwDXWAXvWTa0QHomXR5ZE="; }; + pythonRelaxDeps = [ + "botocore" + "colorama" + "pathspec" + "PyYAML" + "six" + "termcolor" + "urllib3" + ]; + postPatch = '' # https://github.com/aws/aws-elastic-beanstalk-cli/pull/469 - substituteInPlace setup.py --replace-fail "scripts=['bin/eb']," "" + substituteInPlace setup.py \ + --replace-fail "scripts=['bin/eb']," "" ''; - propagatedBuildInputs = with localPython.pkgs; [ + dependencies = with python.pkgs; [ blessed botocore cement @@ -59,20 +67,11 @@ localPython.pkgs.buildPythonApplication rec { websocket-client ]; - pythonRelaxDeps = [ - "botocore" - "colorama" - "pathspec" - "PyYAML" - "six" - "termcolor" - ]; - - nativeCheckInputs = with localPython.pkgs; [ - pytestCheckHook - pytest-socket - mock + nativeCheckInputs = with python.pkgs; [ git + mock + pytest-socket + pytestCheckHook ]; pytestFlagsArray = [ @@ -92,11 +91,11 @@ localPython.pkgs.buildPythonApplication rec { ]; meta = with lib; { - homepage = "https://aws.amazon.com/elasticbeanstalk/"; description = "Command line interface for Elastic Beanstalk"; + homepage = "https://aws.amazon.com/elasticbeanstalk/"; changelog = "https://github.com/aws/aws-elastic-beanstalk-cli/blob/${version}/CHANGES.rst"; - maintainers = with maintainers; [ kirillrdy ]; license = licenses.asl20; + maintainers = with maintainers; [ kirillrdy ]; mainProgram = "eb"; }; } From bbd314463df3253326e0e8dc902eb76cb29b362d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Dec 2024 09:15:07 +0100 Subject: [PATCH 63/66] python312Packages.cement: disable tests on Darwin --- pkgs/development/python-modules/cement/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/cement/default.nix b/pkgs/development/python-modules/cement/default.nix index c16e9490b42e..dc8e0d851efa 100644 --- a/pkgs/development/python-modules/cement/default.nix +++ b/pkgs/development/python-modules/cement/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, colorlog, fetchFromGitHub, @@ -59,6 +60,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "cement" ]; + # Tests are failing on Darwin + doCheck = !stdenv.hostPlatform.isDarwin; + disabledTests = [ # Test only works with the source from PyPI "test_get_version" From 7aad7090b7bd3b5f18e1c5788f1aa35a7b2e57bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 8 Oct 2024 21:10:15 +0200 Subject: [PATCH 64/66] nixos/zfs: order pool sync services before final.target If we don't do this, I think systemd can kill the service(s) before they finish. --- nixos/modules/tasks/filesystems/zfs.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 87876867c572..c07a09d701f6 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -761,6 +761,7 @@ in lib.nameValuePair "zfs-sync-${pool}" { description = "Sync ZFS pool \"${pool}\""; wantedBy = [ "shutdown.target" ]; + before = [ "final.target" ]; unitConfig = { DefaultDependencies = false; }; From 8c2f571052c58e33e945a2696d3673434e8a7e57 Mon Sep 17 00:00:00 2001 From: Anund Date: Sat, 7 Dec 2024 21:51:39 +1100 Subject: [PATCH 65/66] nerd-fonts: improve alias throw to give example migration --- .../doc/manual/release-notes/rl-2505.section.md | 2 +- pkgs/top-level/aliases.nix | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index e09e80792fb9..89e43abc584c 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -70,7 +70,7 @@ files have changed from `$out/share/fonts/{opentype,truetype}/NerdFonts` to `$out/share/fonts/{opentype,truetype}/NerdFonts/`, where `` can be found in the [official website](https://www.nerdfonts.com/font-downloads) as the titles in preview images, with the "Nerd Font" - suffix and any whitespaces trimmed. + suffix and any whitespaces trimmed. Configuration changes are required, see build output. - `retroarch` has been refactored and the older `retroarch.override { cores = [ ... ]; }` to create a RetroArch derivation with custom cores doesn't work anymore, use `retroarch.withCores (cores: [ ... ])` instead. If you need more customization (e.g.: custom settings), use `wrapRetroArch` instead. diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c54bc8a6d161..a3e0509514e2 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -862,7 +862,21 @@ mapAliases { nextcloud27Packages = throw "Nextcloud27 is EOL!"; # Added 2024-06-25 nagiosPluginsOfficial = monitoring-plugins; neochat = libsForQt5.kdeGear.neochat; # added 2022-05-10 - nerdfonts = throw "nerdfonts has been separated into individual font packages under the namespace nerd-fonts. To list all fonts use `builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts)`."; # Added 2024-11-09 + nerdfonts = throw ''nerdfonts has been separated into individual font packages under the namespace nerd-fonts. + For example change: + fonts.packages = [ + ... + (pkgs.nerdfonts.override { fonts = [ "0xproto" "DroidSansMono" ]; }) + ] + to + fonts.packages = [ + ... + pkgs.nerd-fonts._0xproto + pkgs.nerd-fonts.droid_sans_mono + ] + or for all fonts + font.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts) + ''; # Added 2024-11-09 newlibCross = newlib; # Added 2024-09-06 newlib-nanoCross = newlib-nano; # Added 2024-09-06 nix-direnv-flakes = nix-direnv; From f4fdea6accc918e928903c1d56e66061c4ed0374 Mon Sep 17 00:00:00 2001 From: nbCloud91 <73609114+nbCloud91@users.noreply.github.com> Date: Sat, 7 Dec 2024 17:11:21 +0530 Subject: [PATCH 66/66] morewaita-icon-theme: 47.1-> 47.2 (#361807) Diff: https://github.com/somepaulo/MoreWaita/compare/47.1...v47.2 Changelog: https://github.com/somepaulo/MoreWaita/releases/tag/v47.2 --- pkgs/by-name/mo/morewaita-icon-theme/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/morewaita-icon-theme/package.nix b/pkgs/by-name/mo/morewaita-icon-theme/package.nix index 77ca0a63f023..10f2cda2ece6 100644 --- a/pkgs/by-name/mo/morewaita-icon-theme/package.nix +++ b/pkgs/by-name/mo/morewaita-icon-theme/package.nix @@ -7,13 +7,13 @@ }: stdenvNoCC.mkDerivation rec { pname = "morewaita-icon-theme"; - version = "47.1"; + version = "47.2"; src = fetchFromGitHub { owner = "somepaulo"; repo = "MoreWaita"; - rev = "${version}"; - hash = "sha256-/ANzNQi+H2UzRlLrMBBMxEA/TGNpCwf8lNn6sHEKfQE="; + rev = "refs/tags/v${version}"; + hash = "sha256-LvkYLY8PYajCb1x1p0HfpKoMq+t4XwH/w9Hvy9YXzk0="; }; nativeBuildInputs = [