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: 6cbd1ec4b043
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: 6a3f5bcb061e
Choose a head ref
16 contributors

Commits on Oct 1, 2018

  1. lz4: 1.8.2 -> 1.8.3 (#47547) 

    (cherry picked from commit 55b6cad)
    @dtzWill @xeji
    dtzWill authored and xeji committed Oct 1, 2018
    Copy the full SHA
    1f1c807 View commit details

  2. Merge branch 'release-18.09' into staging-18.09

    @xeji
    xeji committed Oct 1, 2018
    Copy the full SHA
    f2faf32 View commit details

Commits on Oct 3, 2018

  1. nixos on hyperv: load modules and set video mode 

    (cherry picked from commit 3a76bc7)
    @peterhoeg
    peterhoeg committed Oct 3, 2018
    Copy the full SHA
    42968c0 View commit details

  2. nixos-installer: use the hyperv module on hyperv 

    (cherry picked from commit ca6d41a)
    @peterhoeg
    peterhoeg committed Oct 3, 2018
    Copy the full SHA
    18ae457 View commit details

  3. nixos on hyperv: hot-add CPU 

    (cherry picked from commit 6e3e136)
    @peterhoeg
    peterhoeg committed Oct 3, 2018
    Copy the full SHA
    9ffdaa1 View commit details

  4. buildRustPackage now correctly installs binaries to bin and libraries… 

    … to lib.
    @et4te
    et4te committed Oct 3, 2018
    Copy the full SHA
    6f37fa7 View commit details

  5. Use regex instead of -name in find with -print0 and xargs -0.

    @et4te
    et4te committed Oct 3, 2018
    Copy the full SHA
    f08cebd View commit details

  6. Shortened rmdir, improved regex to support shared libs with multiple … 

    …integers at the end.
    @et4te
    et4te committed Oct 3, 2018
    Copy the full SHA
    c3f8368 View commit details

  7. Merge pull request #47709 from et4te/rustbuild-fix-staging 

    buildRustPackage: install binaries to bin and libraries to lib correctly
    @Mic92
    Mic92 authored Oct 3, 2018
    Copy the full SHA
    46069d4 View commit details

Commits on Oct 4, 2018

  1. Merge branch 'staging-18.09' into release-18.09

    @vcunat
    vcunat committed Oct 4, 2018
    Copy the full SHA
    11ec1cd View commit details

  2. Merge pull request #47407 from kalbasit/nixpkgs_add-terraform-provide… 

    …r-nixos

terraform: update all providers and move nixos provider under terraform.withPlugins
(cherry picked from commit 5547a8b)
    @Mic92 @zimbatm
    Mic92 authored and zimbatm committed Oct 4, 2018
    Copy the full SHA
    be38959 View commit details

  3. terraform-providers.matchbox: init at 0.2.2 (#47863) 

    (cherry picked from commit e4f4e9f)
    @flokli @zimbatm
    flokli authored and zimbatm committed Oct 4, 2018
    Copy the full SHA
    c02f213 View commit details

  4. nixos-option: fix #47722 when missing ~/.nix-defexpr/channels 

    The problem was that the non-fatal warning was not omitted
from the output when constructing a nix expression.
Now it seems OK for me.  When return code is OK,
the warnings don't get passed anywhere, but I expect
that won't matter for this utility.  Fatal errors are still shown.

(cherry picked from commit de93b32)
    @vcunat
    vcunat committed Oct 4, 2018
    Copy the full SHA
    c78e3b7 View commit details

  5. thunderbird: 60.0 -> 60.2.1 

    (cherry picked from commit d802524)
    @taku0 @andir
    taku0 authored and andir committed Oct 4, 2018
    Copy the full SHA
    5669552 View commit details

  6. thunderbird-bin: 60.0 -> 60.2.1 

    (cherry picked from commit d4de3b2)
    @taku0 @andir
    taku0 authored and andir committed Oct 4, 2018
    Copy the full SHA
    2006323 View commit details

  7. elvish: provide the compiled version 

    Without this fix, `elvish -version` displays "unknown"

(cherry picked from commit 9d49cf1)
    @zimbatm @Mic92
    zimbatm authored and Mic92 committed Oct 4, 2018
    Copy the full SHA
    5399898 View commit details

  8. gollum: 4.1.2 -> 4.1.3 

    (cherry picked from commit 265c5fc)
Reason: Security update: "Solves a vulnerability in the File view and
All Pages view that would allow XSS."
    @primeos
    primeos committed Oct 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
    69d32c2 View commit details

  9. jekyll: 3.8.3 -> 3.8.4 (security) 

    (cherry picked from commit e8a3591)
Reason: Security update: "fix include bypass of EntryFilter#filter
symlink check".
    @primeos
    primeos committed Oct 4, 2018
    Copy the full SHA
    5ca268d View commit details

  10. gollum: 4.1.3 -> 4.1.4 (security, CVE-2018-3740) 

    (cherry picked from commit 18b468e)
Reason: Security update: "Depend on new version of gollum-lib that
relies on a patched version of sanitize, which solves a vulnerability
(CVE-2018-3740). See gollum/gollum-lib#296."
    @primeos
    primeos committed Oct 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
    1f96d2f View commit details

  11. Merge pull request #47874 from andir/18.09/thunderbird 

    [18.09] thunderbird:  60.0 -> 60.2.1, thunderbird-bin: 60.0 -> 60.2.1
    @andir
    andir authored Oct 4, 2018
    Copy the full SHA
    7c3459b View commit details

  12. Merge pull request #47884 from primeos/security-backports-for-18.09 

    [18.09] gollum, jekyll (security backports)
    @primeos
    primeos authored Oct 4, 2018
    Copy the full SHA
    cb08cb4 View commit details

  13. Merge #47699: nixos on hyperv improvements

    @vcunat
    vcunat committed Oct 4, 2018
    Copy the full SHA
    8dae912 View commit details

  14. GRV: Fix typos in description 

    (cherry picked from commit 1bb4b16)
    @alexherbo2 @Mic92
    alexherbo2 authored and Mic92 committed Oct 4, 2018
    Copy the full SHA
    b4d7324 View commit details

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
    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
    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
    Copy the full SHA
    c8b3a26 View commit details

  4. matrix-synapse: 0.33.5 -> 0.33.6 

    (cherry picked from commit 570b9ba)
Backport of #47880
    @pacien @srhb
    pacien authored and srhb committed Oct 5, 2018
    Copy the full SHA
    4e73b76 View commit details

  5. 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
    Copy the full SHA
    131cb30 View commit details

  6. 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
    Copy the full SHA
    9d5f0ba View commit details

  7. version.nix: extract revision-fetching function 

    (cherry picked from commit 4312cfd)
    @grahamc
    grahamc committed Oct 5, 2018
    Copy the full SHA
    09b8ed0 View commit details

  8. 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
    Copy the full SHA
    3bf2c2f View commit details

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

    @grahamc
    grahamc committed Oct 5, 2018
    Copy the full SHA
    d916a0f View commit details

  10. git: 2.18.0 -> 2.18.1 (CVE-2018-17456)

    @edef1c
    edef1c committed Oct 5, 2018
    Copy the full SHA
    def2618 View commit details

  11. Merge pull request #47925 from edef1c/git-2.18.1 

    git: 2.18.0 -> 2.18.1 (CVE-2018-17456)
    @andir
    andir authored Oct 5, 2018
    Copy the full SHA
    b0b0a6c View commit details

  12. Updates 18.09 release notes for release. 

    (cherry picked from commit 6487a47)
    @samueldr
    samueldr committed Oct 5, 2018
    Copy the full SHA
    0ea9623 View commit details

  13. README: 18.03 -> 18.09 

    (cherry picked from commit 29b479e)
    @samueldr
    samueldr committed Oct 5, 2018
    Copy the full SHA
    1863fac View commit details

  14. nixos/doc: Updates release date for 18.09 

    (cherry picked from commit 82d1bf9)
    @samueldr
    samueldr committed Oct 5, 2018
    Copy the full SHA
    6a3f5bc View commit details
Showing with 1,931 additions and 271 deletions.
  1. +4 −4 README.md
  2. +1 −0 doc/.gitignore
  3. +6 −2 doc/Makefile
  4. +4 −1 doc/default.nix
  5. +2 −0 doc/functions.xml
  6. +13 −0 doc/functions/library.xml
  7. +970 −0 doc/functions/library/attrsets.xml
  8. +85 −0 doc/lib-function-locations.nix
  9. +1 −1 doc/shell.nix
  10. +10 −0 lib/trivial.nix
  11. +338 −3 nixos/doc/manual/release-notes/rl-1809.xml
  12. +1 −2 nixos/modules/installer/tools/nixos-generate-config.pl
  13. +2 −2 nixos/modules/installer/tools/nixos-option.sh
  14. +1 −4 nixos/modules/misc/version.nix
  15. +2 −5 nixos/modules/services/x11/desktop-managers/plasma5.nix
  16. +54 −0 nixos/modules/system/activation/activation-script.nix
  17. +1 −0 nixos/modules/system/activation/switch-to-configuration.pl
  18. +31 −4 nixos/modules/virtualisation/hyperv-guest.nix
  19. +27 −19 pkgs/applications/misc/gollum/Gemfile.lock
  20. +1 −0 pkgs/applications/misc/gollum/default.nix
  21. +64 −29 pkgs/applications/misc/gollum/gemset.nix
  22. +9 −9 pkgs/applications/misc/jekyll/basic/Gemfile.lock
  23. +16 −16 pkgs/applications/misc/jekyll/basic/gemset.nix
  24. +16 −16 pkgs/applications/misc/jekyll/full/Gemfile.lock
  25. +30 −30 pkgs/applications/misc/jekyll/full/gemset.nix
  26. +0 −23 pkgs/applications/networking/cluster/terraform-provider-nixos/default.nix
  27. +116 −60 pkgs/applications/networking/cluster/{terraform/providers → terraform-providers}/data.nix
  28. +9 −2 pkgs/applications/networking/cluster/{terraform/providers → terraform-providers}/default.nix
  29. 0 pkgs/applications/networking/cluster/{terraform-provider-ibm → terraform-providers/ibm}/default.nix
  30. 0 ...cations/networking/cluster/{terraform-provider-libvirt → terraform-providers/libvirt}/default.nix
  31. +16 −0 pkgs/applications/networking/cluster/terraform-providers/providers.txt
  32. +64 −21 pkgs/applications/networking/cluster/{terraform/providers → terraform-providers}/update-all
  33. +10 −3 pkgs/applications/networking/cluster/terraform/default.nix
  34. +2 −2 pkgs/applications/version-management/git-and-tools/git/default.nix
  35. +1 −1 pkgs/applications/version-management/git-and-tools/grv/default.nix
  36. +4 −2 pkgs/build-support/rust/default.nix
  37. +2 −2 pkgs/servers/matrix-synapse/default.nix
  38. +4 −0 pkgs/shells/elvish/default.nix
  39. +2 −2 pkgs/tools/compression/lz4/default.nix
  40. +3 −0 pkgs/top-level/aliases.nix
  41. +7 −4 pkgs/top-level/all-packages.nix
  42. +2 −2 pkgs/top-level/release.nix
8 changes: 4 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -12,12 +12,12 @@ build daemon as so-called channels. To get channel information via git, add
```

For stability and maximum binary package support, it is recommended to maintain
custom changes on top of one of the channels, e.g. `nixos-18.03` for the latest
custom changes on top of one of the channels, e.g. `nixos-18.09` for the latest
release and `nixos-unstable` for the latest successful build of master:

```
% git remote update channels
% git rebase channels/nixos-18.03
% git rebase channels/nixos-18.09
```

For pull-requests, please rebase onto nixpkgs `master`.
@@ -31,9 +31,9 @@ For pull-requests, please rebase onto nixpkgs `master`.
* [Manual (NixOS)](https://nixos.org/nixos/manual/)
* [Community maintained wiki](https://nixos.wiki/)
* [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
* [Continuous package builds for 18.03 release](https://hydra.nixos.org/jobset/nixos/release-18.03)
* [Continuous package builds for 18.09 release](https://hydra.nixos.org/jobset/nixos/release-18.09)
* [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
* [Tests for 18.03 release](https://hydra.nixos.org/job/nixos/release-18.03/tested#tabs-constituents)
* [Tests for 18.09 release](https://hydra.nixos.org/job/nixos/release-18.09/tested#tabs-constituents)

Communication:

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