Skip to content

Commit

Permalink
Revert "Revert "Convert maintainer file entries to attributes, add gi…
Browse files Browse the repository at this point in the history
…thub handles""
  • Loading branch information
grahamc authored and Profpatsch committed Mar 4, 2018
1 parent 2eed814 commit f7da7fa
Show file tree
Hide file tree
Showing 4 changed files with 4,022 additions and 808 deletions.
2 changes: 1 addition & 1 deletion lib/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ let

# packaging
customisation = callLibs ./customisation.nix;
maintainers = callLibs ./maintainers.nix;
maintainers = import ./maintainers-list.nix;
meta = callLibs ./meta.nix;
sources = callLibs ./sources.nix;

Expand Down

10 comments on commit f7da7fa

@peti
Copy link
Member

@peti peti commented on f7da7fa Mar 5, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit causes many evaluation errors:

$ nix-env -qaP --meta --xml >/dev/null
derivation 'docker-17.12.1-ce' has invalid meta attribute 'maintainers'
derivation 'docker-18.02.0-ce' has invalid meta attribute 'maintainers'
derivation 'i3status-rust-0.9.0.2018-01-15' has invalid meta attribute 'maintainers'
derivation 'jsduck-5.3.4' has invalid meta attribute 'maintainers'
derivation 'qcachegrind-17.12.2' has invalid meta attribute 'maintainers'
...

Ping: @grahamc, @Profpatsch

@Profpatsch
Copy link
Member

@Profpatsch Profpatsch commented on f7da7fa Mar 5, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nix-env has built-in parsing of maintainers. Nobody mentioned that, hm (I personally don’t use nix-env, so I didn’t notice).

@peti
Copy link
Member

@peti peti commented on f7da7fa Mar 5, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have plenty of scripting that is broken by these messages, because they assume that stderr output indicates some kind of error. It would be great if we could remedy that issue quickly so that I don't have to give up that (generally very useful) assumption.

@grahamc
Copy link
Member Author

@grahamc grahamc commented on f7da7fa Mar 5, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're looking in to this now, thanks @peti.

@grahamc
Copy link
Member Author

@grahamc grahamc commented on f7da7fa Mar 5, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full list indicates something may be wrong with individual packages:

[nix-shell:~/projects/nixpkgs]$ nix-env -f . -qaP --meta --xml >/dev/null
derivation 'docker-17.12.1-ce' has invalid meta attribute 'maintainers'
derivation 'docker-18.02.0-ce' has invalid meta attribute 'maintainers'
derivation 'i3status-rust-0.9.0.2018-01-15' has invalid meta attribute 'maintainers'
derivation 'jsduck-5.3.4' has invalid meta attribute 'maintainers'
derivation 'qcachegrind-17.12.2' has invalid meta attribute 'maintainers'
derivation 'qtbase-5.10.1' has invalid meta attribute 'maintainers'
derivation 'qtbase-5.6.3' has invalid meta attribute 'maintainers'
derivation 'qtbase-5.9.3' has invalid meta attribute 'maintainers'
derivation 'qtcharts-5.10.1' has invalid meta attribute 'maintainers'
derivation 'qtcharts-5.9.3' has invalid meta attribute 'maintainers'
derivation 'qtconnectivity-5.10.1' has invalid meta attribute 'maintainers'
derivation 'qtconnectivity-5.6.3' has invalid meta attribute 'maintainers'
derivation 'qtconnectivity-5.9.3' has invalid meta attribute 'maintainers'
derivation 'qtdeclarative-5.10.1' has invalid meta attribute 'maintainers'
derivation 'qtdeclarative-5.6.3' has invalid meta attribute 'maintainers'
derivation 'qtdeclarative-5.9.3' has invalid meta attribute 'maintainers'
derivation 'qtdoc-5.10.1' has invalid meta attribute 'maintainers'
derivation 'qtdoc-5.6.3' has invalid meta attribute 'maintainers'
derivation 'qtdoc-5.9.3' has invalid meta attribute 'maintainers'
derivation 'qtgraphicaleffects-5.10.1' has invalid meta attribute 'maintainers'
derivation 'qtgraphicaleffects-5.6.3' has invalid meta attribute 'maintainers'
derivation 'qtgraphicaleffects-5.9.3' has invalid meta attribute 'maintainers'
derivation 'qtimageformats-5.10.1' has invalid meta attribute 'maintainers'
derivation 'qtimageformats-5.6.3' has invalid meta attribute 'maintainers'
derivation 'qtimageformats-5.9.3' has invalid meta attribute 'maintainers'
derivation 'qtlocation-5.10.1' has invalid meta attribute 'maintainers'
derivation 'qtlocation-5.6.3' has invalid meta attribute 'maintainers'
derivation 'qtlocation-5.9.3' has invalid meta attribute 'maintainers'
derivation 'qtmultimedia-5.10.1' has invalid meta attribute 'maintainers'
derivation 'qtmultimedia-5.6.3' has invalid meta attribute 'maintainers'
derivation 'qtmultimedia-5.9.3' has invalid meta attribute 'maintainers'
derivation 'qtquickcontrols-5.10.1' has invalid meta attribute 'maintainers'
derivation 'qtquickcontrols-5.6.3' has invalid meta attribute 'maintainers'
derivation 'qtquickcontrols-5.9.3' has invalid meta attribute 'maintainers'
derivation 'qtquickcontrols2-5.10.1' has invalid meta attribute 'maintainers'
derivation 'qtquickcontrols2-5.6.3' has invalid meta attribute 'maintainers'
derivation 'qtquickcontrols2-5.9.3' has invalid meta attribute 'maintainers'
derivation 'qtscript-5.10.1' has invalid meta attribute 'maintainers'
derivation 'qtscript-5.6.3' has invalid meta attribute 'maintainers'
derivation 'qtscript-5.9.3' has invalid meta attribute 'maintainers'
derivation 'qtsensors-5.10.1' has invalid meta attribute 'maintainers'
derivation 'qtsensors-5.6.3' has invalid meta attribute 'maintainers'
derivation 'qtsensors-5.9.3' has invalid meta attribute 'maintainers'
derivation 'qtserialport-5.10.1' has invalid meta attribute 'maintainers'
derivation 'qtserialport-5.6.3' has invalid meta attribute 'maintainers'
derivation 'qtserialport-5.9.3' has invalid meta attribute 'maintainers'
derivation 'qtsvg-5.10.1' has invalid meta attribute 'maintainers'
derivation 'qtsvg-5.6.3' has invalid meta attribute 'maintainers'
derivation 'qtsvg-5.9.3' has invalid meta attribute 'maintainers'
derivation 'qttools-5.10.1' has invalid meta attribute 'maintainers'
derivation 'qttools-5.6.3' has invalid meta attribute 'maintainers'
derivation 'qttools-5.9.3' has invalid meta attribute 'maintainers'
derivation 'qttranslations-5.10.1' has invalid meta attribute 'maintainers'
derivation 'qttranslations-5.6.3' has invalid meta attribute 'maintainers'
derivation 'qttranslations-5.9.3' has invalid meta attribute 'maintainers'
derivation 'qtvirtualkeyboard-5.10.1' has invalid meta attribute 'maintainers'
derivation 'qtvirtualkeyboard-5.9.3' has invalid meta attribute 'maintainers'
derivation 'qtwayland-5.10.1' has invalid meta attribute 'maintainers'
derivation 'qtwayland-5.6.3' has invalid meta attribute 'maintainers'
derivation 'qtwayland-5.9.3' has invalid meta attribute 'maintainers'
derivation 'qtwebchannel-5.10.1' has invalid meta attribute 'maintainers'
derivation 'qtwebchannel-5.6.3' has invalid meta attribute 'maintainers'
derivation 'qtwebchannel-5.9.3' has invalid meta attribute 'maintainers'
derivation 'qtwebengine-5.10.1' has invalid meta attribute 'maintainers'
derivation 'qtwebengine-5.6.3' has invalid meta attribute 'maintainers'
derivation 'qtwebengine-5.9.3' has invalid meta attribute 'maintainers'
derivation 'qtwebkit-5.6.3' has invalid meta attribute 'maintainers'
derivation 'qtwebkit-5.9.1' has invalid meta attribute 'maintainers'
derivation 'qtwebkit-5.9.1' has invalid meta attribute 'maintainers'
derivation 'qtwebsockets-5.10.1' has invalid meta attribute 'maintainers'
derivation 'qtwebsockets-5.6.3' has invalid meta attribute 'maintainers'
derivation 'qtwebsockets-5.9.3' has invalid meta attribute 'maintainers'
derivation 'qtx11extras-5.10.1' has invalid meta attribute 'maintainers'
derivation 'qtx11extras-5.6.3' has invalid meta attribute 'maintainers'
derivation 'qtx11extras-5.9.3' has invalid meta attribute 'maintainers'
derivation 'qtxmlpatterns-5.10.1' has invalid meta attribute 'maintainers'
derivation 'qtxmlpatterns-5.6.3' has invalid meta attribute 'maintainers'
derivation 'qtxmlpatterns-5.9.3' has invalid meta attribute 'maintainers'

@grahamc
Copy link
Member Author

@grahamc grahamc commented on f7da7fa Mar 5, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

derivation 'i3status-rust-0.9.0.2018-01-15' has invalid meta attribute 'maintainers'

The maintainer for this one has a null email, checking if this fixes it.

@grahamc
Copy link
Member Author

@grahamc grahamc commented on f7da7fa Mar 5, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes: The null fields here cause the problems. I'm working on a PR to fix this.

@grahamc
Copy link
Member Author

@grahamc grahamc commented on f7da7fa Mar 5, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Waiting for ofborg: #36347

@grahamc
Copy link
Member Author

@grahamc grahamc commented on f7da7fa Mar 5, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merged. Thanks.

@nixos-discourse
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/removing-a-maintainer-from-package-metadata/9294/9

Please sign in to comment.