PRs already reviewed

shamrocklee · October 27, 2024, 4:33am

python3Packages: Fix and document the removal of the local `.overrideAttrs` attribute

NixOS:master ← ShamrockLee:build-python-local-override-overrideDerivation

opened 02:46AM - 21 Oct 24 UTC

This PR cleans up the leftover of #333670. After #333670, `buildPythonPackage…` and `buildPythonApplication` no longer apply `lib.makeOverridable` themselves and no longer provide `.override` and `.overrideDerivation` of the returning package. For Python packages provided by Nixpkgs, the local `.override` attribute is almost always shadowed by the one provided by `callPackage`, and so does the `.overrideDerivation` attribute. I didn't find any use of the local `override` in Nixpkgs, but @trofi reported the evaluation failure of `python3Packages.pythonCatchConflictsHook.tests.catches-conflict-multiple-chains` due to the loss of the local `overrideDerivation`. This PR uses `lib.overrideDerivation` instead of the `overrideDerivation` attribute to fix the evaluation of `python3Packages.pythonCatchConflictsHook.tests.catches-conflict-multiple-chains` and document the removal of the `buildPython*`-generated local `overrideDerivation` attribute in the release note. ## Things done - Built on platform(s) - [X] x86_64-linux - [ ] aarch64-linux - [ ] x86_64-darwin - [ ] aarch64-darwin - For non-Linux: Is sandboxing enabled in `nix.conf`? (See [Nix manual](https://nixos.org/manual/nix/stable/command-ref/conf-file.html)) - [ ] `sandbox = relaxed` - [ ] `sandbox = true` - [X] Tested, as applicable: - [NixOS test(s)](https://nixos.org/manual/nixos/unstable/index.html#sec-nixos-tests) (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests)) - and/or [package tests](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md#package-tests) - or, for functions and "core" functionality, tests in [lib/tests](https://github.com/NixOS/nixpkgs/blob/master/lib/tests) or [pkgs/test](https://github.com/NixOS/nixpkgs/blob/master/pkgs/test) - made sure NixOS tests are [linked](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md#linking-nixos-module-tests-to-a-package) to the relevant packages - [x] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"`. Note: all changes have to be committed, also see [nixpkgs-review usage](https://github.com/Mic92/nixpkgs-review#usage) - [ ] Tested basic functionality of all binary files (usually in `./result/bin/`) - [24.11 Release Notes](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2411.section.md) (or backporting [23.11](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2311.section.md) and [24.05](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2405.section.md) Release notes) - [ ] (Package updates) Added a release notes entry if the change is major or breaking - [ ] (Module updates) Added a release notes entry if the change is significant - [ ] (Module addition) Added a release notes entry if adding a new NixOS module - [x] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).  --- Add a :+1: [reaction] to [pull requests you find important]. [reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/ [pull requests you find important]: https://github.com/NixOS/nixpkgs/pulls?q=is%3Aopen+sort%3Areactions-%2B1-desc

jfly · October 27, 2024, 11:59pm

github.com/NixOS/nixpkgs

inkscape-extensions.silhouette: 1.28 -> 1.29

NixOS:master ← r-ryantm:auto-update/inkscape-extensions.silhouette

opened 04:28PM - 16 Sep 24 UTC

r-ryantm

+3 -3

Automatic update generated by [nixpkgs-update](https://github.com/ryantm/nixpkgs…-update) tools. This update was made based on information from passthru.updateScript. meta.description for inkscape-extensions.silhouette is: Extension to drive Silhouette vinyl cutters (e.g. Cameo, Portrait, Curio series) from within Inkscape meta.homepage for inkscape-extensions.silhouette is: https://github.com/fablabnbg/inkscape-silhouette ###### Updates performed - Ran passthru.UpdateScript ###### To inspect upstream changes ###### Impact Checks done --- - built on NixOS - The tests defined in `passthru.tests`, if any, passed - found 1.29 with grep in /nix/store/hpfqfs0qs4ysz7i47jf6mkl2bjm3j4nl-inkscape-silhouette-1.29 - found 1.29 in filename of file in /nix/store/hpfqfs0qs4ysz7i47jf6mkl2bjm3j4nl-inkscape-silhouette-1.29 --- <details> <summary> Rebuild report (if merged into master) (click to expand) </summary> ``` 2 total rebuild path(s) 2 package rebuild(s) First fifty rebuilds by attrpath inkscape-extensions.silhouette ``` </details> <details> <summary> Instructions to test this update (click to expand) </summary> --- Either **download from Cachix**: ``` nix-store -r /nix/store/hpfqfs0qs4ysz7i47jf6mkl2bjm3j4nl-inkscape-silhouette-1.29 \ --option binary-caches 'https://cache.nixos.org/ https://nix-community.cachix.org/' \ --option trusted-public-keys ' nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= ' ``` (The Cachix cache is only trusted for this store-path realization.) For the Cachix download to work, your user must be in the `trusted-users` list or you can use `sudo` since root is effectively trusted. Or, **build yourself**: ``` nix-build -A inkscape-extensions.silhouette https://github.com/r-ryantm/nixpkgs/archive/85367ef231744a6fdcd948492a086fcfa8028801.tar.gz ``` Or: ``` nix build github:r-ryantm/nixpkgs/85367ef231744a6fdcd948492a086fcfa8028801#inkscape-extensions.silhouette ``` After you've downloaded or built it, look at the files and if there are any, run the binaries: ``` ls -la /nix/store/hpfqfs0qs4ysz7i47jf6mkl2bjm3j4nl-inkscape-silhouette-1.29 ls -la /nix/store/hpfqfs0qs4ysz7i47jf6mkl2bjm3j4nl-inkscape-silhouette-1.29/bin ``` --- </details> ### Pre-merge build results We have automatically built all packages that will get rebuilt due to this change. This gives evidence on whether the upgrade will break dependent packages. Note sometimes packages show up as _failed to build_ independent of the change, simply because they are already broken on the target branch. Result of `nixpkgs-review` run on x86_64-linux [1](https://github.com/Mic92/nixpkgs-review) <details> <summary>2 packages built:</summary> <ul> <li>inkscape-extensions.silhouette</li> <li>inkscape-extensions.silhouette.dist</li> </ul> </details> --- ###### Maintainer pings cc @jfly for [testing](https://github.com/ryantm/nixpkgs-update/blob/main/doc/nixpkgs-maintainer-faq.md#r-ryantm-opened-a-pr-for-my-package-what-do-i-do). > [!TIP] > As a maintainer, if your package is located under `pkgs/by-name/*`, you can comment **`@NixOS/nixpkgs-merge-bot merge`** to automatically merge this update using the [`nixpkgs-merge-bot`](https://github.com/NixOS/nixpkgs-merge-bot). --- Add a :+1: [reaction] to [pull requests you find important]. [reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/ [pull requests you find important]: https://github.com/NixOS/nixpkgs/pulls?q=is%3Aopen+sort%3Areactions-%2B1-desc