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: a2b8e0c28853
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: 0a941b03d055
Choose a head ref
  • 6 commits
  • 4 files changed
  • 5 contributors

Commits on May 14, 2018

  1. plasma5: 5.12.2 -> 5.12.3 

    (cherry picked from commit 334538e)
    @bkchr @ttuegel
    bkchr authored and ttuegel committed May 14, 2018
    Copy the full SHA
    1483e54 View commit details

  2. plasma: 5.12.3 -> 5.12.4 

    (cherry picked from commit c91c503)
    @adisbladis @ttuegel
    adisbladis authored and ttuegel committed May 14, 2018
    Copy the full SHA
    a56b31f View commit details

  3. kdeApplications.kgamma5: fix build 

    (cherry picked from commit c6a3380)
    @abbradar @ttuegel
    abbradar authored and ttuegel committed May 14, 2018
    Copy the full SHA
    9fe618e View commit details

  4. plasma5: 5.12.4 -> 5.12.5 

    (cherry picked from commit b53182b)
    @bkchr @ttuegel
    bkchr authored and ttuegel committed May 14, 2018
    Copy the full SHA
    785d6e7 View commit details

  5. docs: fix broken link to staging policy 

    (cherry picked from commit 18ae1b6)
    @jcrben @Mic92
    jcrben authored and Mic92 committed May 14, 2018
    Copy the full SHA
    aa220b4 View commit details

  6. Merge pull request #40492 from ttuegel/feature/18.03/plasma-5.12.5 

    Plasma 5.12.5 (backport to 18.03)
    Thomas Tuegel authored May 14, 2018
    Copy the full SHA
    0a941b0 View commit details
Showing with 180 additions and 180 deletions.
  1. +1 −1 doc/submitting-changes.xml
  2. +1 −1 pkgs/desktops/plasma-5/fetch.sh
  3. +2 −2 pkgs/desktops/plasma-5/kgamma5.nix
  4. +176 −176 pkgs/desktops/plasma-5/srcs.nix
2 changes: 1 addition & 1 deletion doc/submitting-changes.xml
View file
Original file line number Diff line number Diff line change
@@ -476,7 +476,7 @@ Additional information.
<para>
It's only for non-breaking mass-rebuild commits. That means it's not to
be used for testing, and changes must have been well tested already.
<link xlink:href="http://comments.gmane.org/gmane.linux.distributions.nixos/13447">Read
<link xlink:href="https://web.archive.org/web/20160528180406/http://comments.gmane.org/gmane.linux.distributions.nixos/13447">Read
policy here</link>.
</para>
</listitem>
2 changes: 1 addition & 1 deletion pkgs/desktops/plasma-5/fetch.sh
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/plasma/5.12.2/ -A '*.tar.xz' )
WGET_ARGS=( https://download.kde.org/stable/plasma/5.12.5/ -A '*.tar.xz' )
4 changes: 2 additions & 2 deletions pkgs/desktops/plasma-5/kgamma5.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
mkDerivation,
extra-cmake-modules, kdoctools,
kconfig, kconfigwidgets, ki18n, qtx11extras,
kconfig, kconfigwidgets, ki18n, qtx11extras, libXxf86vm
}:

mkDerivation {
name = "kgamma5";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kconfig kconfigwidgets ki18n qtx11extras ];
buildInputs = [ kconfig kconfigwidgets ki18n qtx11extras libXxf86vm ];
}
Loading