Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

terraform: withPlugins should inherit meta from wrapped derivation #103396

Merged
merged 1 commit into from
Nov 11, 2020
Merged

terraform: withPlugins should inherit meta from wrapped derivation #103396

merged 1 commit into from
Nov 11, 2020

Conversation

kalbasit
Copy link
Member

Motivation for this change

When using terraform.withPlugins (ps: []) the returned derivation does not expose the meta of the underlying package. This change inherits meta from the terraform derivation in the wrapper derivation to expose it.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@kalbasit
terraform: withPlugins should inherit meta from wrapped derivation
4551642 
When using `terraform.withPlugins (ps: [])` the returned derivation does
not expose the meta of the underlying package. This change inherits meta
from the terraform derivation in the wrapper derivation to expose it.
@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Nov 11, 2020
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Nov 11, 2020
@kalbasit kalbasit merged commit 380337d into NixOS:master Nov 11, 2020
@kalbasit kalbasit deleted the terraform-with-plugins-meta branch November 11, 2020 19:36
KyleOndy added a commit to KyleOndy/dotfiles that referenced this pull request Nov 13, 2020
@KyleOndy
niv nixpkgs: update b839d4a8 -> a371c107
a458631 
## Changelog for nixpkgs:
Commits: [NixOS/nixpkgs@b839d4a8...a371c107](NixOS/nixpkgs@b839d4a...a371c10)

* [`c857365a`](NixOS/nixpkgs@c857365) cpp-utilities: 5.7.0 -> 5.8.0
* [`23c932f8`](NixOS/nixpkgs@23c932f) ctop: 0.7.4 -> 0.7.5
* [`5b3f7b23`](NixOS/nixpkgs@5b3f7b2) dnsproxy: 0.32.6 -> 0.33.2
* [`79709873`](NixOS/nixpkgs@7970987) do-agent: 3.7.1 -> 3.8.0
* [`a4e0d2b1`](NixOS/nixpkgs@a4e0d2b) doctest: 2.4.0 -> 2.4.1
* [`2fe0a921`](NixOS/nixpkgs@2fe0a92) doctl: 1.49.0 -> 1.51.0
* [`50124398`](NixOS/nixpkgs@5012439) dolt: 0.21.1 -> 0.21.4
* [`14ed5891`](NixOS/nixpkgs@14ed589) doppler: 3.16.0 -> 3.16.1
* [`9a7d633b`](NixOS/nixpkgs@9a7d633) dstask: 0.23 -> 0.23.1
* [`faa1d785`](NixOS/nixpkgs@faa1d78) duckdb: 0.2.1 -> 0.2.2
* [`070cf26f`](NixOS/nixpkgs@070cf26) duf: 0.4.0 -> 0.5.0
* [`d3fc9d74`](NixOS/nixpkgs@d3fc9d7) duperemove: 0.11.1 -> 0.11.2
* [`ee702dac`](NixOS/nixpkgs@ee702da) ergo: 3.3.5 -> 3.3.6
* [`17c9e6f2`](NixOS/nixpkgs@17c9e6f) exoscale-cli: 1.19.0 -> 1.20.2
* [`49bd6654`](NixOS/nixpkgs@49bd665) gnome3.mutter334: Use full sysprof
* [`9b9cf946`](NixOS/nixpkgs@9b9cf94) python3Packages.tensorboardx: fix build after upgrade to PyTorch 1.6
* [`88894b56`](NixOS/nixpkgs@88894b5) fluent-bit: 1.6.2 -> 1.6.3
* [`9d408eb8`](NixOS/nixpkgs@9d408eb) flyctl: 0.0.145 -> 0.0.146
* [`a23aa390`](NixOS/nixpkgs@a23aa39) python37Packages.google_cloud_automl: 2.0.0 -> 2.1.0
* [`b331d9f9`](NixOS/nixpkgs@b331d9f) azure-storage-azcopy: 10.6.1 -> 10.7.0
* [`78889211`](NixOS/nixpkgs@7888921) tmuxp: 1.5.8 -> 1.6.2
* [`e787afe7`](NixOS/nixpkgs@e787afe) python27Packages.rope: 0.17.0 -> 0.18.0
* [`2e6b0235`](NixOS/nixpkgs@2e6b023) postfix: 3.5.6 -> 3.5.7
* [`8d4e04cb`](NixOS/nixpkgs@8d4e04c) qtractor: 0.9.15 -> 0.9.18
* [`df76f017`](NixOS/nixpkgs@df76f01) python37Packages.snowflake-connector-python: 2.3.4 -> 2.3.5
* [`af2f6c21`](NixOS/nixpkgs@af2f6c2) frp: 0.34.1 -> 0.34.2
* [`d2264a55`](NixOS/nixpkgs@d2264a5) ft2-clone: 1.37 -> 1.39
* [`b24bccf5`](NixOS/nixpkgs@b24bccf) qmmp: 1.4.1 -> 1.4.2
* [`195ed0d5`](NixOS/nixpkgs@195ed0d) gauge: 1.1.4 -> 1.1.5
* [`a9e2cea8`](NixOS/nixpkgs@a9e2cea) gifski: 1.2.2 -> 1.2.4
* [`c945b47a`](NixOS/nixpkgs@c945b47) linuxPackages.wireguard: fix the build on linux 5.4.76
* [`8e9b7713`](NixOS/nixpkgs@8e9b771) globalarrays: 5.7.2 -> 5.8
* [`d16b0de9`](NixOS/nixpkgs@d16b0de) goconst: 1.2.0 -> 1.3.2
* [`27a11e95`](NixOS/nixpkgs@27a11e9) golangci-lint: 1.32.0 -> 1.32.2
* [`0aefa1ed`](NixOS/nixpkgs@0aefa1e) gramps: 5.0.1 -> 5.1.3
* [`4c875b9c`](NixOS/nixpkgs@4c875b9) wrangler: fix Darwin build
* [`85d4895f`](NixOS/nixpkgs@85d4895) hcloud: 1.19.1 -> 1.20.0
* [`be92f5f0`](NixOS/nixpkgs@be92f5f) helmfile: 0.132.1 -> 0.134.0
* [`13c4f38c`](NixOS/nixpkgs@13c4f38) helmsman: 3.4.6 -> 3.5.1
* [`6fe3b7c9`](NixOS/nixpkgs@6fe3b7c) hugo: 0.78.0 -> 0.78.1
* [`ef13cb68`](NixOS/nixpkgs@ef13cb6) humioctl: 0.27.0 -> 0.28.1
* [`87d5e6fc`](NixOS/nixpkgs@87d5e6f) Change idiom for overriding Dhall package version
* [`9b5b1d2b`](NixOS/nixpkgs@9b5b1d2) jackett: 0.16.1964 -> 0.16.2131
* [`fe1568fa`](NixOS/nixpkgs@fe1568f) nextcloud-client: remove myself from the maintainer list
* [`fba4c99f`](NixOS/nixpkgs@fba4c99) davfs2: 1.5.6 -> 1.6.0
* [`3f41f8b2`](NixOS/nixpkgs@3f41f8b) unison: 2.51.2 -> 2.51.3
* [`292de46c`](NixOS/nixpkgs@292de46) Document conventions around adding new maintainers
* [`11114dac`](NixOS/nixpkgs@11114da) portfolio: 0.49.0 -> 0.49.2
* [`999e24d2`](NixOS/nixpkgs@999e24d) vista-fonts: new sha256
* [`aa96bd29`](NixOS/nixpkgs@aa96bd2) gimpPlugins: include GIMP into the scope
* [`e39bc29e`](NixOS/nixpkgs@e39bc29) asciigraph: init at 0.5.1 (NixOS/nixpkgs#103184)
* [`cfbe7995`](NixOS/nixpkgs@cfbe799) lightburn: 0.9.16 -> 0.9.18
* [`193e8bc7`](NixOS/nixpkgs@193e8bc) knot-dns: 3.0.1 -> 3.0.2
* [`ca9dcfb1`](NixOS/nixpkgs@ca9dcfb) lokalise2-cli: 2.6.0 -> 2.6.1
* [`ef990c19`](NixOS/nixpkgs@ef990c1) oh-my-zsh: 2020-11-09 → 2020-11-10
* [`3be8a448`](NixOS/nixpkgs@3be8a44) linux_latest-libre: 17744 -> 17762
* [`8e364d51`](NixOS/nixpkgs@8e364d5) linux/hardened/patches/4.14: 4.14.204.a -> 4.14.205.a
* [`362d24c7`](NixOS/nixpkgs@362d24c) linux/hardened/patches/4.19: 4.19.155.a -> 4.19.156.a
* [`7420461d`](NixOS/nixpkgs@7420461) linux/hardened/patches/5.4: 5.4.75.a -> 5.4.76.a
* [`e7fa508f`](NixOS/nixpkgs@e7fa508) linux/hardened/patches/5.9: 5.9.6.a -> 5.9.7.a
* [`e4d8eb1c`](NixOS/nixpkgs@e4d8eb1) sbt-extras: Add update script
* [`6134eafe`](NixOS/nixpkgs@6134eaf) sbt-extras: 2020-09-24 → 2020-11-08
* [`b9c505b7`](NixOS/nixpkgs@b9c505b) sbt-extras: Add test
* [`0251996c`](NixOS/nixpkgs@0251996) lsof: 4.93.2 -> 4.94.0
* [`280e2732`](NixOS/nixpkgs@280e273) knot-resolver: 5.1.3 -> 5.2.0
* [`7bbff896`](NixOS/nixpkgs@7bbff89) androidStudioPackages.stable: 4.1.0.19 -> 4.1.1.0
* [`e66ba6bd`](NixOS/nixpkgs@e66ba6b) gst_all_1.gst-plugins-bad: fix build on Darwin
* [`dd7b6a51`](NixOS/nixpkgs@dd7b6a5) pythonPackages.py-multihash: 0.2.3 -> 1.0.0
* [`0effabb3`](NixOS/nixpkgs@0effabb) musikcube: 0.93.1 -> 0.94.0
* [`60e9a17a`](NixOS/nixpkgs@60e9a17) intel-media-driver: 2.4.0 -> 2.4.1
* [`63fc8c77`](NixOS/nixpkgs@63fc8c7) openethereum: v3.0.1 -> v3.1.0
* [`d7e7fb7e`](NixOS/nixpkgs@d7e7fb7) geant4: 10.6.2 -> 10.6.3 (NixOS/nixpkgs#103095)
* [`e8226dbe`](NixOS/nixpkgs@e8226db) nfpm: 1.8.0 -> 1.10.0
* [`ffe4dbf3`](NixOS/nixpkgs@ffe4dbf) nixos/tests/zfs: Test boot.zfs.forceImportAll
* [`a4010e05`](NixOS/nixpkgs@a4010e0) nixos/zfs: Respect forceImportAll in import service
* [`e0d51db4`](NixOS/nixpkgs@e0d51db) nixos: boot.zfsImportAll = false; by default
* [`c360d971`](NixOS/nixpkgs@c360d97) nix-build-uncached: 1.0.2 -> 1.1.0
* [`14a6cf25`](NixOS/nixpkgs@14a6cf2) trash-cli: 0.17.1.14 -> 0.20.11.7
* [`d277dc65`](NixOS/nixpkgs@d277dc6) turbo-geth: init at 2020.11.01
* [`8446b342`](NixOS/nixpkgs@8446b34) grafana: 7.3.1 -> 7.3.2
* [`83992fd7`](NixOS/nixpkgs@83992fd) bisoncpp: init (NixOS/nixpkgs#103316)
* [`49b6ce8c`](NixOS/nixpkgs@49b6ce8) tempo: 0.2.0 -> 0.3.0
* [`a3aa03f3`](NixOS/nixpkgs@a3aa03f) oneDNN: 1.6.4 -> 1.7
* [`a3bf66f4`](NixOS/nixpkgs@a3bf66f) quisk: init at 4.1.72
* [`88b7340a`](NixOS/nixpkgs@88b7340) doc: Fix doc-building instructions
* [`380337da`](NixOS/nixpkgs@380337d) terraform: withPlugins should inherit meta from wrapped derivation (NixOS/nixpkgs#103396)
* [`5c8be438`](NixOS/nixpkgs@5c8be43) packet-cli: 0.0.8 -> 0.1.1
* [`7741f925`](NixOS/nixpkgs@7741f92) google-cloud-cpp: remove myself from maintainers
* [`f24b6959`](NixOS/nixpkgs@f24b695) pdfcpu: 0.3.6 -> 0.3.7
* [`5d3b3554`](NixOS/nixpkgs@5d3b355) pgmetrics: 1.10.0 -> 1.10.2
* [`d7688900`](NixOS/nixpkgs@d768890) oh-my-zsh: 2020-11-10 → 2020-11-11
* [`399acdc9`](NixOS/nixpkgs@399acdc) linux: 4.14.205 -> 4.14.206
* [`08a59efe`](NixOS/nixpkgs@08a59ef) linux: 4.19.156 -> 4.19.157
* [`f4ce75d9`](NixOS/nixpkgs@f4ce75d) linux: 4.4.242 -> 4.4.243
* [`3b27759e`](NixOS/nixpkgs@3b27759) linux: 4.9.242 -> 4.9.243
* [`193f7a49`](NixOS/nixpkgs@193f7a4) linux: 5.4.76 -> 5.4.77
* [`470f86b8`](NixOS/nixpkgs@470f86b) linux: 5.9.7 -> 5.9.8
* [`6322425d`](NixOS/nixpkgs@6322425) linux/hardened/patches/4.14: 4.14.205.a -> 4.14.206.a
* [`7bfbd07c`](NixOS/nixpkgs@7bfbd07) linux/hardened/patches/4.19: 4.19.156.a -> 4.19.157.a
* [`feab1992`](NixOS/nixpkgs@feab199) linux/hardened/patches/5.4: 5.4.76.a -> 5.4.77.a
* [`413237b4`](NixOS/nixpkgs@413237b) linux/hardened/patches/5.9: 5.9.7.a -> 5.9.8.a
* [`d6af8fd0`](NixOS/nixpkgs@d6af8fd) bluespec maintainer flokli -> jcumming (NixOS/nixpkgs#103487)
* [`ac35114c`](NixOS/nixpkgs@ac35114) qrencode: 4.0.2 -> 4.1.1
* [`a73467d0`](NixOS/nixpkgs@a73467d) procs: 0.10.5 -> 0.10.7
* [`11c8a6e4`](NixOS/nixpkgs@11c8a6e) vagrant: 2.2.11 -> 2.2.13
* [`b7df5235`](NixOS/nixpkgs@b7df523) python27Packages.colorlog: 4.2.1 -> 4.4.0
* [`7e0dc8e3`](NixOS/nixpkgs@7e0dc8e) pure-prompt: 1.13.0 -> 1.15.0
* [`d7f38d2f`](NixOS/nixpkgs@d7f38d2) dt-schema: 2020.8.1 -> 2020.11
* [`dcab9048`](NixOS/nixpkgs@dcab904) dasm: 2.20.14 -> 2.20.14.1
* [`855fc08b`](NixOS/nixpkgs@855fc08) gqrx: 2.13.2 -> 2.13.5
* [`473f39b6`](NixOS/nixpkgs@473f39b) k9s: 0.23.3 -> 0.23.10
* [`03b81ea8`](NixOS/nixpkgs@03b81ea) pipenv: 2020.8.13 -> 2020.11.4
* [`51a1f280`](NixOS/nixpkgs@51a1f28) qpdf: 10.0.1 -> 10.0.3
* [`145f20d1`](NixOS/nixpkgs@145f20d) catch2: 2.13.2 -> 2.13.3
* [`eb6a8495`](NixOS/nixpkgs@eb6a849) kubelogin: 0.0.6 -> 0.0.7
* [`019c3bb4`](NixOS/nixpkgs@019c3bb) pistol: 0.1.4 -> 0.1.7
* [`db0db5c0`](NixOS/nixpkgs@db0db5c) netatalk: remove glibc input
* [`b3c6aac6`](NixOS/nixpkgs@b3c6aac) polkadot: 0.8.26 -> 0.8.26-1
* [`aec6a806`](NixOS/nixpkgs@aec6a80) pcm: 202009 -> 202010
* [`19484b9f`](NixOS/nixpkgs@19484b9) pythonPackages.gtts-token: 1.1.3 -> 1.1.4
* [`4c4538cd`](NixOS/nixpkgs@4c4538c) homeassistant: 0.117.5 -> 0.117.6
* [`41f90a81`](NixOS/nixpkgs@41f90a8) faudio: 20.10 -> 20.11
* [`21bc6aaf`](NixOS/nixpkgs@21bc6aa) pgcenter: 0.6.5 -> 0.6.6
* [`a52b343b`](NixOS/nixpkgs@a52b343) oxipng: 3.0.1 -> 4.0.0
* [`79d04a7c`](NixOS/nixpkgs@79d04a7) onefetch: 2.7.0 -> 2.7.1
* [`6109d8bc`](NixOS/nixpkgs@6109d8b) mutagen: 0.11.7 -> 0.11.8
* [`1e53f7e1`](NixOS/nixpkgs@1e53f7e) gitAndTools.gh: 1.2.0 -> 1.2.1
* [`32584c45`](NixOS/nixpkgs@32584c4) livepeer: 0.5.11 -> 0.5.12
* [`97bba96b`](NixOS/nixpkgs@97bba96) rar2fs: 1.29.1 -> 1.29.2
* [`a2e71c49`](NixOS/nixpkgs@a2e71c4) vscode-extensions.scala-lang.scala: 0.3.8 -> 0.4.5
* [`8281820c`](NixOS/nixpkgs@8281820) vscode-extensions.scalameta.metals: 1.9.4 -> 1.9.6
* [`5420cb29`](NixOS/nixpkgs@5420cb2) metals: 0.9.4 -> 0.9.5
* [`fa1165d7`](NixOS/nixpkgs@fa1165d) nanoflann: 1.3.1 -> 1.3.2
* [`e84ac7ff`](NixOS/nixpkgs@e84ac7f) nanoflann: remove extra whitespace
* [`f7485d07`](NixOS/nixpkgs@f7485d0) lean: 3.21.0 -> 3.23.0
* [`7fad6685`](NixOS/nixpkgs@7fad668) bloop: 1.4.4 -> 1.4.5
* [`c112ab2f`](NixOS/nixpkgs@c112ab2) dotnetCorePackages.net_5_0: init at version 5.0.0
* [`a3604fc3`](NixOS/nixpkgs@a3604fc) dotnetCorePackages.aspnetcore_5_0: init at version 5.0.0
* [`e60fc2ca`](NixOS/nixpkgs@e60fc2c) dotnetCorePackages.sdk_5_0: 5.0.100-rc.1.20452.10 -> 5.0.100
* [`a94cc8dc`](NixOS/nixpkgs@a94cc8d) dotnet: document new net packages
* [`67a986a4`](NixOS/nixpkgs@67a986a) rr: 5.3.0 -> 5.4.0
* [`d3a30145`](NixOS/nixpkgs@d3a3014) Make maintainer documentation more direct (NixOS/nixpkgs#103455)
* [`a56626b6`](NixOS/nixpkgs@a56626b) rtsp-simple-server: 0.10.0 -> 0.12.0
* [`35d25643`](NixOS/nixpkgs@35d2564) saml2aws: 2.27.0 -> 2.27.1
* [`ec26da1f`](NixOS/nixpkgs@ec26da1) nixos/acpilight: add to packages
* [`3f20417b`](NixOS/nixpkgs@3f20417) doc/*: fix indentation
* [`31051812`](NixOS/nixpkgs@3105181) nixos/doc/*: fix indentation
* [`ccbcbe27`](NixOS/nixpkgs@ccbcbe2) jcumming -> add github and githubId
* [`abeb10d2`](NixOS/nixpkgs@abeb10d) syncthingtray: 1.0.0 -> 1.0.1
* [`28bc8ead`](NixOS/nixpkgs@28bc8ea) ocrmypdf: 11.0.1 -> 11.3.3, fix build
* [`5a512241`](NixOS/nixpkgs@5a51224) python310: 3.10.0a1 -> 3.10.0a2
* [`ee455912`](NixOS/nixpkgs@ee45591) compcert: remove annoying assertions
@KyleOndy KyleOndy mentioned this pull request Nov 13, 2020
Closed
anandsuresh pushed a commit to anandsuresh/nixpkgs that referenced this pull request Jan 27, 2021
@kalbasit @anandsuresh
terraform: withPlugins should inherit meta from wrapped derivation (N…
e0fedeb 
…ixOS#103396)

When using `terraform.withPlugins (ps: [])` the returned derivation does
not expose the meta of the underlying package. This change inherits meta
from the terraform derivation in the wrapper derivation to expose it.

(cherry picked from commit 380337d)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marsam marsam marsam approved these changes

@babariviere babariviere Awaiting requested review from babariviere

@peterhoeg peterhoeg Awaiting requested review from peterhoeg

@zimbatm zimbatm Awaiting requested review from zimbatm

Assignees
No one assigned
Labels
8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@kalbasit @marsam