···

       
26
       
26
       
 
       
# Match diffs, avoid to trim trailing whitespace

     

       
27
       
27
       
 
       
[*.{diff,patch}]

     

       
28
       
28
       
 
       
trim_trailing_whitespace = false

     

       
29
       
29
       
-
       


     

       
30
       
30
       
-
       
# https://github.com/NixOS/nixpkgs/pull/39336#discussion_r183387754

     

       
31
       
31
       
-
       
[.version]

     

       
32
       
32
       
-
       
insert_final_newline = false

     

···

       
1
       
1
       
-
       
18.09
     

       
1
       
1
       
+
       
18.09

     

···

       
64
       
64
       
 
       


     

       
65
       
65
       
 
       
.version:

     

       
66
       
66
       
 
       
	nix-instantiate --eval \

     

       
67
       
67
       
-
       
		-E '(import ../lib).nixpkgsVersion' > .version

     

       
67
       
67
       
+
       
		-E '(import ../lib).version' > .version

     

       
68
       
68
       
 
       


     

       
69
       
69
       
 
       
%.section.xml: %.section.md

     

       
70
       
70
       
 
       
	pandoc $^ -w docbook+smart \

     

···

       
30
       
30
       
 
       
  ];

     

       
31
       
31
       
 
       


     

       
32
       
32
       
 
       
  postPatch = ''

     

       
33
       
33
       
-
       
    echo ${lib.nixpkgsVersion} > .version

     

       
33
       
33
       
+
       
    echo ${lib.version} > .version

     

       
34
       
34
       
 
       
  '';

     

       
35
       
35
       
 
       


     

       
36
       
36
       
 
       
  installPhase = ''

     

···

       
58
       
58
       
 
       
      replaceStrings seq stringLength sub substring tail;

     

       
59
       
59
       
 
       
    inherit (trivial) id const concat or and boolToString mergeAttrs

     

       
60
       
60
       
 
       
      flip mapNullable inNixShell min max importJSON warn info

     

       
61
       
61
       
-
       
      nixpkgsVersion mod compare splitByAndCompare

     

       
61
       
61
       
+
       
      nixpkgsVersion version mod compare splitByAndCompare

     

       
62
       
62
       
 
       
      functionArgs setFunctionArgs isFunction;

     

       
63
       
63
       
 
       


     

       
64
       
64
       
 
       
    inherit (fixedPoints) fix fix' extends composeExtensions

     

···

       
58
       
58
       
 
       


     

       
59
       
59
       
 
       
  inherit (lib.strings) fileContents;

     

       
60
       
60
       
 
       


     

       
61
       
61
       
+
       
  release = fileContents ../.version;

     

       
62
       
62
       
+
       
  versionSuffix = let suffixFile = ../.version-suffix; in

     

       
63
       
63
       
+
       
    if pathExists suffixFile then fileContents suffixFile else "pre-git";

     

       
64
       
64
       
+
       


     

       
61
       
65
       
 
       
  # Return the Nixpkgs version number.

     

       
62
       
62
       
-
       
  nixpkgsVersion =

     

       
63
       
63
       
-
       
    let suffixFile = ../.version-suffix; in

     

       
64
       
64
       
-
       
    fileContents ../.version

     

       
65
       
65
       
-
       
    + (if pathExists suffixFile then fileContents suffixFile else "pre-git");

     

       
66
       
66
       
+
       
  version = release + versionSuffix;

     

       
67
       
67
       
+
       


     

       
68
       
68
       
+
       
  nixpkgsVersion = builtins.trace "`lib.nixpkgsVersion` is deprecated, use `lib.version` instead!" version;

     

       
66
       
69
       
 
       


     

       
67
       
70
       
 
       
  # Whether we're being called by nix-shell.

     

       
68
       
71
       
 
       
  inNixShell = builtins.getEnv "IN_NIX_SHELL" != "";

     

···

       
132
       
132
       
 
       
      <literal>lib.traceCallXml</literal> has been deprecated. Please complain

     

       
133
       
133
       
 
       
      if you use the function regularly.

     

       
134
       
134
       
 
       
    </para>

     

       
135
       
135
       
+
       
    <para>

     

       
136
       
136
       
+
       
      The attribute <literal>lib.nixpkgsVersion</literal> has been deprecated in favor of

     

       
137
       
137
       
+
       
      <literal>lib.version</literal>. Please refer to the discussion in

     

       
138
       
138
       
+
       
      <link xlink:href="https://github.com/NixOS/nixpkgs/pull/39416#discussion_r183845745">NixOS/nixpkgs#39416</link> for further reference.

     

       
139
       
139
       
+
       
    </para>

     

       
135
       
140
       
 
       
  </listitem>

     

       
136
       
141
       
 
       
</itemizedlist>

     

       
137
       
142
       
 
       


     

···

       
6
       
6
       
 
       
set -e

     

       
7
       
7
       
 
       
set -o pipefail

     

       
8
       
8
       
 
       


     

       
9
       
9
       
-
       
version=$(nix-instantiate --eval --strict '<nixpkgs>' -A lib.nixpkgsVersion | sed s/'"'//g)

     

       
9
       
9
       
+
       
version=$(nix-instantiate --eval --strict '<nixpkgs>' -A lib.version | sed s/'"'//g)

     

       
10
       
10
       
 
       
major=${version:0:5}

     

       
11
       
11
       
 
       
echo "NixOS version is $version ($major)"

     

       
12
       
12
       
 
       


     

···

       
5
       
5
       
 
       
let

     

       
6
       
6
       
 
       
  cfg = config.system.nixos;

     

       
7
       
7
       
 
       


     

       
8
       
8
       
-
       
  releaseFile  = "${toString pkgs.path}/.version";

     

       
9
       
9
       
-
       
  suffixFile   = "${toString pkgs.path}/.version-suffix";

     

       
10
       
8
       
 
       
  revisionFile = "${toString pkgs.path}/.git-revision";

     

       
11
       
9
       
 
       
  gitRepo      = "${toString pkgs.path}/.git";

     

       
12
       
10
       
 
       
  gitCommitId  = lib.substring 0 7 (commitIdFromGitRepo gitRepo);

     
···

       
25
       
23
       
 
       
    nixos.release = mkOption {

     

       
26
       
24
       
 
       
      readOnly = true;

     

       
27
       
25
       
 
       
      type = types.str;

     

       
28
       
28
       
-
       
      default = fileContents releaseFile;

     

       
26
       
26
       
+
       
      default = trivial.release;

     

       
29
       
27
       
 
       
      description = "The NixOS release (e.g. <literal>16.03</literal>).";

     

       
30
       
28
       
 
       
    };

     

       
31
       
29
       
 
       


     

       
32
       
30
       
 
       
    nixos.versionSuffix = mkOption {

     

       
33
       
31
       
 
       
      internal = true;

     

       
34
       
32
       
 
       
      type = types.str;

     

       
35
       
35
       
-
       
      default = if pathExists suffixFile then fileContents suffixFile else "pre-git";

     

       
33
       
33
       
+
       
      default = trivial.versionSuffix;

     

       
36
       
34
       
 
       
      description = "The NixOS version suffix (e.g. <literal>1160.f2d4ee1</literal>).";

     

       
37
       
35
       
 
       
    };

     

       
38
       
36
       
 
       


     

···

       
24
       
24
       
 
       


     

       
25
       
25
       
 
       
  # this is what `osquery --help` will show as the version.

     

       
26
       
26
       
 
       
  OSQUERY_BUILD_VERSION = version;

     

       
27
       
27
       
-
       
  OSQUERY_PLATFORM = "nixos;${builtins.readFile "${toString path}/.version"}";

     

       
27
       
27
       
+
       
  OSQUERY_PLATFORM = "nixos;${stdenv.lib.version}";

     

       
28
       
28
       
 
       


     

       
29
       
29
       
 
       
  src = fetchFromGitHub {

     

       
30
       
30
       
 
       
    owner = "facebook";