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/nixpkgs
base: 795f75f21def
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 1810623a7781
Choose a head ref
  • 5 commits
  • 3 files changed
  • 2 contributors

Commits on Dec 1, 2020

  1. doc/builders/packages/xorg: Convert to CommonMark. 

    I had to pick 7.4 or 7.5. I picked 7.4 for now.
    @MostAwesomeDude
    MostAwesomeDude committed Dec 1, 2020
    Copy the full SHA
    e0fbc4d View commit details
    Browse the repository at this point in the history

  2. doc/builders/packages/xorg: Acknowledge the retired katamari. 

    I tested the shell snippets shown here; they work. Note that, because
they're intended for copy-and-paste, I did *not* make them into
ShellSessions with prompts. But that's something I can do if desired.
    @MostAwesomeDude
    MostAwesomeDude committed Dec 1, 2020
    Copy the full SHA
    fc0f32e View commit details
    Browse the repository at this point in the history

  3. doc/builders/packages/xorg: Fix pasto. 

    I did double-check that the fixed version does what we would want. In
either case, the katamari script is mostly of historical value, and
there's nothing to change in pkgs.
    @MostAwesomeDude
    MostAwesomeDude committed Dec 1, 2020
    Copy the full SHA
    65fe254 View commit details
    Browse the repository at this point in the history

  4. doc/builders/packages/xorg: Use ShellSession for shell. 

    I was worried, but the HTML output can still be copy-and-pasted, so it's
not a problem.
    @MostAwesomeDude
    MostAwesomeDude committed Dec 1, 2020
    Copy the full SHA
    874e358 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #105481 from MostAwesomeDude/docs-commonmark-xorg 

    doc/builders/packages/xorg: Convert to CommonMark.
    @ryantm
    ryantm committed Dec 1, 2020
    Copy the full SHA
    1810623 View commit details
    Browse the repository at this point in the history