summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCole Mickens <cole.mickens@gmail.com>2019-04-14 02:54:19 -0700
committerCole Mickens <cole.mickens@gmail.com>2019-04-14 02:54:19 -0700
commit3ea778715117b72eed8e3068a3eeeb0c320590b4 (patch)
treeb92923e60a98b8d9cd5a4c665aa877d494d0996c
parent1dd1a6784a60f34696e43154bb964945fc42d6cb (diff)
updates
-rw-r--r--README.md22
-rw-r--r--default.nix2
-rw-r--r--nixpkgs/nixos-unstable/metadata.nix6
-rw-r--r--nixpkgs/nixpkgs-unstable/metadata.nix6
-rw-r--r--pkgs/gebaar-libinput/metadata.nix6
-rw-r--r--pkgs/i3status-rust/metadata.nix6
-rw-r--r--pkgs/mako/metadata.nix6
-rw-r--r--pkgs/sway/metadata.nix6
-rw-r--r--pkgs/swaylock/metadata.nix6
-rw-r--r--pkgs/waybar/metadata.nix6
-rw-r--r--pkgs/wayfire/metadata.nix6
-rw-r--r--pkgs/wf-recorder/default.nix5
-rw-r--r--pkgs/wf-recorder/metadata.nix6
-rw-r--r--pkgs/wlroots/metadata.nix6
14 files changed, 48 insertions, 47 deletions
diff --git a/README.md b/README.md
index 691da94..89225b3 100644
--- a/README.md
+++ b/README.md
@@ -15,29 +15,29 @@ Packages from this overlay are regularly updated and built against `nixos-unstab
<!--pkgs-->
| Attribute Name | Last Upstream Commit Time |
| -------------- | ------------------------- |
-| nixpkgs/nixos-unstable | [2019-03-22 09:15](https://github.com/nixos/nixpkgs-channels/commits/07b42ccf2de451342982b550657636d891c4ba35) |
-| nixpkgs/nixpkgs-unstable | [2019-03-23 10:23](https://github.com/nixos/nixpkgs-channels/commits/796a8764ab85746f916e2cc8f6a9a5fc6d4d03ac) |
-| pkgs/wlroots | [2019-03-27 17:31](https://github.com/swaywm/wlroots/commits/08454adadaa5db9f136531eddbe290a933a335bf) |
+| nixpkgs/nixos-unstable | [2019-04-04 17:44](https://github.com/nixos/nixpkgs-channels/commits/acbdaa569f4ee387386ebe1b9e60b9f95b4ab21b) |
+| nixpkgs/nixpkgs-unstable | [2019-04-06 09:03](https://github.com/nixos/nixpkgs-channels/commits/0c0954781e257b8b0dc49341795a2fe7d96945a3) |
+| pkgs/wlroots | [2019-04-13 16:31](https://github.com/swaywm/wlroots/commits/7a2f929201dfa8a939dae36476df2735386dad2b) |
| pkgs/xdg-desktop-portal-wlr | [2019-02-12 12:09](https://github.com/emersion/xdg-desktop-portal-wlr/commits/74ee43cf37e716d0119f441be96e2b3fc9838797) |
-| pkgs/sway | [2019-03-27 16:07](https://github.com/swaywm/sway/commits/bfdee1319ffc8a720d0536a752a19ba23615a1e2) |
+| pkgs/sway | [2019-04-14 09:41](https://github.com/swaywm/sway/commits/6961bf2e4ce2c116e41a8db158691f6c993707ce) |
| pkgs/swayidle | [2019-02-16 16:43](https://github.com/swaywm/swayidle/commits/3e392e31c0684854a9a145cda1bd9a44c99ef24d) |
-| pkgs/swaylock | [2019-03-20 21:07](https://github.com/swaywm/swaylock/commits/7d5a73b0a99ca9b4c73a34faceda8bef2576fe23) |
+| pkgs/swaylock | [2019-04-03 05:15](https://github.com/swaywm/swaylock/commits/98e5afe364776d06017579e14f972be6f65fbb8b) |
| pkgs/slurp | [2019-03-16 19:52](https://github.com/emersion/slurp/commits/92dc1ea1cf79541d157e98af3fb6aa4df501fef4) |
| pkgs/grim | [2019-02-20 13:18](https://github.com/emersion/grim/commits/6994df611f55a4089209fdd5ad8d9301e4fb0167) |
-| pkgs/mako | [2019-03-25 18:10](https://github.com/emersion/mako/commits/87170d5a3499225906a594f47557ea30e34662dd) |
+| pkgs/mako | [2019-04-13 08:58](https://github.com/emersion/mako/commits/22b42e85423e3dad19cea1876d39bf819d2b49d5) |
| pkgs/kanshi | [2019-02-02 23:21](https://github.com/emersion/kanshi/commits/970267e400c21a6bb51a1c80a0aadfd1e6660a7b) |
| pkgs/wlstream | [2018-07-15 21:10](https://github.com/atomnuker/wlstream/commits/182076a94562b128c3a97ecc53cc68905ea86838) |
| pkgs/oguri | [2019-02-19 14:19](https://github.com/vilhalmer/oguri/commits/59a51758f4b14f60113aad6ae4ebb92d80060ce5) |
-| pkgs/waybar | [2019-03-27 07:15](https://github.com/Alexays/waybar/commits/b17984f75e80f708afe7b45c444f3732adfc2aab) |
-| pkgs/wayfire | [2019-03-26 14:22](https://github.com/WayfireWM/wayfire/commits/784c3210500f5b7fad76ac710bf4bb3070e09833) |
+| pkgs/waybar | [2019-04-11 13:28](https://github.com/Alexays/waybar/commits/57c99dc52650374ac6d1b4f22ad00efb5bd64be7) |
+| pkgs/wayfire | [2019-03-29 09:21](https://github.com/WayfireWM/wayfire/commits/eefc5479db94f391c4260e320a79cdfe513f329f) |
| pkgs/wf-config | [2019-03-24 21:20](https://github.com/WayfireWM/wf-config/commits/a0504d822160c5fc69d3af9cf853e2cc2e5ce3e4) |
| pkgs/redshift-wayland | [2018-11-07 20:03](https://github.com/minus7/redshift/commits/420d0d534c9f03abc4d634a7d3d7629caf29b4b6) |
| pkgs/bspwc | [2018-12-29 23:21](https://github.com/Bl4ckb0ne/bspwc/commits/e72ff641bd30d3db153d879cea1cffd149931546) |
| pkgs/waybox | [2018-11-27 14:44](https://github.com/wizbright/waybox/commits/482d0a92f5530a5cbab8b0b913b653d4503015c4) |
| pkgs/wl-clipboard | [2019-02-12 15:59](https://github.com/bugaevc/wl-clipboard/commits/a60fba0fad8399071bd36dbd2fb8fe0ef4cf6f11) |
-| pkgs/wf-recorder | [2019-03-26 14:56](https://github.com/ammen99/wf-recorder/commits/e6073f5d9c85b5db53b6fc319569daf4e1f1f62c) |
-| pkgs/gebaar-libinput | [2019-03-27 09:41](https://github.com/Coffee2CodeNL/gebaar-libinput/commits/6e7341cc4e53929618eda0c9b21a77943e2b9ce8) |
-| pkgs/i3status-rust | [2019-03-21 12:58](https://github.com/greshake/i3status-rust/commits/18300e6b9259053b80c37aef56c958fe5f50062b) |
+| pkgs/wf-recorder | [2019-03-31 16:41](https://github.com/ammen99/wf-recorder/commits/bfae5d959c1d19d2d1cffbf1da7b70c4d05a64e6) |
+| pkgs/gebaar-libinput | [2019-04-05 13:27](https://github.com/Coffee2CodeNL/gebaar-libinput/commits/c18c8bd73e79aaf1211bd88bf9cff808273cf6d6) |
+| pkgs/i3status-rust | [2019-04-10 19:31](https://github.com/greshake/i3status-rust/commits/559d231caa574ddc665a7828fdef546e0429351b) |
<!--pkgs-->
</details>
diff --git a/default.nix b/default.nix
index b515445..5daec84 100644
--- a/default.nix
+++ b/default.nix
@@ -19,7 +19,7 @@ waylandPkgs = rec {
oguri = pkgs.callPackage ./pkgs/oguri {};
waybar = pkgs.callPackage ./pkgs/waybar {};
wf-config = pkgs.callPackage ./pkgs/wf-config {};
- wayfire = pkgs.callPackage ./pkgs/wayfire {};
+ wayfire = pkgs.callPackage ./pkgs/wayfire { wlroots = pkgs.wlroots; };
redshift-wayland = pkgs.callPackage ./pkgs/redshift-wayland {
inherit (pkgs.python3Packages) python pygobject3 pyxdg wrapPython;
geoclue = pkgs.geoclue2;
diff --git a/nixpkgs/nixos-unstable/metadata.nix b/nixpkgs/nixos-unstable/metadata.nix
index 74e15f6..729ddb8 100644
--- a/nixpkgs/nixos-unstable/metadata.nix
+++ b/nixpkgs/nixos-unstable/metadata.nix
@@ -1,5 +1,5 @@
{
- rev = "07b42ccf2de451342982b550657636d891c4ba35";
- sha256 = "1a7ga18pwq0y4p9r787622ry8gssw1p6wsr5l7dl8pqnj1hbbzwh";
- revdate = "2019-03-22T09:15:26Z";
+ rev = "acbdaa569f4ee387386ebe1b9e60b9f95b4ab21b";
+ sha256 = "0xzyghyxk3hwhicgdbi8yv8b8ijy1rgdsj5wb26y5j322v96zlpz";
+ revdate = "2019-04-04T17:44:54Z";
}
diff --git a/nixpkgs/nixpkgs-unstable/metadata.nix b/nixpkgs/nixpkgs-unstable/metadata.nix
index 1755e17..2f11d19 100644
--- a/nixpkgs/nixpkgs-unstable/metadata.nix
+++ b/nixpkgs/nixpkgs-unstable/metadata.nix
@@ -1,5 +1,5 @@
{
- rev = "796a8764ab85746f916e2cc8f6a9a5fc6d4d03ac";
- sha256 = "1m57gsr9r96gip2wdvdzbkj8zxf47rg3lrz35yi352x1mzj3by3x";
- revdate = "2019-03-23T10:23:23Z";
+ rev = "0c0954781e257b8b0dc49341795a2fe7d96945a3";
+ sha256 = "05fq11wg8mik4zvfjy2gap59r8n0gfbklsw61r45wlqi7a2zsl0y";
+ revdate = "2019-04-06T09:03:29Z";
}
diff --git a/pkgs/gebaar-libinput/metadata.nix b/pkgs/gebaar-libinput/metadata.nix
index 3165190..e2e1d20 100644
--- a/pkgs/gebaar-libinput/metadata.nix
+++ b/pkgs/gebaar-libinput/metadata.nix
@@ -1,5 +1,5 @@
{
- rev = "6e7341cc4e53929618eda0c9b21a77943e2b9ce8";
- sha256 = "0al2f504v03zcn8w9yvi7rc1c27lskl3lnza1c1f67mb7qsqqvv0";
- revdate = "2019-03-27T09:41:35Z";
+ rev = "c18c8bd73e79aaf1211bd88bf9cff808273cf6d6";
+ sha256 = "0crz4cbyn9g23n0bq40znrs3jc2pzrhyn8h6lxkk1hf89hwq6jxh";
+ revdate = "2019-04-05T13:27:03Z";
}
diff --git a/pkgs/i3status-rust/metadata.nix b/pkgs/i3status-rust/metadata.nix
index 1a7e41d..2c4fdd4 100644
--- a/pkgs/i3status-rust/metadata.nix
+++ b/pkgs/i3status-rust/metadata.nix
@@ -1,5 +1,5 @@
{
- rev = "18300e6b9259053b80c37aef56c958fe5f50062b";
- sha256 = "1g1ra0i7jlkdslmfycdyb2wh2s4gfawd0k2pjqx3ayml9kgq33yh";
- revdate = "2019-03-21T12:58:08Z";
+ rev = "559d231caa574ddc665a7828fdef546e0429351b";
+ sha256 = "1c2ijn8lgpbp2byshvdz92dmihvylkbl2kvchg02difimxmp6rv7";
+ revdate = "2019-04-10T19:31:40Z";
}
diff --git a/pkgs/mako/metadata.nix b/pkgs/mako/metadata.nix
index bf941ac..e322641 100644
--- a/pkgs/mako/metadata.nix
+++ b/pkgs/mako/metadata.nix
@@ -1,5 +1,5 @@
{
- rev = "87170d5a3499225906a594f47557ea30e34662dd";
- sha256 = "0ipq0gdlf5zv0x74wwm1fpma2q7r9acans9b4nqbbwb8zb61g9iv";
- revdate = "2019-03-25T18:10:07Z";
+ rev = "22b42e85423e3dad19cea1876d39bf819d2b49d5";
+ sha256 = "15qiar2bgb8clxkqh286mkim64l10ma7gbx6m95k1gnznvq2gy9c";
+ revdate = "2019-04-13T08:58:12Z";
}
diff --git a/pkgs/sway/metadata.nix b/pkgs/sway/metadata.nix
index 6c78fb9..f72dbdf 100644
--- a/pkgs/sway/metadata.nix
+++ b/pkgs/sway/metadata.nix
@@ -1,5 +1,5 @@
{
- rev = "bfdee1319ffc8a720d0536a752a19ba23615a1e2";
- sha256 = "101w4clmm9df4z8b166h4qgnvfbw9n95l5aid6yn3qn4pxjfvs67";
- revdate = "2019-03-27T16:07:52Z";
+ rev = "6961bf2e4ce2c116e41a8db158691f6c993707ce";
+ sha256 = "1h8x30cln796sb6gmzaj830n5vwky0dbqlwzazfkyvgp0knyqj1s";
+ revdate = "2019-04-14T09:41:59Z";
}
diff --git a/pkgs/swaylock/metadata.nix b/pkgs/swaylock/metadata.nix
index b0ba9c7..1083be2 100644
--- a/pkgs/swaylock/metadata.nix
+++ b/pkgs/swaylock/metadata.nix
@@ -1,5 +1,5 @@
{
- rev = "7d5a73b0a99ca9b4c73a34faceda8bef2576fe23";
- sha256 = "0i513jyn39x8mlk2yz7knn1qkqwmkn0jw7ncjv8jbk901i26h28l";
- revdate = "2019-03-20T21:07:31Z";
+ rev = "98e5afe364776d06017579e14f972be6f65fbb8b";
+ sha256 = "1jh0ha7n1zkfnwqkbiyjafhbcyj3ghqhz8qxx6ayhxnkhr47iq4m";
+ revdate = "2019-04-03T05:15:51Z";
}
diff --git a/pkgs/waybar/metadata.nix b/pkgs/waybar/metadata.nix
index 7c80309..8846bd7 100644
--- a/pkgs/waybar/metadata.nix
+++ b/pkgs/waybar/metadata.nix
@@ -1,5 +1,5 @@
{
- rev = "b17984f75e80f708afe7b45c444f3732adfc2aab";
- sha256 = "0fkcx7zh7rrmiglxxalw507gm1l3758biwj7h6lgaa8kggbmhwd3";
- revdate = "2019-03-27T07:15:44Z";
+ rev = "57c99dc52650374ac6d1b4f22ad00efb5bd64be7";
+ sha256 = "1wfbiwwik834kzwfwg2ci0rgr6jp2cpf0c5dqxjip7pp4x496hdj";
+ revdate = "2019-04-11T13:28:38Z";
}
diff --git a/pkgs/wayfire/metadata.nix b/pkgs/wayfire/metadata.nix
index 5b3ad27..10160d4 100644
--- a/pkgs/wayfire/metadata.nix
+++ b/pkgs/wayfire/metadata.nix
@@ -1,5 +1,5 @@
{
- rev = "784c3210500f5b7fad76ac710bf4bb3070e09833";
- sha256 = "0ng3in9sypj13knw51c1q9z2zkwnwharp1szd0lnilhkfl1w2khz";
- revdate = "2019-03-26T14:22:38Z";
+ rev = "eefc5479db94f391c4260e320a79cdfe513f329f";
+ sha256 = "0x9ai8jrqq5lwccwasa2krskql9jm1j47yqvy9wbb60x4y8salny";
+ revdate = "2019-03-29T09:21:43Z";
}
diff --git a/pkgs/wf-recorder/default.nix b/pkgs/wf-recorder/default.nix
index 140070a..90539b0 100644
--- a/pkgs/wf-recorder/default.nix
+++ b/pkgs/wf-recorder/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, wayland, wayland-protocols, ffmpeg, x264 }:
+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, wayland, wayland-protocols, ffmpeg, x264
+, libpulseaudio }:
let
metadata = import ./metadata.nix;
@@ -14,7 +15,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ meson ninja pkgconfig ];
- buildInputs = [ wayland wayland-protocols ffmpeg x264 ];
+ buildInputs = [ wayland wayland-protocols ffmpeg x264 libpulseaudio ];
meta = with stdenv.lib; {
description = "Utility program for screen recording of wlroots-based compositors";
diff --git a/pkgs/wf-recorder/metadata.nix b/pkgs/wf-recorder/metadata.nix
index 494b8be..067b273 100644
--- a/pkgs/wf-recorder/metadata.nix
+++ b/pkgs/wf-recorder/metadata.nix
@@ -1,5 +1,5 @@
{
- rev = "e6073f5d9c85b5db53b6fc319569daf4e1f1f62c";
- sha256 = "03zc9ik3vqn3bdfif6am8qq0nh1fipz37r4qz81z5g70a7lca37f";
- revdate = "2019-03-26T14:56:30Z";
+ rev = "bfae5d959c1d19d2d1cffbf1da7b70c4d05a64e6";
+ sha256 = "1s4bw2fpqvs71g00ddjs1m04vzv30n75ix7nz0lkm505iw91ph1c";
+ revdate = "2019-03-31T16:41:30Z";
}
diff --git a/pkgs/wlroots/metadata.nix b/pkgs/wlroots/metadata.nix
index 12711a3..ecbb007 100644
--- a/pkgs/wlroots/metadata.nix
+++ b/pkgs/wlroots/metadata.nix
@@ -1,5 +1,5 @@
{
- rev = "08454adadaa5db9f136531eddbe290a933a335bf";
- sha256 = "15mghicrlpqvvcqq9x0g5klxf8aidzshm7z3zcji4bn229hp7dyy";
- revdate = "2019-03-27T17:31:20Z";
+ rev = "7a2f929201dfa8a939dae36476df2735386dad2b";
+ sha256 = "014yrbwqm005v5g7095gn5xl3vxk989i792raps7imclfsbhcib9";
+ revdate = "2019-04-13T16:31:37Z";
}