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: eb8f8180d8f6
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: 7952807791da
Choose a head ref
  • 4 commits
  • 4 files changed
  • 3 contributors

Commits on Oct 12, 2019

  1. vscodium: 1.38.1 -> 1.39.1 

    (cherry picked from commit 340b252)
    @eadwu @worldofpeace
    eadwu authored and worldofpeace committed Oct 12, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    renovate-bot Mend Renovate
    GPG key ID: 81C63AE1C224182B
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a2b8b19 View commit details

  2. qtstyleplugin-kvantum: use wrapQtAppsHook 

    Shouldn't be needed for the style engine itself to work, but it is
needed for `kvantummanager` and `kvantumpreview`.

(cherry picked from commit 30360cb)
    @Shados @worldofpeace
    Shados authored and worldofpeace committed Oct 12, 2019
    Copy the full SHA
    a465b1f View commit details

  3. qtstyleplugin-kvantum{,-qt4}: 0.11.0 -> 0.11.2 

    (cherry picked from commit e89f861)
    @Shados @worldofpeace
    Shados authored and worldofpeace committed Oct 12, 2019

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

  4. newsboat - unmark as broken 

    newsboat builds fine on master/19.09
thus this commit should also be backported

https://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.newsboat.x86_64-linux#tabs-status
(cherry picked from commit fb60d59)
    @paumr @infinisil
    paumr authored and infinisil committed Oct 12, 2019
    Copy the full SHA
    7952807 View commit details
6 changes: 3 additions & 3 deletions pkgs/applications/editors/vscode/vscodium.nix
View file
Original file line number Diff line number Diff line change
@@ -11,13 +11,13 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";

sha256 = {
x86_64-linux = "15m7mfb8gmx3pwydc37blj0rxwgmkrnqfj6y79rpqlr2dg92gwlb";
x86_64-darwin = "080k4fnfa5ylmmya6zprgci3gld9mrbqsfnk53hgcny91ykl5xj5";
x86_64-linux = "1vhrfz36ay67laa5159jcnxyl4prgm8v1mp6anv1s7bppazigg2n";
x86_64-darwin = "0cxsl0qpk223khndfwwgxl8az4rz4ap657yrkvws9bh8k4vv473h";
}.${system};
in
callPackage ./generic.nix rec {

version = "1.38.1";
version = "1.39.1";
pname = "vscodium";

executableName = "codium";
1 change: 0 additions & 1 deletion pkgs/applications/networking/feedreaders/newsboat/default.nix
View file
Original file line number Diff line number Diff line change
@@ -53,6 +53,5 @@ rustPlatform.buildRustPackage rec {
maintainers = with maintainers; [ dotlambda nicknovitski ];
license = licenses.mit;
platforms = platforms.unix;
broken = true;
};
}
4 changes: 2 additions & 2 deletions pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "qtstyleplugin-kvantum-qt4";
version = "0.11.0";
version = "0.11.2";

src = fetchFromGitHub {
owner = "tsujan";
repo = "Kvantum";
rev = "V${version}";
sha256 = "0aqlv7mj7r9vjm6pvb8pv3cyx35lgz8rjjas3k8wfdr3sqyyy25g";
sha256 = "1jcfv96ws6sm3kc2q8zriwqhry24qbq3zbp8gkqw75wssbv82rmc";
};

nativeBuildInputs = [ qmake4Hook ];
16 changes: 11 additions & 5 deletions pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,24 @@
{ stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, kwindowsystem, libX11, libXext, qttools }:
{ stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, kwindowsystem
, libX11, libXext, qttools, wrapQtAppsHook
}:

stdenv.mkDerivation rec {
pname = "qtstyleplugin-kvantum";
version = "0.11.0";
version = "0.11.2";

src = fetchFromGitHub {
owner = "tsujan";
repo = "Kvantum";
rev = "V${version}";
sha256 = "0aqlv7mj7r9vjm6pvb8pv3cyx35lgz8rjjas3k8wfdr3sqyyy25g";
sha256 = "1jcfv96ws6sm3kc2q8zriwqhry24qbq3zbp8gkqw75wssbv82rmc";
};

nativeBuildInputs = [ qmake qttools ];
buildInputs = [ qtbase qtsvg qtx11extras kwindowsystem libX11 libXext ];
nativeBuildInputs = [
qmake qttools wrapQtAppsHook
];
buildInputs = [
qtbase qtsvg qtx11extras kwindowsystem libX11 libXext
];

sourceRoot = "source/Kvantum";