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

Merge remote-tracking branch 'origin/staging' into mb-cross-fixes-march-2020

Browse Source
This commit is contained in:
Matthew Bauer
2020-03-16 14:34:03 -04:00
parent e9c2957c14 b8cff61c33
commit 67b0ddf3f3
765 changed files with 16014 additions and 9655 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/window-managers/dwm/dwm-status.nix
+1 -4
View File
@@ -21,10 +21,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ makeWrapper pkgconfig ];
buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ];
# Delete this on next update; see #79975 for details
legacyCargoFetcher = true;
cargoSha256 = "0l6x59bzzilc78gsi5rlgq9zjvp8qjphfsds776ljzmkbdq8q4iz";
cargoSha256 = "0xybd6110b29ghl66kxfs64704qlhnn9jb5vl7lfk9sv62cs564i";
postInstall = lib.optionalString (bins != []) ''
wrapProgram $out/bin/dwm-status --prefix "PATH" : "${stdenv.lib.makeBinPath bins}"
pkgs/applications/window-managers/i3/lock-color.nix
+3 -3
View File
@@ -4,14 +4,14 @@
}:
stdenv.mkDerivation rec {
version = "2.12.c";
version = "2.12.c.1";
pname = "i3lock-color";
src = fetchFromGitHub {
owner = "PandorasFox";
repo = "i3lock-color";
rev = version;
sha256 = "08fhnchf187b73h52xgzb86g6byzxz085zs9galsvl687g5zxk34";
sha256 = "1q09cfgkikqbrkk1kljg8dsgbs5nacixhdqaww18h94hmlnbbssc";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
- clock: time/date with configurable format
- keyboard-layout
'';
homepage = https://github.com/PandorasFox/i3lock-color;
homepage = "https://github.com/PandorasFox/i3lock-color";
maintainers = with maintainers; [ malyn ];
license = licenses.bsd3;
pkgs/applications/window-managers/i3/wmfocus.nix
+7 -10
View File
@@ -1,21 +1,18 @@
{ stdenv, fetchFromGitHub, rustPlatform,
xorg, python3, pkgconfig, cairo, libxkbcommon }:
{ stdenv, fetchFromGitHub, rustPlatform
, xorg, python3, pkgconfig, cairo, libxkbcommon }:
rustPlatform.buildRustPackage rec {
pname = "wmfocus";
version = "1.1.2";
version = "1.1.3";
src = fetchFromGitHub {
owner = "svenstaro";
repo = pname;
rev = version;
sha256 = "0jx0h2zyghs3bp4sg8f3vk5rkyprz2dqfqs0v72vmkp3cvgzxbvs";
sha256 = "17qdsqp9072yr7rcm6g1h620rff95ldawr8ldpkbjmkh0rc86skn";
};
# Delete this on next update; see #79975 for details
legacyCargoFetcher = true;
cargoSha256 = "1xmc28ns59jcmnv17102s2084baxqdvi0ibbyqwb108385qnixzf";
cargoSha256 = "1nsdvzrsgprwq7lsvfpymqslhggdzfk3840y8x92qjb0l2g4jhw1";
nativeBuildInputs = [ python3 pkgconfig ];
buildInputs = [ cairo libxkbcommon xorg.xcbutilkeysyms ];
@@ -27,9 +24,9 @@ rustPlatform.buildRustPackage rec {
meta = with stdenv.lib; {
description = "Visually focus windows by label";
homepage = "https://github.com/svenstaro/wmfocus";
license = licenses.mit;
maintainers = with maintainers; [ synthetica ];
platforms = platforms.linux;
license = licenses.mit;
homepage = https://github.com/svenstaro/wmfocus;
};
}
pkgs/applications/window-managers/leftwm/cargo-lock.patch
-13
View File
@@ -1,13 +0,0 @@
diff --git a/Cargo.lock b/Cargo.lock
index 915ab04..3d5956d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -370,7 +370,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "leftwm"
-version = "0.1.9"
+version = "0.1.10"
dependencies = [
"bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
"chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
pkgs/applications/window-managers/leftwm/default.nix
+23 -29
View File
@@ -1,41 +1,35 @@
{ stdenv, fetchFromGitHub, rustPlatform, libX11, libXinerama, makeWrapper }:
let
let
rpath = stdenv.lib.makeLibraryPath [ libXinerama libX11 ];
in
rustPlatform.buildRustPackage rec {
pname = "leftwm";
version = "0.1.10";
pname = "leftwm";
version = "0.2.2";
src = fetchFromGitHub {
owner = "leftwm";
repo = "leftwm";
rev = version;
sha256 = "190lc48clkh9vzlsfg2a70w405k7xyyw7avnxwna1glfwmbyy2ag";
};
src = fetchFromGitHub {
owner = "leftwm";
repo = "leftwm";
rev = version;
sha256 = "0x8cqc7zay19jxy7cshayjjwwjrcblqpmqrxipm2g5hhyjghk6q0";
};
buildInputs = [ makeWrapper libX11 libXinerama ];
cargoSha256 = "1kphv3vnr8ij7raf0niwz3rwly986xi5fgwqg2ya0r46ifqkgvrc";
postInstall = ''
wrapProgram $out/bin/leftwm --prefix LD_LIBRARY_PATH : "${rpath}"
wrapProgram $out/bin/leftwm-state --prefix LD_LIBRARY_PATH : "${rpath}"
wrapProgram $out/bin/leftwm-worker --prefix LD_LIBRARY_PATH : "${rpath}"
'';
buildInputs = [ makeWrapper libX11 libXinerama ];
# Delete this on next update; see #79975 for details
legacyCargoFetcher = true;
postInstall = ''
wrapProgram $out/bin/leftwm --prefix LD_LIBRARY_PATH : "${rpath}"
wrapProgram $out/bin/leftwm-state --prefix LD_LIBRARY_PATH : "${rpath}"
wrapProgram $out/bin/leftwm-worker --prefix LD_LIBRARY_PATH : "${rpath}"
'';
cargoSha256 = "0mpvfix7bvc84vanha474l4gaq97ac1zy5l77z83m9jg0246yxd6";
# patch wrong version in Cargo.lock
cargoPatches = [ ./cargo-lock.patch ];
meta = {
description = "Leftwm - A tiling window manager for the adventurer";
homepage = https://github.com/leftwm/leftwm;
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ mschneider ];
};
meta = with stdenv.lib; {
description = "Leftwm - A tiling window manager for the adventurer";
homepage = "https://github.com/leftwm/leftwm";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ mschneider ];
};
}