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/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 293220bed5a7
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 788008385ef5
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on Apr 23, 2021

  1. doc: fix section in nix3 man page metadata 

    These man pages said they were in section 7, even though we were
installing them to section 1 (which is the right place for them).
    @alyssais
    alyssais committed Apr 23, 2021
    Copy the full SHA
    29132f9 View commit details

  2. Merge branch 'man1' of https://github.com/alyssais/nix

    @edolstra
    edolstra committed Apr 23, 2021
    Copy the full SHA
    5a1fedd View commit details

  3. Set more man sections

    @edolstra
    edolstra committed Apr 23, 2021
    Copy the full SHA
    e65f604 View commit details

  4. Use lowdown 0.8.4

    @edolstra
    edolstra committed Apr 23, 2021

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    7880083 View commit details
Showing with 28 additions and 8 deletions.
  1. +4 −4 doc/manual/local.mk
  2. +18 −0 flake.lock
  3. +6 −4 flake.nix
8 changes: 4 additions & 4 deletions doc/manual/local.mk
View file
Original file line number Diff line number Diff line change
@@ -25,19 +25,19 @@ nix-eval = $(dummy-env) $(bindir)/nix eval --experimental-features nix-command -
$(d)/%.1: $(d)/src/command-ref/%.md
@printf "Title: %s\n\n" "$$(basename $@ .1)" > $^.tmp
@cat $^ >> $^.tmp
$(trace-gen) lowdown -sT man $^.tmp -o $@
$(trace-gen) lowdown -sT man -M section=1 $^.tmp -o $@
@rm $^.tmp

$(d)/%.8: $(d)/src/command-ref/%.md
@printf "Title: %s\n\n" "$$(basename $@ .8)" > $^.tmp
@cat $^ >> $^.tmp
$(trace-gen) lowdown -sT man $^.tmp -o $@
$(trace-gen) lowdown -sT man -M section=8 $^.tmp -o $@
@rm $^.tmp

$(d)/nix.conf.5: $(d)/src/command-ref/conf-file.md
@printf "Title: %s\n\n" "$$(basename $@ .5)" > $^.tmp
@cat $^ >> $^.tmp
$(trace-gen) lowdown -sT man $^.tmp -o $@
$(trace-gen) lowdown -sT man -M section=5 $^.tmp -o $@
@rm $^.tmp

$(d)/src/SUMMARY.md: $(d)/src/SUMMARY.md.in $(d)/src/command-ref/new-cli
@@ -80,7 +80,7 @@ install: $(d)/src/command-ref/new-cli
if [[ $$name = SUMMARY ]]; then continue; fi; \
printf "Title: %s\n\n" "$$name" > $$i.tmp; \
cat $$i >> $$i.tmp; \
lowdown -sT man $$i.tmp -o $(mandir)/man1/$$name.1; \
lowdown -sT man -M section=1 $$i.tmp -o $(mandir)/man1/$$name.1; \
done

$(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/custom.css $(d)/src/SUMMARY.md $(d)/src/command-ref/new-cli $(d)/src/command-ref/conf-file.md $(d)/src/expressions/builtins.md
18 changes: 18 additions & 0 deletions flake.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 6 additions & 4 deletions flake.nix
View file
Original file line number Diff line number Diff line change
@@ -2,9 +2,9 @@
description = "The purely functional package manager";

inputs.nixpkgs.url = "nixpkgs/nixos-20.09-small";
#inputs.lowdown-src = { url = "github:kristapsdz/lowdown"; flake = false; };
inputs.lowdown-src = { url = "github:kristapsdz/lowdown/VERSION_0_8_4"; flake = false; };

outputs = { self, nixpkgs }:
outputs = { self, nixpkgs, lowdown-src }:

let

@@ -271,14 +271,16 @@
};

lowdown = with final; stdenv.mkDerivation rec {
name = "lowdown-0.8.0";
name = "lowdown-0.8.4";

/*
src = fetchurl {
url = "https://kristaps.bsd.lv/lowdown/snapshots/${name}.tar.gz";
hash = "sha512-U9WeGoInT9vrawwa57t6u9dEdRge4/P+0wLxmQyOL9nhzOEUU2FRz2Be9H0dCjYE7p2v3vCXIYk40M+jjULATw==";
};
*/

#src = lowdown-src;
src = lowdown-src;

outputs = [ "out" "bin" "dev" ];