Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixos-homepage
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f49e01d33667
Choose a base ref
...
head repository: NixOS/nixos-homepage
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a6d732a5b8cb
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 4, 2018

  1. nixos/packages: display license long name first 

    Long name is the most human-readable attribute
then comes SPDX id or short name
    @c0bw3b
    c0bw3b authored Nov 4, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    bcedfcf View commit details

Commits on Nov 5, 2018

  1. Merge pull request #249 from c0bw3b/licenses-presentation 

    nixos/packages: display license long name first
    @edolstra
    edolstra authored Nov 5, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a6d732a View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 nixos/packages.tt
8 changes: 4 additions & 4 deletions nixos/packages.tt
View file
Original file line number Diff line number Diff line change
@@ -167,11 +167,11 @@ function refilter() {
};

// Try to figure out a human-readable name for a license object.
// Use the SPDX ID if present; failing that try the long or short names. If all
// else fails fall back on URL.
// Use the long name first; failing that try the SPDX ID or short name.
// If all else fails fall back on URL.
function licenseName(license) {
return license.spdxId
|| license.fullName
return license.fullName
|| license.spdxId
|| license.shortName
|| license.url
|| "Licence name missing!";