Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 98215e4553c7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6d1dbdcee0cb
Choose a head ref
  • 6 commits
  • 6 files changed
  • 3 contributors

Commits on Mar 2, 2019

  1. xsecurelock: Added missing X11 buildInputs 

    According to xsecurelock's configure.ac file, each of the add
dependencies are used to:

- libXrandr: XRandR provides information about monitor layouts and is
strongly recommended on systems which can use more than one monitor
(which includes most laptops).
- libXext: The X Synchronization extension is used to get per-device idle
times. Used by until_nonidle only.
- libXScrnSaver: The X11 Screen Saver extension is used to turn off the
screen saver when X11 handles screen blanking (e.g. via timeout) anyway.
Saves CPU power.

Adding libXrandr fixes an issue where locking a screen in a multi
monitor setup results in the prompt information to not be in the middle
of the screen. The other dependencies are not tested if they fixed
something, however since upstream recommends than I think it is fair to
include them also.

(cherry picked from commit d2d7fed)
    @thiagokokada @fpletz
    thiagokokada authored and fpletz committed Mar 2, 2019
    Copy the full SHA
    8850144 View commit details

  2. brave: 0.59.35 -> 0.60.45 

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

(cherry picked from commit edccde3)
    @r-ryantm @fpletz
    r-ryantm authored and fpletz committed Mar 2, 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
    886028a View commit details

  3. xmr-stak: 2.8.2 -> 2.8.3 

    (cherry picked from commit df77847)
    @fpletz
    fpletz committed Mar 2, 2019
    Copy the full SHA
    36e4406 View commit details

  4. youtubeDL: 2019.02.18 -> 2019.03.01 

    (cherry picked from commit 86199e0)
    @fpletz
    fpletz committed Mar 2, 2019
    Copy the full SHA
    aed9b9d View commit details

  5. xmrig: 2.11.0 -> 2.13.1 

    (cherry picked from commit 63bd0d5)
    @fpletz
    fpletz committed Mar 2, 2019
    Copy the full SHA
    3351ceb View commit details

  6. smcroute: 2.4.3 -> 2.4.4 

    (cherry picked from commit 81b6dd7)
    @fpletz
    fpletz committed Mar 2, 2019
    Copy the full SHA
    6d1dbdc View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/misc/xmr-stak/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,13 +12,13 @@ in

stdenv'.mkDerivation rec {
name = "xmr-stak-${version}";
version = "2.8.2";
version = "2.8.3";

src = fetchFromGitHub {
owner = "fireice-uk";
repo = "xmr-stak";
rev = "${version}";
sha256 = "0z0fdh5fmiisx5dgfyyin3ddl8g28fpd64gn8nl8dd6sf3iw8z7p";
sha256 = "1yanyaz6gh5wbccj9mfd39pyrg69gb4jn6sjvx1k63pkjrwr2ap3";
};

NIX_CFLAGS_COMPILE = "-O3";
4 changes: 2 additions & 2 deletions pkgs/applications/misc/xmrig/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@

stdenv.mkDerivation rec {
name = "xmrig-${version}";
version = "2.11.0";
version = "2.13.1";

src = fetchFromGitHub {
owner = "xmrig";
repo = "xmrig";
rev = "v${version}";
sha256 = "0k897lx60gjf464j2ndindxhr6x3l90fv81bcqyglsv47danivlc";
sha256 = "1s6hz9r0079r9sd1wgd1nm6wn1dmix4smz7174g9a29z2zcqr160";
};

nativeBuildInputs = [ cmake ];
4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/brave/default.nix
View file
Original file line number Diff line number Diff line change
@@ -76,11 +76,11 @@ let rpath = lib.makeLibraryPath [

in stdenv.mkDerivation rec {
pname = "brave";
version = "0.59.35";
version = "0.60.45";

src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
sha256 = "0z0fmgmfayappncixrnz7g42mcrm907lsvgynbklq2gjcxpsfp8k";
sha256 = "0c3jfiswbma53lkngndqrcagvhld7q7hqhk9wpm4r6z9y1kskjwy";
};

dontConfigure = true;
4 changes: 2 additions & 2 deletions pkgs/servers/smcroute/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
name = "smcroute-${version}";
version = "2.4.3";
version = "2.4.4";

src = fetchFromGitHub {
owner = "troglobit";
repo = "smcroute";
rev = version;
sha256 = "1bdz3dic12lwl3rfczd9bxpgjbpw2g7yap2zddz6dvgkqvyjjf1h";
sha256 = "0mjq9cx093b0825rqbcq3z0lzy81pd8h0fz6rda6npg3604rxj81";
};

nativeBuildInputs = [ autoreconfHook pkgconfig ];
8 changes: 4 additions & 4 deletions pkgs/tools/X11/xsecurelock/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
, libX11, libXcomposite, libXft, libXmu, pam, apacheHttpd, imagemagick
, pamtester, xscreensaver, xset }:
, libX11, libXcomposite, libXft, libXmu, libXrandr, libXext, libXScrnSaver
, pam, apacheHttpd, imagemagick, pamtester, xscreensaver, xset }:

stdenv.mkDerivation rec {
name = "xsecurelock-${version}";
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
autoreconfHook pkgconfig
];
buildInputs = [
libX11 libXcomposite libXft libXmu pam
apacheHttpd imagemagick pamtester
libX11 libXcomposite libXft libXmu libXrandr libXext libXScrnSaver
pam apacheHttpd imagemagick pamtester
];

configureFlags = [
4 changes: 2 additions & 2 deletions pkgs/tools/misc/youtube-dl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -19,11 +19,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
version = "2019.02.18";
version = "2019.03.01";

src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
sha256 = "1sr0f6ixpaqyp3cf29zswx84y3nfabwnk3sljcgvgnmjp73zzfv1";
sha256 = "0bxk6adyppdv50jnp5cika8wc6wfgd6d8zbg1njgmcs1pxskllmf";
};

nativeBuildInputs = [ makeWrapper ];