Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4e73b76ede45
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d916a0f9ce9b
Choose a head ref
  • 8 commits
  • 14 files changed
  • 3 contributors

Commits on Oct 5, 2018

  1. system-activation: support script fragments to run in a user context 

    (cherry picked from commit 1353ba2)
    @peterhoeg
    peterhoeg committed Oct 5, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    eadwu Edmund Wu
    GPG key ID: 76AA3F9F2BD3E3A0
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c5b97d4 View commit details

  2. switch-to-configuration.pl: activate the nixos-activation.service use… 

    …r service

(cherry picked from commit 8118d6e)
    @peterhoeg
    peterhoeg committed Oct 5, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    eadwu Edmund Wu
    GPG key ID: 76AA3F9F2BD3E3A0
    Verified
    Learn about vigilant mode
    Copy the full SHA
    092f82b View commit details

  3. plasma5: run kbuildsycoca5 in the user context 

    (cherry picked from commit 4dada63)
    @peterhoeg
    peterhoeg committed Oct 5, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    eadwu Edmund Wu
    GPG key ID: 76AA3F9F2BD3E3A0
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c8b3a26 View commit details

  4. nixpkgs: Start documenting library functions in XML 

    Covers assert functions and about half of the attrsets functions.

Some internal consistency around IDs could be improved.

(cherry picked from commit f835f77)
    @grahamc
    grahamc committed Oct 5, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    eadwu Edmund Wu
    GPG key ID: 76AA3F9F2BD3E3A0
    Verified
    Learn about vigilant mode
    Copy the full SHA
    131cb30 View commit details

  5. Merge pull request #47898 from peterhoeg/f/activation_1809 

    nixos system-activation: support activation scripts run in a user context
    @samueldr
    samueldr authored Oct 5, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    eadwu Edmund Wu
    GPG key ID: 76AA3F9F2BD3E3A0
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9d5f0ba View commit details

  6. version.nix: extract revision-fetching function 

    (cherry picked from commit 4312cfd)
    @grahamc
    grahamc committed Oct 5, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    eadwu Edmund Wu
    GPG key ID: 76AA3F9F2BD3E3A0
    Verified
    Learn about vigilant mode
    Copy the full SHA
    09b8ed0 View commit details

  7. Generate links to function definitions 

    Hydra passes the full revision in to the input, which we pass through.

If we don't get this ,we try to get it from other sources, or default to
master which should have the definition in a close-ish location.

All published docs should have theURL resolve properly, only local
hackers will have the link break.

(cherry picked from commit 5daee73)
    @grahamc
    grahamc committed Oct 5, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3bf2c2f View commit details

  8. docs: Delete assert functions since they don't exist in 18.09

    @grahamc
    grahamc committed Oct 5, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d916a0f View commit details
1 change: 1 addition & 0 deletions doc/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -4,3 +4,4 @@
out
manual-full.xml
highlightjs
functions/library/locations.xml
8 changes: 6 additions & 2 deletions doc/Makefile
View file
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ fix-misc-xml:

.PHONY: clean
clean:
rm -f ${MD_TARGETS} .version manual-full.xml
rm -f ${MD_TARGETS} .version manual-full.xml functions/library/locations.xml
rm -rf ./out/ ./highlightjs

.PHONY: validate
@@ -69,13 +69,17 @@ highlightjs:
cp -r "$$HIGHLIGHTJS/loader.js" highlightjs/


manual-full.xml: ${MD_TARGETS} .version *.xml **/*.xml
manual-full.xml: ${MD_TARGETS} .version functions/library/locations.xml *.xml **/*.xml **/**/*.xml
xmllint --nonet --xinclude --noxincludenode manual.xml --output manual-full.xml

.version:
nix-instantiate --eval \
-E '(import ../lib).version' > .version

functions/library/locations.xml:
nix-build ./lib-function-locations.nix \
--out-link ./functions/library/locations.xml

%.section.xml: %.section.md
pandoc $^ -w docbook+smart \
-f markdown+smart \
5 changes: 4 additions & 1 deletion doc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ pkgs ? (import ./.. { }), nixpkgs ? { }}:
let
pkgs = import ./.. { };
lib = pkgs.lib;
locationsXml = import ./lib-function-locations.nix { inherit pkgs nixpkgs; };
in
pkgs.stdenv.mkDerivation {
name = "nixpkgs-manual";
@@ -29,6 +30,8 @@ pkgs.stdenv.mkDerivation {
];

postPatch = ''
rm -rf ./functions/library/locations.xml
ln -s ${locationsXml} ./functions/library/locations.xml
echo ${lib.version} > .version
'';

2 changes: 2 additions & 0 deletions doc/functions.xml
View file
Original file line number Diff line number Diff line change
@@ -7,6 +7,8 @@
The nixpkgs repository has several utility functions to manipulate Nix
expressions.
</para>

<xi:include href="functions/library.xml" />
<xi:include href="functions/overrides.xml" />
<xi:include href="functions/generators.xml" />
<xi:include href="functions/debug.xml" />
13 changes: 13 additions & 0 deletions doc/functions/library.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
xml:id="sec-functions-library">
<title>Nixpkgs Library Functions</title>

<para>
Nixpkgs provides a standard library at <varname>pkgs.lib</varname>, or
through <code>import &lt;nixpkgs/lib&gt;</code>.
</para>

<xi:include href="./library/attrsets.xml" />
</section>
Loading