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: ebc9620c3f62
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: a8c2c1d92dff
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Mar 1, 2020

  1. nixos/pantheon: add docs 

    (cherry picked from commit 3be0457)
    @worldofpeace
    worldofpeace committed Mar 1, 2020

    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
    ea4f8e8 View commit details

  2. pythonPackages.swagger-spec-validator 2.4.3 -> 2.5.0 

    Includes various upstream fixes of the tests, see

* Yelp/swagger_spec_validator#117
* Yelp/swagger_spec_validator#121

(cherry picked from commit efa2515)
    @vanschelven
    vanschelven authored and Jon committed Mar 1, 2020

    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
    a8c2c1d View commit details
5 changes: 4 additions & 1 deletion nixos/modules/services/x11/desktop-managers/pantheon.nix
View file
Original file line number Diff line number Diff line change
@@ -16,7 +16,10 @@ in

{

meta.maintainers = pkgs.pantheon.maintainers;
meta = {
doc = ./pantheon.xml;
maintainers = pkgs.pantheon.maintainers;
};

options = {

130 changes: 130 additions & 0 deletions nixos/modules/services/x11/desktop-managers/pantheon.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
<chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="chap-pantheon">
<title>Pantheon Destkop</title>
<para>
Pantheon is the desktop environment created for the elementary OS distribution. It is written from scratch in Vala, utilizing GNOME technologies with GTK 3 and Granite.
</para>
<section xml:id="sec-pantheon-enable">
<title>Enabling Pantheon</title>

<para>
All of Pantheon is working in NixOS and the applications should be available, aside from a few <link xlink:href="https://github.com/NixOS/nixpkgs/issues/58161">exceptions</link>. To enable Pantheon, set
<programlisting>
<xref linkend="opt-services.xserver.desktopManager.pantheon.enable"/> = true;
</programlisting>
This automatically enables LightDM and Pantheon's LightDM greeter. If you'd like to disable this, set
<programlisting>
<xref linkend="opt-services.xserver.displayManager.lightdm.greeters.pantheon.enable"/> = false;
<xref linkend="opt-services.xserver.displayManager.lightdm.enable"/> = false;
</programlisting>
but please be aware using Pantheon without LightDM as a display manager will break screenlocking from the UI. The NixOS module for Pantheon installs all of Pantheon's default applications. If you'd like to not install Pantheon's apps, set
<programlisting>
<xref linkend="opt-services.pantheon.apps.enable"/> = false;
</programlisting>
You can also use <xref linkend="opt-environment.pantheon.excludePackages"/> to remove any other app (like <package>geary</package>).
</para>
</section>
<section xml:id="sec-pantheon-wingpanel-switchboard">
<title>Wingpanel and Switchboard plugins</title>

<para>
Wingpanel and Switchboard work differently than they do in other distributions, as far as using plugins. You cannot install a plugin globally (like with <option>environment.systemPackages</option>) to start using it. You should instead be using the following options:
<itemizedlist>
<listitem>
<para>
<xref linkend="opt-services.xserver.desktopManager.pantheon.extraWingpanelIndicators"/>
</para>
</listitem>
<listitem>
<para>
<xref linkend="opt-services.xserver.desktopManager.pantheon.extraSwitchboardPlugs"/>
</para>
</listitem>
</itemizedlist>
to configure the programs with plugs or indicators.
</para>

<para>
The difference in NixOS is both these programs are patched to load plugins from a directory that is the value of an environment variable. All of which is controlled in Nix. If you need to configure the particular packages manually you can override the packages like:
<programlisting>
wingpanel-with-indicators.override {
indicators = [
pkgs.some-special-indicator
];
};

switchboard-with-plugs.override {
plugs = [
pkgs.some-special-plug
];
};
</programlisting>
please note that, like how the NixOS options describe these as extra plugins, this would only add to the default plugins included with the programs. If for some reason you'd like to configure which plugins to use exactly, both packages have an argument for this:
<programlisting>
wingpanel-with-indicators.override {
useDefaultIndicators = false;
indicators = specialListOfIndicators;
};

switchboard-with-plugs.override {
useDefaultPlugs = false;
plugs = specialListOfPlugs;
};
</programlisting>
this could be most useful for testing a particular plug-in in isolation.
</para>
</section>
<section xml:id="sec-pantheon-faq">
<title>FAQ</title>

<variablelist>
<varlistentry xml:id="sec-pantheon-faq-messed-up-theme">
<term>
I have switched from a different desktop and Pantheon’s theming looks messed up.
</term>
<listitem>
<para>
Open Switchboard and go to: <guilabel>Administration</guilabel> → <guilabel>About</guilabel> → <guilabel>Restore Default Settings</guilabel> → <guibutton>Restore Settings</guibutton>. This will reset any dconf settings to their Pantheon defaults. Note this could reset certain GNOME specific preferences if that desktop was used prior.
</para>
</listitem>
</varlistentry>
<varlistentry xml:id="sec-pantheon-faq-slow-shutdown">
<term>
Using Pantheon sometimes makes my shutdown take a long time.
</term>
<listitem>
<para>
We have not yet determined what processes fight with systemd during shutdown, there are many reports. In elementary OS the default system timeout is lowered to lessen the impact of the issue. If you'd like to do this in NixOS, set
<programlisting>
<xref linkend="opt-systemd.extraConfig"/> = ''
DefaultTimeoutStopSec=10s
DefaultTimeoutStartSec=10s
'';
</programlisting>
</para>
</listitem>
</varlistentry>
<varlistentry xml:id="sec-pantheon-faq-gnome3-and-pantheon">
<term>
I cannot enable both GNOME 3 and Pantheon.
</term>
<listitem>
<para>
This is a known <link xlink:href="https://github.com/NixOS/nixpkgs/issues/64611">issue</link> and there is no known workaround.
</para>
</listitem>
</varlistentry>
<varlistentry xml:id="sec-pantheon-faq-appcenter">
<term>
Does AppCenter work, or is it available?
</term>
<listitem>
<para>
AppCenter has been available since 20.03, but it is of little use. This is because there is no functioning PackageKit backend for Nix 2.0. In the near future you will be able to install Flatpak applications from AppCenter on NixOS. See this <link xlink:href="https://github.com/NixOS/nixpkgs/issues/70214">issue</link>.
</para>
</listitem>
</varlistentry>
</variablelist>
</section>
</chapter>
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/swagger-spec-validator/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

buildPythonPackage rec {
pname = "swagger-spec-validator";
version = "2.4.3";
version = "2.5.0";

src = fetchFromGitHub {
owner = "Yelp";
repo = "swagger_spec_validator";
rev = "v" + version;
sha256 = "02f8amc6iq2clxxmrz8hirbb57sizaxijp0higqy16shk63ibalw";
sha256 = "0qlkiyncdh7cdyjvnwjpv9i7y75ghwnpyqkkpfaa8hg698na13pw";
};

checkInputs = [