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: 27accf380b48
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: 055e5b391a06
Choose a head ref
  • 4 commits
  • 2 files changed
  • 4 contributors

Commits on Jan 20, 2020

  1. xss-lock: use fork with session param support 

    xss-lock uses current session that cannot be overriden. This prevents starting
xss-lock as systemd user service, as described here:
https://bitbucket.org/raymonad/xss-lock/issues/13/allow-operation-as-systemd-user-unit

This change uses source from github.com/xdbob/xss-lock that adds `--session`
parameter.
    @offlinehacker
    offlinehacker committed Jan 20, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Moredread André-Patrick Bubel
    GPG key ID: 28925CBA8869FF29
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d0a3a80 View commit details

Commits on Jan 22, 2020

  1. lxqt.screengrab: 1.101 -> 2.0.0

    @romildo
    romildo committed Jan 22, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Moredread André-Patrick Bubel
    GPG key ID: 28925CBA8869FF29
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    01dd056 View commit details

Commits on Jan 23, 2020

  1. Merge pull request #78059 from xtruder/pkgs/xss-lock/session-param 

    xss-lock: add patch to allow setting session
    @offlinehacker
    offlinehacker authored Jan 23, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Moredread André-Patrick Bubel
    GPG key ID: 28925CBA8869FF29
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3ff9f5c View commit details

  2. Merge pull request #78325 from romildo/upd.screengrab 

    lxqt.screengrab: 1.101 -> 2.0.0
    @jagajaga
    jagajaga authored Jan 23, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    stigtsp Stig
    GPG key ID: DA4C335C11D70DA7
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    055e5b3 View commit details
Showing with 11 additions and 10 deletions.
  1. +3 −3 pkgs/desktops/lxqt/screengrab/default.nix
  2. +8 −7 pkgs/misc/screensavers/xss-lock/default.nix
6 changes: 3 additions & 3 deletions pkgs/desktops/lxqt/screengrab/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

mkDerivation rec {
pname = "screengrab";
version = "1.101";
version = "2.0.0";

src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "111gnkhp77qkch7xqr7k3h8zrg4871gapyd4vvlpaj0gjhirjg6h";
sha256 = "1syvdqq45dr8hwigl9ax1wxr33m8z23nh6xzzlqbflyyd93xzjmn";
};

nativeBuildInputs = [
@@ -30,7 +30,7 @@ mkDerivation rec {

meta = with lib; {
description = "Crossplatform tool for fast making screenshots";
homepage = https://github.com/lxqt/screengrab;
homepage = "https://github.com/lxqt/screengrab";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
15 changes: 8 additions & 7 deletions pkgs/misc/screensavers/xss-lock/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
{ stdenv, fetchgit, cmake, docutils, pkgconfig, glib, libpthreadstubs
{ stdenv, fetchFromGitHub, cmake, docutils, pkgconfig, glib, libpthreadstubs
, libXau, libXdmcp, xcbutil }:

stdenv.mkDerivation {
name = "xss-lock-git-2014-03-02";
name = "xss-lock-git-2018-05-31";

src = fetchgit {
url = https://bitbucket.org/raymonad/xss-lock.git;
rev = "1e158fb20108058dbd62bd51d8e8c003c0a48717";
sha256 = "10hx7k7ga8g08akwz8qrsvj8iqr5nd4siiva6sjx789jvf0sak7r";
src = fetchFromGitHub {
owner = "xdbob";
repo = "xss-lock";
rev = "cd0b89df9bac1880ea6ea830251c6b4492d505a5";
sha256 = "040nqgfh564frvqkrkmak3x3h0yadz6kzk81jkfvd9vd20a9drh7";
};

nativeBuildInputs = [ pkgconfig ];
@@ -17,7 +18,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "Use external locker (such as i3lock) as X screen saver";
license = licenses.mit;
maintainers = with maintainers; [ malyn ];
maintainers = with maintainers; [ malyn offline ];
platforms = platforms.linux;
};
}