diff options
author | Pascal Wittmann <mail@pascal-wittmann.de> | 2018-08-09 13:10:27 +0200 |
---|---|---|
committer | Pascal Wittmann <mail@pascal-wittmann.de> | 2018-08-09 13:10:27 +0200 |
commit | af8cd3c74e80ff532b17568039ecc4f143992813 (patch) | |
tree | 58f3d9e423eec59b42a6a7533a094fabeeb17c12 /pkgs/applications/window-managers | |
parent | 8915ed06b30f6d48d99d0d9d2bc713b40a8db063 (diff) | |
parent | 1d4de0d552ae9aa66a5b8dee5fb0650a4372d148 (diff) | |
download | nixpkgs-af8cd3c74e80ff532b17568039ecc4f143992813.tar nixpkgs-af8cd3c74e80ff532b17568039ecc4f143992813.tar.gz nixpkgs-af8cd3c74e80ff532b17568039ecc4f143992813.tar.bz2 nixpkgs-af8cd3c74e80ff532b17568039ecc4f143992813.tar.lz nixpkgs-af8cd3c74e80ff532b17568039ecc4f143992813.tar.xz nixpkgs-af8cd3c74e80ff532b17568039ecc4f143992813.tar.zst nixpkgs-af8cd3c74e80ff532b17568039ecc4f143992813.zip |
Merge branch 'master' into add-missing-licenses
Conflicts: pkgs/applications/version-management/subversion/default.nix
Diffstat (limited to 'pkgs/applications/window-managers')
-rw-r--r-- | pkgs/applications/window-managers/dwm/dwm-status.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/window-managers/qtile/default.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index 9f1e565d166..bf2ab8bbdbe 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -3,19 +3,19 @@ rustPlatform.buildRustPackage rec { name = "dwm-status-${version}"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "Gerschtli"; repo = "dwm-status"; rev = version; - sha256 = "0k6r72qgns8i2y1ks0k9fwlabgndww5rssd13mis5bvkqla8j9i9"; + sha256 = "1nyi0p9snx9hddb4hliihskj4gdp933xs0f8kydyiprckikwiyjk"; }; nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ dbus gdk_pixbuf libnotify xorg.libX11 ]; - cargoSha256 = "13ibcbk8shfajk200d8v2p6y3zfrz5dlvxqfw1zsm630s5dmy6qx"; + cargoSha256 = "1ngdzzxnv4y6xprmkawf6s2696zgwiwgb6ykj5adb4knlx5c634d"; postInstall = lib.optionalString enableAlsaUtils '' wrapProgram $out/bin/dwm-status \ diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index ba304ad0c81..be51a5c46bf 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -7,13 +7,13 @@ in python27Packages.buildPythonApplication rec { name = "qtile-${version}"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "qtile"; repo = "qtile"; rev = "v${version}"; - sha256 = "1jw6mh9m5yrijhm218lc51sc89lc2ihvyx30jhrkxy2mzllhjgrs"; + sha256 = "0ynmmnh12mr3gwgz0j7l2hvm8c0y5gzsw80jszdkp4s5bh1q0nrj"; }; patches = [ |