public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse Source 
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
This commit is contained in:
Vladimír Čunát
2019-08-24 08:55:37 +02:00
parent 84a91208a9 8943fb5f24
commit 2e6bf42a22
865 changed files with 29587 additions and 14316 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/window-managers/sxhkd/default.nix
+2 -2
View File
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "sxhkd";
version = "0.6.0";
version = "0.6.1";
src = fetchFromGitHub {
owner = "baskerville";
repo = "sxhkd";
rev = version;
sha256 = "1cz4vkm7fqd51ly9qjkf5q76kdqdzfhaajgvrs4anz5dyzrdpw68";
sha256 = "0j7bl2l06r0arrjzpz7al9j6cwzc730knbsijp7ixzz96pq7xa2h";
};
buildInputs = [ asciidoc libxcb xcbutil xcbutilkeysyms xcbutilwm ];