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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e3e1a53118d2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9f4f96ef0505
Choose a head ref

Commits on Jun 3, 2018

  1. fix typo

    srghma authored Jun 3, 2018
    Copy the full SHA
    c4cad45 View commit details

Commits on Oct 8, 2018

  1. konqueror: init at 18.08

    colemickens committed Oct 8, 2018
    Copy the full SHA
    056c03a View commit details

Commits on Oct 15, 2018

  1. nixos/syncthing: move configuration to condigDir

    fixes #47513 following the upstream recommended settings:
    syncthing/syncthing#3434 (comment)
    rnhmjoj committed Oct 15, 2018
    3
    Copy the full SHA
    16f6763 View commit details

Commits on Oct 16, 2018

  1. z3: 4.7.1 -> 4.8.1

    dtzWill committed Oct 16, 2018
    Copy the full SHA
    51e5111 View commit details

Commits on Oct 18, 2018

  1. w3m: 20161120 -> 20180125

    dtzWill committed Oct 18, 2018
    Copy the full SHA
    4249f77 View commit details

Commits on Oct 19, 2018

  1. Copy the full SHA
    2ebc303 View commit details

Commits on Oct 22, 2018

  1. apparmor: 2.12.0 -> 2.13.1

    joachifm committed Oct 22, 2018
    Copy the full SHA
    6bd6c97 View commit details
  2. nixos/containers: Introduce several tweaks to systemd-nspawn from ups…

    …tream systemd
    
    * Lets container@.service  be activated by machines.target instead of
      multi-user.target
    
      According to the systemd manpages, all containers that are registered
      by machinectl, should be inside machines.target for easy stopping
      and starting container units altogether
    
    * make sure container@.service and container.slice instances are
      actually located in machine.slice
    
      https://plus.google.com/112206451048767236518/posts/SYAueyXHeEX
      See original commit: NixOS/systemd@45d383a3b8
    
    * Enable Cgroup delegation for nixos-containers
    
      Delegate=yes should be set for container scopes where a systemd instance
      inside the container shall manage the hierarchies below its own cgroup
      and have access to all controllers.
    
      This is equivalent to enabling all accounting options on the systemd
      process inside the system container.  This means that systemd inside
      the container is responsible for managing Cgroup resources for
      unit files that enable accounting options inside.  Without this
      option, units that make use of cgroup features within system
      containers might misbehave
    
      See original commit: NixOS/systemd@a931ad47a8
    
      from the manpage:
        Turns on delegation of further resource control partitioning to
        processes of the unit. Units where this is enabled may create and
        manage their own private subhierarchy of control groups below the
        control group of the unit itself. For unprivileged services (i.e.
        those using the User= setting) the unit's control group will be made
        accessible to the relevant user. When enabled the service manager
        will refrain from manipulating control groups or moving processes
        below the unit's control group, so that a clear concept of ownership
        is established: the control group tree above the unit's control
        group (i.e. towards the root control group) is owned and managed by
        the service manager of the host, while the control group tree below
        the unit's control group is owned and managed by the unit itself.
        Takes either a boolean argument or a list of control group
        controller names. If true, delegation is turned on, and all
        supported controllers are enabled for the unit, making them
        available to the unit's processes for management. If false,
        delegation is turned off entirely (and no additional controllers are
        enabled). If set to a list of controllers, delegation is turned on,
        and the specified controllers are enabled for the unit. Note that
        additional controllers than the ones specified might be made
        available as well, depending on configuration of the containing
        slice unit or other units contained in it. Note that assigning the
        empty string will enable delegation, but reset the list of
        controllers, all assignments prior to this will have no effect.
        Defaults to false.
    
        Note that controller delegation to less privileged code is only safe
        on the unified control group hierarchy. Accordingly, access to the
        specified controllers will not be granted to unprivileged services
        on the legacy hierarchy, even when requested.
    
        The following controller names may be specified: cpu, cpuacct, io,
        blkio, memory, devices, pids. Not all of these controllers are
        available on all kernels however, and some are specific to the
        unified hierarchy while others are specific to the legacy hierarchy.
        Also note that the kernel might support further controllers, which
        aren't covered here yet as delegation is either not supported at all
        for them or not defined cleanly.
    arianvp committed Oct 22, 2018
    Copy the full SHA
    9f72791 View commit details

Commits on Oct 24, 2018

  1. Copy the full SHA
    7e81407 View commit details

Commits on Oct 25, 2018

  1. Copy the full SHA
    950608b View commit details
  2. Copy the full SHA
    ad501e4 View commit details
  3. Copy the full SHA
    8b5a759 View commit details

Commits on Oct 26, 2018

  1. Copy the full SHA
    7081b5e View commit details
  2. 2
    Copy the full SHA
    1b77815 View commit details
  3. brlaser: fix install dir

    Fixes #49092
    symphorien committed Oct 26, 2018
    Copy the full SHA
    26ee8d6 View commit details

Commits on Oct 27, 2018

  1. Copy the full SHA
    f5c2960 View commit details
  2. Copy the full SHA
    ec8f320 View commit details
  3. androidenv: remove android command from fetch.sh

    It's deprecated, and no longer prints the urls of any xml files for the script
    to parse.
    nicknovitski committed Oct 27, 2018
    Copy the full SHA
    6e07691 View commit details
  4. androidenv: run ./fetch.sh

    Manually corrected three problems:
    - fetch.sh: android cli cannot find java executable
    - addons.nix: google_apis_25 expression not added correctly
    - addons.nix: android_support_extra expression deleted (replaced in android 9 with jetpack/androidx)
    nicknovitski committed Oct 27, 2018
    Copy the full SHA
    a61f31c View commit details
  5. Copy the full SHA
    4a0ae5d View commit details
  6. Copy the full SHA
    d861da1 View commit details
  7. nim: 0.18.0 -> 0.19.0

    - remove sqlite as dependency (I don't see why it's needed)
    - run checkPhase after installPhase (at least one test assumes the
    standard library in ../lib relative to the nim binary)
    - the broken tests pass now or don't exist anymore
    - two of the tests requiring network access pass now without network access
    - the tests in manyloc do not download dependencies and are passing now
    royneary committed Oct 27, 2018
    Copy the full SHA
    9bf79ad View commit details
  8. nim: don't hardcode gcc

    royneary committed Oct 27, 2018
    Copy the full SHA
    89d71c5 View commit details
  9. Copy the full SHA
    651c178 View commit details

Commits on Oct 28, 2018

  1. Copy the full SHA
    95fab6a View commit details
  2. remmina: clean up

    Desktop file is included now, so no need to create it manually.
    libgnome-keyring is not used anymore, libsecret replaced it.
    jtojnar committed Oct 28, 2018
    2
    Copy the full SHA
    b4c5448 View commit details
  3. Copy the full SHA
    83a65a9 View commit details
  4. jemalloc: 5.0.1 -> 5.1.0

    loskutov committed Oct 28, 2018
    Copy the full SHA
    e7f2ce9 View commit details

Commits on Oct 29, 2018

  1. openjdk: 10.0.2 -> 11.0.1

    * the jre is no longer an official part of the jdk (jmod is
      recommended as a replacement when needing to create smaller runtime
      images)
    
    * darwin continues to use zulu from azul
    
    * apps that used 10 now use 11 (eclipse, bazel, josm)
    jerith666 committed Oct 29, 2018
    Copy the full SHA
    1bd7b98 View commit details
  2. Copy the full SHA
    a586c14 View commit details
  3. Copy the full SHA
    efca8b4 View commit details
  4. Copy the full SHA
    149a55e View commit details
  5. Copy the full SHA
    2962f94 View commit details
  6. Copy the full SHA
    5be927d View commit details
  7. make-derivation: use lib.assertMsg

    As suggested by @Profpatsch
    Synthetica9 committed Oct 29, 2018
    Copy the full SHA
    c7e026b View commit details
  8. texlive: provide repstopdf

    repstopdf is supposed to be a symlink to epstopdf. Then epstopdf looks
    at "$0" to detect when restricted mode needs to be enabled.  Unfortunately
    our wrapper will drop all intermediate symlinks, which messes up "$0".
    Restricted mode appears to be a security feature, so a test is
    introduced to verify that the wrapper works as expected.
    veprbl committed Oct 29, 2018
    Copy the full SHA
    20643a7 View commit details

Commits on Oct 30, 2018

  1. Copy the full SHA
    d2e7840 View commit details
  2. Copy the full SHA
    00a51a9 View commit details
  3. Copy the full SHA
    1f7fc09 View commit details
  4. bamf: 0.5.3 -> 2018-02-07, fix build

    Technically this is 0.5.4 but it's unreleased
    worldofpeace committed Oct 30, 2018
    Copy the full SHA
    3358e25 View commit details
  5. Copy the full SHA
    888034f View commit details
  6. Copy the full SHA
    9b34f47 View commit details
  7. Copy the full SHA
    930bcbd View commit details
  8. Copy the full SHA
    b9faae9 View commit details
  9. Copy the full SHA
    e540791 View commit details
  10. Copy the full SHA
    0cf2c6f View commit details
  11. Copy the full SHA
    7dd7190 View commit details
  12. Copy the full SHA
    1ac9d8e View commit details
  13. cudatoolkit, cudnn: many updates

    cudatoolkit_9_1: 9.1.85.1 -> 9.1.85.3
    cudatoolkit_9_2: init at 9.2.148.1
    cudatoolkit_9: 9.1.85.1 -> 9.2.148.1
    cudatoolkit_10, cudatoolkit_10_0: init at 10.0.130
    
    cudnn_cudatoolkit_9_0: 7.0.5 -> 7.3.0
    cudnn_cudatoolkit_9_1: init at 7.1.3
    cudnn_cudatoolkit_9_2: init at 7.2.1
    cudnn_cudatoolkit_9: 7.0.5 (9.1) -> 7.3.1 (9.2)
    cudnn_cudatoolkit_10, cudnn_cudatoolkit_10_0: init at 7.3.1
    Synthetica9 committed Oct 30, 2018
    Copy the full SHA
    4cfeb9d View commit details
  14. Copy the full SHA
    c34f517 View commit details
Showing 801 changed files with 12,458 additions and 9,398 deletions.
24 changes: 20 additions & 4 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -12,17 +12,19 @@

# Libraries
/lib @edolstra @nbp
/lib/systems @nbp @ericson2314
/lib/systems @nbp @ericson2314 @matthewbauer
/lib/generators.nix @edolstra @nbp @Profpatsch
/lib/debug.nix @edolstra @nbp @Profpatsch

# Nixpkgs Internals
/default.nix @nbp
/pkgs/top-level/default.nix @nbp @Ericson2314
/pkgs/top-level/impure.nix @nbp @Ericson2314
/pkgs/top-level/stage.nix @nbp @Ericson2314
/pkgs/stdenv/generic @Ericson2314
/pkgs/stdenv/cross @Ericson2314
/pkgs/top-level/stage.nix @nbp @Ericson2314 @matthewbauer
/pkgs/top-level/splice.nix @Ericson2314 @matthewbauer
/pkgs/top-level/release-cross.nix @Ericson2314 @matthewbauer
/pkgs/stdenv/generic @Ericson2314 @matthewbauer
/pkgs/stdenv/cross @Ericson2314 @matthewbauer
/pkgs/build-support/cc-wrapper @Ericson2314 @orivej
/pkgs/build-support/bintools-wrapper @Ericson2314 @orivej
/pkgs/build-support/setup-hooks @Ericson2314
@@ -74,6 +76,14 @@
/pkgs/stdenv/darwin @NixOS/darwin-maintainers
/pkgs/os-specific/darwin @NixOS/darwin-maintainers

# C compilers
/pkgs/development/compilers/gcc @matthewbauer
/pkgs/development/compilers/llvm @matthewbauer

# Compatibility stuff
/pkgs/top-level/unix-tools.nix @matthewbauer
/pkgs/development/tools/xcbuild @matthewbauer

# Beam-related (Erlang, Elixir, LFE, etc)
/pkgs/development/beam-modules @gleber
/pkgs/development/interpreters/erlang @gleber
@@ -97,3 +107,9 @@
/pkgs/desktops/plasma-5 @ttuegel
/pkgs/development/libraries/kde-frameworks @ttuegel
/pkgs/development/libraries/qt-5 @ttuegel

# PostgreSQL and related stuff
/pkgs/servers/sql/postgresql @thoughtpolice
/nixos/modules/services/databases/postgresql.xml @thoughtpolice
/nixos/modules/services/databases/postgresql.nix @thoughtpolice
/nixos/tests/postgresql.nix @thoughtpolice
2 changes: 1 addition & 1 deletion doc/languages-frameworks/python.section.md
Original file line number Diff line number Diff line change
@@ -670,7 +670,7 @@ python3Packages.buildPythonApplication rec {
sha256 = "035w8gqql36zlan0xjrzz9j4lh9hs0qrsgnbyw07qs7lnkvbdv9x";
};
propagatedBuildInputs = with python3Packages; [ tornado_4 pythondaemon ];
propagatedBuildInputs = with python3Packages; [ tornado_4 python-daemon ];
meta = with lib; {
...
4 changes: 4 additions & 0 deletions lib/licenses.nix
Original file line number Diff line number Diff line change
@@ -400,6 +400,10 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
free = false;
};

jasper = spdx {
spdxId = "JasPer-2.0";
fullName = "JasPer License";
};

lgpl2 = spdx {
spdxId = "LGPL-2.0";
1 change: 1 addition & 0 deletions lib/systems/platforms.nix
Original file line number Diff line number Diff line change
@@ -471,6 +471,7 @@ rec {
"x86_64-linux" = pc64;
"armv5tel-linux" = sheevaplug;
"armv6l-linux" = raspberrypi;
"armv7a-linux" = armv7l-hf-multiplatform;
"armv7l-linux" = armv7l-hf-multiplatform;
"aarch64-linux" = aarch64-multiplatform;
"mipsel-linux" = fuloong2f_n32;
15 changes: 15 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
@@ -143,6 +143,11 @@
github = "ahmedtd";
name = "Taahir Ahmed";
};
ahuzik = {
email = "ales.guzik@gmail.com";
github = "alesguzik";
name = "Ales Huzik";
};
aij = {
email = "aij+git@mrph.org";
github = "aij";
@@ -3905,6 +3910,11 @@
github = "sjagoe";
name = "Simon Jagoe";
};
sjau = {
email = "nixos@sjau.ch";
github = "sjau";
name = "Stephan Jau";
};
sjmackenzie = {
email = "setori88@gmail.com";
github = "sjmackenzie";
@@ -4153,6 +4163,11 @@
github = "taku0";
name = "Takuo Yonezawa";
};
talyz = {
email = "kim.lindberger@gmail.com";
github = "talyz";
name = "Kim Lindberger";
};
tari = {
email = "peter@taricorp.net";
github = "tari";
9 changes: 0 additions & 9 deletions nixos/doc/manual/configuration/firewall.xml
Original file line number Diff line number Diff line change
@@ -34,13 +34,4 @@
Similarly, UDP port ranges can be opened through
<xref linkend="opt-networking.firewall.allowedUDPPortRanges"/>.
</para>

<para>
Also of interest is
<programlisting>
<xref linkend="opt-networking.firewall.allowPing"/> = true;
</programlisting>
to allow the machine to respond to ping requests. (ICMPv6 pings are always
allowed.)
</para>
</section>
38 changes: 38 additions & 0 deletions nixos/doc/manual/release-notes/rl-1903.xml
Original file line number Diff line number Diff line change
@@ -99,6 +99,16 @@
start org.nixos.nix-daemon</command>.
</para>
</listitem>
<listitem>
<para>
The Syncthing state and configuration data has been moved from
<varname>services.syncthing.dataDir</varname> to the newly defined
<varname>services.syncthing.configDir</varname>, which default to
<literal>/var/lib/syncthing/.config/syncthing</literal>.
This change makes possible to share synced directories using ACLs
without Syncthing resetting the permission on every start.
</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
@@ -154,6 +164,34 @@
has been renamed to <varname>postgresql_9_6</varname>.
</para>
</listitem>
<listitem>
<para>
Package <literal>consul-ui</literal> and passthrough <literal>consul.ui</literal> have been removed.
The package <literal>consul</literal> now uses upstream releases that vendor the UI into the binary.
See <link xlink:href="https://github.com/NixOS/nixpkgs/pull/48714#issuecomment-433454834">#48714</link>
for details.
</para>
</listitem>
<listitem>
<para>
Slurm introduces the new option
<literal>services.slurm.stateSaveLocation</literal>,
which is now set to <literal>/var/spool/slurm</literal> by default
(instead of <literal>/var/spool</literal>).
Make sure to move all files to the new directory or to set the option accordingly.
</para>
<para>
The slurmctld now runs as user <literal>slurm</literal> instead of <literal>root</literal>.
If you want to keep slurmctld running as <literal>root</literal>, set
<literal>services.slurm.user = root</literal>.
</para>
<para>
The options <literal>services.slurm.nodeName</literal> and
<literal>services.slurm.partitionName</literal> are now sets of
strings to correctly reflect that fact that each of these
options can occour more than once in the configuration.
</para>
</listitem>
</itemizedlist>
</section>

6 changes: 3 additions & 3 deletions nixos/modules/config/networking.nix
Original file line number Diff line number Diff line change
@@ -228,9 +228,6 @@ in
# /etc/protocols: IP protocol numbers.
"protocols".source = pkgs.iana-etc + "/etc/protocols";

# /etc/rpc: RPC program numbers.
"rpc".source = pkgs.glibc.out + "/etc/rpc";

# /etc/hosts: Hostname-to-IP mappings.
"hosts".text = let
oneToString = set: ip: ip + " " + concatStringsSep " " set.${ip};
@@ -268,6 +265,9 @@ in
"resolv.conf".source = "${pkgs.systemd}/lib/systemd/resolv.conf";
} // optionalAttrs (config.services.resolved.enable && dnsmasqResolve) {
"dnsmasq-resolv.conf".source = "/run/systemd/resolve/resolv.conf";
} // optionalAttrs (pkgs.stdenv.hostPlatform.libc == "glibc") {
# /etc/rpc: RPC program numbers.
"rpc".source = pkgs.glibc.out + "/etc/rpc";
};

networking.proxy.envVars =
4 changes: 3 additions & 1 deletion nixos/modules/config/system-path.nix
Original file line number Diff line number Diff line change
@@ -19,7 +19,9 @@ let
pkgs.diffutils
pkgs.findutils
pkgs.gawk
pkgs.glibc # for ldd, getent
pkgs.stdenv.cc.libc
pkgs.getent
pkgs.getconf
pkgs.gnugrep
pkgs.gnupatch
pkgs.gnused
4 changes: 4 additions & 0 deletions nixos/modules/misc/ids.nix
Original file line number Diff line number Diff line change
@@ -331,6 +331,8 @@
zeronet = 304;
lirc = 305;
lidarr = 306;
slurm = 307;
kapacitor = 308;

# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!

@@ -622,6 +624,8 @@
zeronet = 304;
lirc = 305;
lidarr = 306;
slurm = 307;
kapacitor = 308;

# When adding a gid, make sure it doesn't match an existing
# uid. Users and groups with the same name should have equal
1 change: 1 addition & 0 deletions nixos/modules/module-list.nix
Original file line number Diff line number Diff line change
@@ -433,6 +433,7 @@
./services/monitoring/hdaps.nix
./services/monitoring/heapster.nix
./services/monitoring/incron.nix
./services/monitoring/kapacitor.nix
./services/monitoring/longview.nix
./services/monitoring/monit.nix
./services/monitoring/munin.nix
4 changes: 2 additions & 2 deletions nixos/modules/programs/shell.nix
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ with lib;
# Set up the per-user profile.
mkdir -m 0755 -p "$NIX_USER_PROFILE_DIR"
if [ "$(stat --printf '%u' "$NIX_USER_PROFILE_DIR")" != "$(id -u)" ]; then
echo "WARNING: bad ownership on $NIX_USER_PROFILE_DIR, should be $(id -u)" >&2
echo "WARNING: the per-user profile dir $NIX_USER_PROFILE_DIR should belong to user id $(id -u)" >&2
fi
if [ -w "$HOME" ]; then
@@ -35,7 +35,7 @@ with lib;
NIX_USER_GCROOTS_DIR="/nix/var/nix/gcroots/per-user/$USER"
mkdir -m 0755 -p "$NIX_USER_GCROOTS_DIR"
if [ "$(stat --printf '%u' "$NIX_USER_GCROOTS_DIR")" != "$(id -u)" ]; then
echo "WARNING: bad ownership on $NIX_USER_GCROOTS_DIR, should be $(id -u)" >&2
echo "WARNING: the per-user gcroots dir $NIX_USER_GCROOTS_DIR should belong to user id $(id -u)" >&2
fi
# Set up a default Nix expression from which to install stuff.
5 changes: 4 additions & 1 deletion nixos/modules/rename.nix
Original file line number Diff line number Diff line change
@@ -28,7 +28,10 @@ with lib;
(config:
let enabled = getAttrFromPath [ "services" "printing" "gutenprint" ] config;
in if enabled then [ pkgs.gutenprint ] else [ ]))
(mkRenamedOptionModule [ "services" "ddclient" "domain" ] [ "services" "ddclient" "domains" ])
(mkChangedOptionModule [ "services" "ddclient" "domain" ] [ "services" "ddclient" "domains" ]
(config:
let value = getAttrFromPath [ "services" "ddclient" "domain" ] config;
in if value != "" then [ value ] else []))
(mkRemovedOptionModule [ "services" "ddclient" "homeDir" ] "")
(mkRenamedOptionModule [ "services" "elasticsearch" "host" ] [ "services" "elasticsearch" "listenAddress" ])
(mkRenamedOptionModule [ "services" "graphite" "api" "host" ] [ "services" "graphite" "api" "listenAddress" ])
2 changes: 1 addition & 1 deletion nixos/modules/security/apparmor-suid.nix
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ with lib;
capability setuid,
network inet raw,
${pkgs.glibc.out}/lib/*.so mr,
${pkgs.stdenv.cc.libc.out}/lib/*.so mr,
${pkgs.libcap.lib}/lib/libcap.so* mr,
${pkgs.attr.out}/lib/libattr.so* mr,
2 changes: 2 additions & 0 deletions nixos/modules/security/dhparams.nix
Original file line number Diff line number Diff line change
@@ -170,4 +170,6 @@ in {
'';
}) cfg.params;
};

meta.maintainers = with lib.maintainers; [ ekleog ];
}
Loading