diff options
| author | Orivej Desh <orivej@gmx.fr> | 2020-03-23 00:42:14 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2020-03-23 00:53:16 +0000 |
| commit | 1b89aa3f7a472cba32c0464046a904c0724d59b0 (patch) | |
| tree | 4a65acca5fee3353775f10a3679640ce06dffcb4 /pkgs/applications/window-managers | |
| parent | 805f6235df79936e96ab3cebe17aea0af9b1b197 (diff) | |
| parent | e1c308535442a95f8494d0dde12ff13e47276f64 (diff) | |
| download | nixpkgs-1b89aa3f7a472cba32c0464046a904c0724d59b0.tar nixpkgs-1b89aa3f7a472cba32c0464046a904c0724d59b0.tar.gz nixpkgs-1b89aa3f7a472cba32c0464046a904c0724d59b0.tar.bz2 nixpkgs-1b89aa3f7a472cba32c0464046a904c0724d59b0.tar.lz nixpkgs-1b89aa3f7a472cba32c0464046a904c0724d59b0.tar.xz nixpkgs-1b89aa3f7a472cba32c0464046a904c0724d59b0.tar.zst nixpkgs-1b89aa3f7a472cba32c0464046a904c0724d59b0.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/applications/window-managers')
| -rw-r--r-- | pkgs/applications/window-managers/i3/wk-switch.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/window-managers/wtftw/default.nix | 42 |
2 files changed, 3 insertions, 45 deletions
diff --git a/pkgs/applications/window-managers/i3/wk-switch.nix b/pkgs/applications/window-managers/i3/wk-switch.nix index 5b1cdbe05f5..98855517303 100644 --- a/pkgs/applications/window-managers/i3/wk-switch.nix +++ b/pkgs/applications/window-managers/i3/wk-switch.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "i3-wk-switch"; - version = "2019-05-10"; + version = "2020-03-18"; src = fetchFromGitHub { owner = "tmfink"; repo = pname; - rev = "05a2d5d35e9841d2a26630f1866fc0a0e8e708eb"; - sha256 = "0ln192abdqrrs7rdazp9acbji2y6pf68z2d1by4nf2q529dh24dc"; + rev = "a618cb8f52120aa8d533bb7c0c8de3ff13b3dc06"; + sha256 = "0ci0w5igjk5xa8x4rx17cpgmdkamwjmavxhp0vp6213cl93ybjhz"; }; propagatedBuildInputs = with python3Packages; [ i3ipc ]; diff --git a/pkgs/applications/window-managers/wtftw/default.nix b/pkgs/applications/window-managers/wtftw/default.nix deleted file mode 100644 index febe16dd349..00000000000 --- a/pkgs/applications/window-managers/wtftw/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, fetchFromGitHub, rustPlatform, libXinerama, libX11, pkgconfig }: - -rustPlatform.buildRustPackage { - name = "wtftw-0.0pre20170921"; - src = fetchFromGitHub { - owner = "kintaro"; - repo = "wtftw"; - rev = "13712d4c051938520b90b6639d4ff813f6fe5f48"; - sha256 = "1r74nhcwiy2rmifzjhdal3jcqz4jz48nfvhdyw4gasa6nxp3msdl"; - }; - - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "18lb24k71sndklbwwhbv8jglj2d4y9mdk07l60wsvn5m2jbnpckk"; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libXinerama libX11 ]; - libPath = stdenv.lib.makeLibraryPath [ libXinerama libX11 ]; - - preInstall = '' - cargo update - ''; - - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/share/xsessions - cp -p target/release/wtftw $out/bin/ - echo "[Desktop Entry] - Name=wtftw - Exec=$out/bin/wtftw - Type=XSession - DesktopName=wtftw" > $out/share/xsessions/wtftw.desktop - ''; - - meta = with stdenv.lib; { - broken = true; - description = "A tiling window manager in Rust"; - homepage = https://github.com/Kintaro/wtftw; - license = stdenv.lib.licenses.bsd3; - }; -} |