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: 72a2ced25234
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: f3fa5a101eb7
Choose a head ref
  • 5 commits
  • 3 files changed
  • 5 contributors

Commits on Dec 3, 2019

  1. spectacle: add new kwayland dependency

    @nyanloutre @ajs124
    nyanloutre authored and ajs124 committed Dec 3, 2019
    Copy the full SHA
    7cf2251 View commit details

  2. Merge pull request #74910 from helsinki-systems/backport/spectacle_wa… 

    …yland_fix

spectacle: add new kwayland dependency
    @adisbladis
    adisbladis authored Dec 3, 2019
    Copy the full SHA
    461d5db View commit details

  3. nvidia_x11: 435.21 -> 440.36 

    (cherry picked from commit b05e2c0)

Fixes: #74890
Fixes: 63c756d ('linux: 5.3.14 -> 5.4.1')
    @eadwu @veprbl
    eadwu authored and veprbl committed Dec 3, 2019
    Copy the full SHA
    559d28d View commit details

  4. zsh-powerlevel9k: 2017-11-10 -> v0.6.7

    @mtetreault @worldofpeace
    mtetreault authored and worldofpeace committed Dec 3, 2019
    Copy the full SHA
    dd662bd View commit details

  5. Merge pull request #74889 from mtetreault/mte/zsh 

    zsh-powerlevel9k: 2017-11-10 -> v0.6.7
    @worldofpeace
    worldofpeace authored Dec 3, 2019
    Copy the full SHA
    f3fa5a1 View commit details
Showing with 15 additions and 15 deletions.
  1. +2 −2 pkgs/applications/kde/spectacle.nix
  2. +8 −8 pkgs/os-specific/linux/nvidia-x11/default.nix
  3. +5 −5 pkgs/shells/zsh/zsh-powerlevel9k/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/kde/spectacle.nix
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
ki18n, xcb-util-cursor,
kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins,
knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi,
qtx11extras, knewstuff, qttools
qtx11extras, knewstuff, kwayland, qttools
}:

mkDerivation {
@@ -14,7 +14,7 @@ mkDerivation {
buildInputs = [
kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras xcb-util-cursor
knewstuff
knewstuff kwayland
];
postPatch = ''
substituteInPlace desktop/org.kde.spectacle.desktop \
16 changes: 8 additions & 8 deletions pkgs/os-specific/linux/nvidia-x11/default.nix
View file
Original file line number Diff line number Diff line change
@@ -20,18 +20,18 @@ if ((!lib.versionOlder args.version "391")
in
rec {
# Policy: use the highest stable version as the default (on our master).
stable = if stdenv.hostPlatform.system == "x86_64-linux" then stable_43x else legacy_390;
stable = if stdenv.hostPlatform.system == "x86_64-linux"
then generic {
version = "440.36";
sha256_64bit = "0nbdldwizb802w4x0rqnyb1p7iqz5nqiahqr534n5ihz21a6422h";
settingsSha256 = "07hnl3bq76vsl655ipfx9v4zxjq0nc5hp43dk49nny4pi6ly06p1";
persistencedSha256 = "08zm1i5sax16xfhkivkmady0yy5argmxv846x21q98ry1ic6cp6w";
}
else legacy_390;

# No active beta right now
beta = stable;

stable_43x = generic {
version = "435.21";
sha256_64bit = "0v3pq677ab01qdmwl5dawk8hn39qlwj05p8s9qzh9irmrlnc1izs";
settingsSha256 = "1p13cz79kncwx5067a3d7dbz6a1ibp611zynp1qdxpa65hwp2pxa";
persistencedSha256 = "0br8znxhz2ryzdj0j4jhqzvdgw9h899q8yz0p9429xz4wxkavgdr";
};

# Last one supporting x86
legacy_390 = generic {
version = "390.129";
10 changes: 5 additions & 5 deletions pkgs/shells/zsh/zsh-powerlevel9k/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,14 +3,14 @@
# To make use of this derivation, use
# `programs.zsh.promptInit = "source ${pkgs.zsh-powerlevel9k}/share/zsh-powerlevel9k/powerlevel9k.zsh-theme";`

stdenv.mkDerivation {
stdenv.mkDerivation rec{
pname = "powerlevel9k";
version = "2017-11-10";
version = "0.6.7";
src = fetchFromGitHub {
owner = "bhilburn";
owner = "Powerlevel9k";
repo = "powerlevel9k";
rev = "87acc51acab3ed4fd33cda2386abed6f98c80720";
sha256 = "0v1dqg9hvycdkcvklg2njff97xwr8rah0nyldv4xm39r77f4yfvq";
rev = "v${version}";
sha256 = "1pyg3dzr715bcm7yqanfh682yclvnb0hm6ld1x3jqx2hddqzs2js";
};

installPhase= ''