diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-02 09:39:00 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-02 09:39:00 +0200 |
| commit | afb1041148b930750c769e1034804effaef2b823 (patch) | |
| tree | 2b474956a7c41fb38f3f6ee2822ac843a1f8e8d4 /pkgs/os-specific | |
| parent | 00bbfccecf90f21b873d90bfeb3b81d7de79cf80 (diff) | |
| parent | 309711c4b4b665f47876f2a113d3872237467784 (diff) | |
| download | nixlib-afb1041148b930750c769e1034804effaef2b823.tar nixlib-afb1041148b930750c769e1034804effaef2b823.tar.gz nixlib-afb1041148b930750c769e1034804effaef2b823.tar.bz2 nixlib-afb1041148b930750c769e1034804effaef2b823.tar.lz nixlib-afb1041148b930750c769e1034804effaef2b823.tar.xz nixlib-afb1041148b930750c769e1034804effaef2b823.tar.zst nixlib-afb1041148b930750c769e1034804effaef2b823.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/darwin/yabai/default.nix | 32 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing.nix | 4 |
2 files changed, 34 insertions, 2 deletions
diff --git a/pkgs/os-specific/darwin/yabai/default.nix b/pkgs/os-specific/darwin/yabai/default.nix new file mode 100644 index 000000000000..aa10a3a20f74 --- /dev/null +++ b/pkgs/os-specific/darwin/yabai/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, Carbon, Cocoa, ScriptingBridge }: + +stdenv.mkDerivation rec { + pname = "yabai"; + version = "2.4.3"; + + src = fetchFromGitHub { + owner = "koekeishiya"; + repo = pname; + rev = "v${version}"; + sha256 = "1a6pqms5kwdsvr9vcshfa000xf2f5a2qbp5qapx0b3wzclnchjbn"; + }; + + buildInputs = [ Carbon Cocoa ScriptingBridge ]; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/man/man1/ + cp ./bin/yabai $out/bin/yabai + cp ./doc/yabai.1 $out/share/man/man1/yabai.1 + ''; + + meta = with stdenv.lib; { + description = '' + A tiling window manager for macOS based on binary space partitioning + ''; + homepage = https://github.com/koekeishiya/yabai; + platforms = platforms.darwin; + maintainers = [ maintainers.cmacrae ]; + license = licenses.mit; + }; +} diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 9e2ccaeae2b2..05617f869174 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.7-rc2"; + version = "5.7-rc3"; extraMeta.branch = "5.7"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "06h7lrif84gyzblrdgg4cirsr2v69sdbymwkk89nr3gc87hnjlvs"; + sha256 = "0gq4bdzz2px85l3fa9dq3jh3lp4c9kgph4njq6yxf9g3h0ifq7c6"; }; # Should the testing kernels ever be built on Hydra? |