Commit Graph
744897 Commits
Author SHA1 Message Date
Vincent Laporte 866496759f ocamlPackages.async_ssl: fix for OCaml 5.3 2025-01-28 13:18:07 +01:00
Vincent Laporte 3d769188ec ocamlPackages.core_unix: fix for OCaml 5.3 2025-01-28 13:18:07 +01:00
Vincent Laporte 30b1f5652a ocamlPackages.gluon: fix build 2025-01-28 13:17:56 +01:00
Vincent LaporteandVincent Laporte 9e11985be4 ocamlPackages.ocsigen_server: fix for conduit 7.1.0 2025-01-28 09:01:16 +01:00
7c6f434candGitHub cc64e7b43f clisp: 2.50pre20230112 -> 2.49.95-unstable-2024-12-28 (#377410) 2025-01-28 07:19:04 +00:00
Gaétan LepageandGitHub 143c01aee8 vimPlugins: update on 2025-01-27 (#377390) 2025-01-28 08:07:36 +01:00
K900andGitHub 01663e3802 poetryPlugins.poetry-plugin-up: 0.8.0 -> 0.9.0 (#377436) 2025-01-28 09:54:56 +03:00
K900 8ea431d84d poetryPlugins.poetry-plugin-up: unflag broken 2025-01-28 09:52:23 +03:00
K900andGitHub 1f15294106 steam-unwrapped: 1.0.0.81 -> 1.0.0.82 (#377239) 2025-01-28 09:51:19 +03:00
K900 2984b9fc1a steam-unwrapped: force overwriting the bootstrap file 2025-01-28 09:48:50 +03:00
06d19368af frida-tools: 13.6.0 -> 13.6.1 (#377481)
Co-authored-by: s1341 <s1341@users.noreply.github.com>
2025-01-28 06:07:43 +00:00
28efd1d614 microsoft-edge: 131.0.2903.112 -> 132.0.2957.127 (#377024)
Co-authored-by: rhysmdnz <rhys@memes.nz>
2025-01-28 06:03:52 +00:00
R. RyanTMandGitHub 96e7518e52 httpx: 1.6.9 -> 1.6.10 (#377455) 2025-01-28 06:10:35 +01:00
12fbfbc565 tfswitch: 1.2.4 -> 1.3.0 (#377296)
Co-authored-by: psibi <psibi2000@gmail.com>
2025-01-28 04:41:06 +00:00
rewineandGitHub 77af3ac109 simdutf: 6.0.3 -> 6.1.1 (#377319) 2025-01-28 12:26:25 +08:00
R. Ryantm cd44beea8f frida-tools: 13.6.0 -> 13.6.1 2025-01-28 03:53:16 +00:00
Robert SchützandGitHub 9d2d3fd2b8 python313Packages.whey: follow contributing guidelines (#375956) 2025-01-27 19:22:33 -08:00
7ff6b28e89 azure-storage-azcopy: 10.27.1 -> 10.28.0 (#377459)
Co-authored-by: kashw2 <kashw2@users.noreply.github.com>
2025-01-28 02:03:17 +00:00
David McFarlandandGitHub b7614895ef dotnet: default to source-built sdk/runtimes (#363008) 2025-01-27 21:43:10 -04:00
Austin Horstman b95da65ade vimPlugins.nvim-treesitter: update grammars 2025-01-27 19:35:35 -06:00
Austin Horstman 69240c5b4c vimPlugins: update on 2025-01-27 2025-01-27 19:35:35 -06:00
sveithandGitHub 7072056be6 octoprint: use octoprint from final package set as plugin build input (#370953)
OctoPrint and its plugins are packaged in the form of multiple overlays,
each adding one or more packages built with `buildPythonPackage`. In
the NixOS module, the core `octoprint` package is then combined with
zero or more of the plugin packages into one `python.withPackages`
environment that is referenced by the systemd service unit.

Since plugins have to use the OctoPrint modules at runtime, they receive
the `octoprint` Python package as part of `propagatedBuildInputs`.
However, the current implementation of the plugins overlay takes this
dependency from the `super` package set, i.e., the stage preceding the
plugins overlay.

The use of `super` packages for dependencies is problematic here, as
there may be other subsequent overlays that modify the `octoprint`
package, and the `octoprint` that ends up in the final package set may
not be the same that the plugin was built against.

Things work out fine in the absence of any `octoprint` overrides, or if
no plugins are used. Combining the two in a NixOS configuration,
however, breaks the build with a collision of OctoPrint executables:

  error: builder for '/nix/store/7sjbm51s4j5p02s76ncrb6arzb5nwph7-python3-3.12.8-env.drv' failed with exit code 255;
         last 1 log lines:
         > error: collision between `/nix/store/rg9mixyc0qpdgn3ynrlwlp2qk9l5gh6a-python3.12-OctoPrint-1.10.3/bin/octoprint' and `/nix/store/ws68951jy8gx7q9n09xgpykkwhia82mb-Overridden-OctoPrint-1.10.2/bin/octoprint'
         For full logs, run 'nix-store -l /nix/store/7sjbm51s4j5p02s76ncrb6arzb5nwph7-python3-3.12.8-env.drv'.
  error: 1 dependencies of derivation '/nix/store/sgmn253inypq9hi722a9817w1ji8lkb8-unit-octoprint.service.drv' failed to build
  error: 1 dependencies of derivation '/nix/store/aydjfz8xf8s87hxc60vpnkzbclj5knj5-system-units.drv' failed to build
  error: 1 dependencies of derivation '/nix/store/97a3pr2v2b5yjw9g3za5rbc6blb2q808-etc.drv' failed to build

The collision is between the overridden `octoprint` from the final
package set and the non-overridden version that the plugins depend on
(and end up propagating to their consumers).

They all should be using one and the same `octoprint` package, which is
the one from `self`, the final package set after applying all overrides.
Modify the `buildPlugin` helper function accordingly.

Fixes: https://github.com/NixOS/nixpkgs/issues/370946
2025-01-28 02:28:41 +01:00
R. Ryantm e8ae415db8 azure-storage-azcopy: 10.27.1 -> 10.28.0 2025-01-28 01:08:29 +00:00
9c0340aea8 melonDS: 1.0rc-unstable-2024-12-26 -> 1.0rc-unstable-2025-01-17 (#377208)
Co-authored-by: AndersonTorres <torres.anderson.85@protonmail.com>
2025-01-28 00:34:30 +00:00
a262d99391 proxsuite-nlp: 0.10.0 -> 0.10.1 (#376399)
Co-authored-by: nim65s <guilhem.saurel@laas.fr>
2025-01-28 00:23:31 +00:00
Franz PletzandGitHub 6ddb0f7cdd virtualbox: 7.1.4 -> 7.1.6a (#376135) 2025-01-28 01:14:13 +01:00
jopejoe1andGitHub 9db269672d firefox-devedition-unwrapped: 135.0b4 -> 135.0b9 (#377438) 2025-01-27 23:45:09 +00:00
Gaétan LepageandGitHub cb18cf22ad lime3ds: fix build (#377310) 2025-01-28 00:44:40 +01:00
Nikolay KorotkiyandGitHub b4a5c2731e aerc: refactor and adopt (#376879) 2025-01-28 03:41:11 +04:00
R. Ryantm e7b90458b2 firefox-devedition-unwrapped: 135.0b4 -> 135.0b9 2025-01-27 23:18:13 +00:00
R. Ryantm 00e12b12b2 poetryPlugins.poetry-plugin-up: 0.8.0 -> 0.9.0 2025-01-27 23:10:35 +00:00
YtandGitHub e16e376ee3 python312Packages.blackjax: disable failing tests (#377350) 2025-01-27 17:39:55 -05:00
Arian van PuttenandGitHub 3bb31989b3 amazon-ssm-agent: 3.3.1345.0 -> 3.3.1611.0 (#377331) 2025-01-27 17:14:21 -05:00
Peder Bergebakken SundtandGitHub 15a24281fd harper: 0.16.0 -> 0.17.0 (#376238) 2025-01-27 22:55:43 +01:00
Nick CaoandGitHub e73135517f plasma5Packages.kdev-python: use current python3 (#376779) 2025-01-27 16:52:01 -05:00
Kira BruneauandGitHub ee8aa3f8d7 winePackages.{stable,unstable,staging,wayland}: * -> 10.0 (#376220) 2025-01-27 16:51:14 -05:00
ColinandGitHub 3d85c94910 tre: fix cross build (#376321) 2025-01-27 21:48:38 +00:00
Nick CaoandGitHub 04cc581260 lomiri.morph-browser: 1.1.1 -> 1.1.2 (#375912) 2025-01-27 16:41:52 -05:00
Nick CaoandGitHub c57b88d692 python312Packages.pycm: 4.0 -> 4.2 (#376798) 2025-01-27 16:41:24 -05:00
Marcus RambergandGitHub bfbc8e3e25 grafana-kiosk: 1.0.8 -> 1.0.9 (#376707) 2025-01-27 22:38:49 +01:00
Nick CaoandGitHub 794cca232d julia_110{,-bin}: 1.10.4 -> 1.10.8 (#361201) 2025-01-27 16:37:11 -05:00
Weijia WangandGitHub e6b1a3bd78 nixos/pixelfed: fix typo in nginx submodule description (#377396) 2025-01-27 22:26:27 +01:00
Weijia WangandGitHub 32932696de fwts: refactor, unpin gnumake42 (#376645) 2025-01-27 22:23:00 +01:00
Weijia Wang e7354817c7 clisp: 2.50pre20230112 -> 2.49.95-unstable-2024-12-28 2025-01-27 22:19:19 +01:00
Nick CaoandGitHub 0542e87760 python312Packages.aiohomeconnect: 0.11.2 -> 0.11.4 (#377378) 2025-01-27 16:10:40 -05:00
Nick CaoandGitHub d1016a5fdc python312Packages.ldfparser: 0.25.0 -> 0.26.0 (#377375) 2025-01-27 16:09:45 -05:00
Nick CaoandGitHub d1bb5864a8 signalbackup-tools: 20250122 -> 20250127-1 (#377385) 2025-01-27 16:08:37 -05:00
Paul MeyerandGitHub 2eb80a1a62 kubedb-cli: fix hash after tag was moved (#377277) 2025-01-27 22:07:41 +01:00
Nick CaoandGitHub a9fddc608a labwc-tweaks-gtk: 0-unstable-2025-01-11 -> 0-unstable-2025-01-26 (#377392) 2025-01-27 16:07:27 -05:00
Nick CaoandGitHub ef4ee7efe4 fswatch: 1.18.0 -> 1.18.2 (#377402) 2025-01-27 16:06:22 -05:00