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

Update the number of packages in index.tt and about.tt #235

Merged
merged 1 commit into from Aug 27, 2018
Merged

Update the number of packages in index.tt and about.tt #235

merged 1 commit into from Aug 27, 2018

Conversation

magnetophon
Copy link
Member

No description provided.

@magnetophon magnetophon mentioned this pull request Aug 24, 2018
Closed
@samueldr
Copy link
Member

samueldr commented Aug 24, 2018 •
edited

Thanks for the follow-up PR!

Aww, I'm sorry, and that's annoying; xmllint being used to lint the HTML source makes it so using   won't work; it's not valid XML, though it is valid HTML.

xmllint --nonet --noout nixpkgs/index.html.tmp
nixpkgs/index.html.tmp:74: parser error : Entity 'thinsp' not defined
40&thinsp;000  packages for the Nix package manager, released under a <a
          ^
make: *** [Makefile:132: nixpkgs/index.html] Error 1

The solution is simple; were I a member in this repository I could push over your branch and fix it myself. The fix is to use its decimal-representation as follows.

diff --git a/nixos/about.tt b/nixos/about.tt
index 656c9c0..f86b9fd 100644
--- a/nixos/about.tt
+++ b/nixos/about.tt
@@ -235,7 +235,7 @@ Here are some highlights of what NixOS currently provides:</p>
 
   <li>NixOS build on the <a href="[%root%]nixpkgs">Nix Packages
   collection</a> (Nixpkgs), which provides Nix expressions for over
-  40&thinsp;000 packages that you can install under NixOS.</li>
+  40&#8201;000 packages that you can install under NixOS.</li>
 
   <li>NixOS has automatic hardware detection: the boot process loads
   kernel modules for all known devices automatically.  It also has
diff --git a/nixpkgs/index.tt b/nixpkgs/index.tt
index 81ed35c..03f312c 100644
--- a/nixpkgs/index.tt
+++ b/nixpkgs/index.tt
@@ -1,7 +1,7 @@
 [% WRAPPER layout.tt title="The Nix Packages collection" menu='nixpkgs' %]
 
 <p>The <em>Nix Packages collection</em> (Nixpkgs) is a set of over
-40&thinsp;000  packages for the Nix package manager, released under a <a
+40&#8201;000  packages for the Nix package manager, released under a <a
 href="https://github.com/NixOS/nixpkgs/blob/master/COPYING">permissive
 MIT/X11 license</a>.  It supports the following platforms (though not
 all packages work on all platforms):</p>

When done, the pages will be able to be built, here's how the fragment looks like.

image

@magnetophon
Copy link
Member Author

Thanks for the steamcourse XML!

samueldr
samueldr approved these changes Aug 24, 2018
View reviewed changes
Copy link
Member

@samueldr samueldr left a comment •
edited

Choose a reason for hiding this comment

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

👍

~/.../nixos/nixos-homepage $ nix-shell --run make
tpage \
  --pre_chomp --post_chomp \
  --define modifiedAt="`git log -1 --pretty='%ai' nixpkgs/index.tt`" \
  --define modifiedBy="`git log -1 --pretty='%an' nixpkgs/index.tt`" \
  --define root=`echo nixpkgs/index.html | sed -e 's|[^/]||g' -e 's|/|../|g'` \
  --define fileName=nixpkgs/index.tt \
  --pre_process=nix-release.tt --pre_process=nixos-release.tt --pre_process=common.tt \
  nixpkgs/index.tt > nixpkgs/index.html.tmp
xmllint --nonet --noout nixpkgs/index.html.tmp
mv nixpkgs/index.html.tmp nixpkgs/index.html
tpage \
  --pre_chomp --post_chomp \
  --define modifiedAt="`git log -1 --pretty='%ai' nixos/about.tt`" \
  --define modifiedBy="`git log -1 --pretty='%an' nixos/about.tt`" \
  --define root=`echo nixos/about.html | sed -e 's|[^/]||g' -e 's|/|../|g'` \
  --define fileName=nixos/about.tt \
  --pre_process=nix-release.tt --pre_process=nixos-release.tt --pre_process=common.tt \
  nixos/about.tt > nixos/about.html.tmp
xmllint --nonet --noout nixos/about.html.tmp
mv nixos/about.html.tmp nixos/about.html

@magnetophon
Copy link
Member Author

Any news?

@samueldr
Copy link
Member

I don't have any rights over this repository, and its activity volume is pretty low, sometimes making things fly under the radar. AFAIK this repository generally gets activity with merging PRs on week days. In case no activity happens by Thursday, do ask back, I'll try to get hold of someone who can do something here.

@magnetophon
Copy link
Member Author

Thanks a lot!

@edolstra edolstra merged commit e35b6a6 into NixOS:master Aug 27, 2018
@edolstra
Copy link
Member

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@samueldr samueldr samueldr approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@magnetophon @samueldr @edolstra