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: 82eade85f8ec
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: ca0a44d30419
Choose a head ref
  • 7 commits
  • 6 files changed
  • 4 contributors

Commits on May 1, 2019

  1. virtualbox: 5.2.26 → 5.2.28 

    (cherry picked from commit ea29d81)
    @artemist @flokli
    artemist authored and flokli committed May 1, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    NeQuissimus Tim Steinbach
    GPG key ID: 472BFCCA96BD0EDA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4621394 View commit details

  2. masterpdfeditor: 5.2.20 -> 5.3.22 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/masterpdfeditor/versions

(cherry picked from commit 7f1a7b1)
    @r-ryantm @flokli
    r-ryantm authored and flokli committed May 1, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    NeQuissimus Tim Steinbach
    GPG key ID: 472BFCCA96BD0EDA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9b3b4c7 View commit details

  3. masterpdfeditor: 5.3.22 -> 5.4.04 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/masterpdfeditor/versions

(cherry picked from commit 48b138b)
    @r-ryantm @flokli
    r-ryantm authored and flokli committed May 1, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    NeQuissimus Tim Steinbach
    GPG key ID: 472BFCCA96BD0EDA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    92e2d8b View commit details

  4. masterpdfeditor: 5.4.04 -> 5.4.10 

    (cherry picked from commit 314e06b)
    @flokli
    flokli committed May 1, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d740b2e View commit details

  5. pantheon.switchboard-plug-display: 2.1.7 -> 2.1.8 

    Just translations

https://github.com/elementary/switchboard-plug-display/releases/tag/2.1.8
(cherry picked from commit e9fca99)
    @worldofpeace
    worldofpeace committed May 1, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6d0332f View commit details

  6. pantheon.wingpanel: 2.2.3 -> 2.2.4 

    https://github.com/elementary/wingpanel/releases/tag/2.2.4
(cherry picked from commit 0b39de4)
    @worldofpeace
    worldofpeace committed May 1, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    65adcb9 View commit details

  7. [19.03] virtualbox: 5.2.26 -> 5.2.28 (#60635) 

    [19.03] virtualbox: 5.2.26 -> 5.2.28
    @flokli
    flokli authored May 1, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ca0a44d View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/misc/masterpdfeditor/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, sane-backends, qtbase, qtsvg, nss, autoPatchelfHook, lib, makeWrapper }:

let
version = "5.2.20";
version = "5.4.10";

in stdenv.mkDerivation {
name = "masterpdfeditor-${version}";

src = fetchurl {
url = "https://code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz";
sha256 = "1399zv3m7a2rxvmy213f5yii3krsqyahpwdzsw8j535xrb9f3z1m";
sha256 = "1902ahb2g9xanrip1n0ihr31az8sv9fsvzddnzf70kbwlfclnqf7";
};

nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
4 changes: 2 additions & 2 deletions pkgs/applications/virtualization/virtualbox/default.nix
View file
Original file line number Diff line number Diff line change
@@ -21,8 +21,8 @@ let
buildType = "release";
# Remember to change the extpackRev and version in extpack.nix and
# guest-additions/default.nix as well.
main = "0rylf1g0vmv0q19iyvyq4dj5h9yvyqqnmmqaqrx93qrv8s1ybssd";
version = "5.2.26";
main = "0jmrbyhs92lyarpvylxqn2ajxdg9b290w5nd4g0i4h83d28bwbw0";
version = "5.2.28";
in stdenv.mkDerivation {
name = "virtualbox-${version}";

4 changes: 2 additions & 2 deletions pkgs/applications/virtualization/virtualbox/extpack.nix
View file
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

with lib;

let version = "5.2.26";
let version = "5.2.28";
in
fetchurl rec {
name = "Oracle_VM_VirtualBox_Extension_Pack-${version}.vbox-extpack";
url = "https://download.virtualbox.org/virtualbox/${version}/${name}";
sha256 =
# Manually sha256sum the extensionPack file, must be hex!
# Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.
let value = "4b7caa9b722840d49f154c3e5efb6463b1b7129f09973a25813dfdbccd9debb7";
let value = "376e07cbf2ff2844c95c800346c8e4697d7bc671ae0e21e46153b2e7b4ccc1d6";
in assert (builtins.stringLength value) == 64; value;

meta = {
2 changes: 1 addition & 1 deletion pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
View file
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ stdenv.mkDerivation {

src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
sha256 = "0f3w9wjd5aj2khzqh37vdg86wqbbx4gx9aidaai9syn9sk8ca9xr";
sha256 = "0cwdmdgcd1jysyw7c9b3cdk1ngk5nq7slh1zkhxkvvq142cnm1v9";
};

KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
4 changes: 2 additions & 2 deletions pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@

stdenv.mkDerivation rec {
pname = "switchboard-plug-display";
version = "2.1.7";
version = "2.1.8";

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1icz1is576d2w5a6wc06bnkg2vbsj5g6mz0b6ikzyjddr6j743ql";
sha256 = "1xpgkvcv3bylpaj7c80727vr55vilkgjvnlbw7d5pr56v6mv7n9j";
};

passthru = {
4 changes: 2 additions & 2 deletions pkgs/desktops/pantheon/desktop/wingpanel/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@

stdenv.mkDerivation rec {
pname = "wingpanel";
version = "2.2.3";
version = "2.2.4";

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1kd1w3mxysg33niryrz5yp6fdayzjpg73ihvq7dlasj8ls5d0qyj";
sha256 = "17xl4l0znr91aj6kb9p0rswyii4gy8k16r9fvj7d96dd5szdp4mc";
};

passthru = {