diff options
author | Cole Mickens <cole.mickens@gmail.com> | 2019-01-13 17:59:44 -0800 |
---|---|---|
committer | Cole Mickens <cole.mickens@gmail.com> | 2019-01-13 18:01:28 -0800 |
commit | a4ce741c5a65d4b6f66fd0d118079bbacc422a1f (patch) | |
tree | 93dada963ea3b616141900fb8fd706b617c9dee5 | |
parent | ac9e2c31eac23b2ae557acb58ea278b3103a76c1 (diff) |
update: fmt, sway-beta, waybar, wl-clipboard, wlroots
Signed-off-by: Cole Mickens <cole.mickens@gmail.com>
-rw-r--r-- | README.md | 13 | ||||
-rw-r--r-- | nixpkgs/nixos-unstable/metadata.nix | 6 | ||||
-rw-r--r-- | pkgs/fmt/metadata.nix | 6 | ||||
-rw-r--r-- | pkgs/sway-beta/metadata.nix | 6 | ||||
-rw-r--r-- | pkgs/swayidle/default.nix | 4 | ||||
-rw-r--r-- | pkgs/waybar/default.nix | 17 | ||||
-rw-r--r-- | pkgs/waybar/metadata.nix | 6 | ||||
-rw-r--r-- | pkgs/wl-clipboard/metadata.nix | 6 | ||||
-rw-r--r-- | pkgs/wlroots/metadata.nix | 6 |
9 files changed, 27 insertions, 43 deletions
@@ -15,24 +15,25 @@ Packages from this overlay are regularly updated and built against `nixos-unstab <!--pkgs--> | Attribute Name | Last Upstream Commit Time | | -------------- | ------------------------- | -| nixpkgs/nixos-unstable | [2019-01-03 11:01](https://github.com/nixos/nixpkgs-channels/commits/eebd1a9263716a04689a37b6537e50801d376b5e) | +| nixpkgs/nixos-unstable | [2019-01-13 01:38](https://github.com/nixos/nixpkgs-channels/commits/626233eee6ea309733d2d98625750cca904799a5) | | nixpkgs/nixpkgs-unstable | [2019-01-05 18:46](https://github.com/nixos/nixpkgs-channels/commits/7d864c6bd6391baa516118051ec5fb7e9836280e) | -| pkgs/fmt | [2019-01-12 10:53](https://github.com/fmtlib/fmt/commits/9a777b9e1c610f86f137c7cb3ac18be6eab06cce) | -| pkgs/wlroots | [2019-01-11 15:13](https://github.com/swaywm/wlroots/commits/8134d5b1e0b8c65f7c8b2e7ae626c1f2e5cbc9e1) | -| pkgs/sway-beta | [2019-01-12 14:05](https://github.com/swaywm/sway/commits/a43863aa60bd9eff0972d096610cb5a6de79aacb) | +| pkgs/fmt | [2019-01-13 10:08](https://github.com/fmtlib/fmt/commits/b0cde860ae3fee787c582af53858ed03684e845f) | +| pkgs/wlroots | [2019-01-13 12:45](https://github.com/swaywm/wlroots/commits/10a2c4edec5e4f0877ff4afc83178c3f08b4f063) | +| pkgs/sway-beta | [2019-01-13 17:42](https://github.com/swaywm/sway/commits/4879d40695047a4c493bd8871d810c543978a869) | +| pkgs/swayidle | [2019-01-12 17:50](https://github.com/swaywm/swayidle/commits/1fe7145c186c285ee8036e364342195d53ac296b) | | pkgs/slurp | [2019-01-09 15:24](https://github.com/emersion/slurp/commits/d9f3d741dc3de8c24198f41befc297e43054a523) | | pkgs/grim | [2019-01-11 14:45](https://github.com/emersion/grim/commits/b22b8a5ac3984c9b7d4ae5ba7ca112d3fd98b7a1) | | pkgs/mako | [2019-01-06 06:30](https://github.com/emersion/mako/commits/3211130215bc91db6d284f4ccffefd81ddd0f7e2) | | pkgs/kanshi | [2019-01-09 09:05](https://github.com/emersion/kanshi/commits/c97715789db78a88970f6a4c86ecd9e59f156956) | | pkgs/wlstream | [2018-07-15 14:10](https://github.com/atomnuker/wlstream/commits/182076a94562b128c3a97ecc53cc68905ea86838) | | pkgs/oguri | [2018-12-27 09:16](https://github.com/vilhalmer/oguri/commits/bc82b841e0d9667b266378818b9e026308756f75) | -| pkgs/waybar | [2019-01-08 16:00](https://github.com/Alexays/waybar/commits/8af813c2f1f619182a09eeddcc4c6fb0ed1b2e07) | +| pkgs/waybar | [2019-01-13 13:37](https://github.com/Alexays/waybar/commits/9348e885929db86ca5f775c5909c753197db311e) | | pkgs/wayfire | [2019-01-13 00:57](https://github.com/WayfireWM/wayfire/commits/bf6d16d48ffeeb0cfe1c725a05823768ea759603) | | pkgs/wf-config | [2018-12-17 00:04](https://github.com/WayfireWM/wf-config/commits/6d3426e216ac62ffa035035f9c1bea074e184018) | | pkgs/redshift-wayland | [2018-11-07 12:03](https://github.com/minus7/redshift/commits/420d0d534c9f03abc4d634a7d3d7629caf29b4b6) | | pkgs/bspwc | [2018-12-29 15:21](https://github.com/Bl4ckb0ne/bspwc/commits/e72ff641bd30d3db153d879cea1cffd149931546) | | pkgs/waybox | [2018-11-27 06:44](https://github.com/wizbright/waybox/commits/482d0a92f5530a5cbab8b0b913b653d4503015c4) | -| pkgs/wl-clipboard | [2018-12-30 01:56](https://github.com/bugaevc/wl-clipboard/commits/1d99c3d5720a012d5a034535f703f6b290408ebf) | +| pkgs/wl-clipboard | [2019-01-13 03:21](https://github.com/bugaevc/wl-clipboard/commits/7a851c6690c99935d455572b121306a0decad48a) | | pkgs/wmfocus | [2019-01-08 03:15](https://github.com/svenstaro/wmfocus/commits/7cdbd7f6dabe2932828886ffad05a90df3555e3b) | | pkgs/i3status-rust | [2018-12-24 09:01](https://github.com/greshake/i3status-rust/commits/31a595ee2b7ca84c3205560d96ec7bcf8ce02d0b) | <!--pkgs--> diff --git a/nixpkgs/nixos-unstable/metadata.nix b/nixpkgs/nixos-unstable/metadata.nix index 8f936e9..7e267d8 100644 --- a/nixpkgs/nixos-unstable/metadata.nix +++ b/nixpkgs/nixos-unstable/metadata.nix @@ -1,5 +1,5 @@ { - rev = "eebd1a9263716a04689a37b6537e50801d376b5e"; - sha256 = "0s1fylhjqp2h4j044iwbwndgnips3nrynh2ip5ijh96kavizf2gb"; - revdate = "2019-01-03T19:01:07Z"; + rev = "626233eee6ea309733d2d98625750cca904799a5"; + sha256 = "0w1s5v96cdf57f2wzqrkxfz6bhdb6h2axjv3r8l7p8pf4kdwdky2"; + revdate = "2019-01-13T09:38:32Z"; } diff --git a/pkgs/fmt/metadata.nix b/pkgs/fmt/metadata.nix index 0f8fe03..74aafbb 100644 --- a/pkgs/fmt/metadata.nix +++ b/pkgs/fmt/metadata.nix @@ -1,5 +1,5 @@ { - rev = "9a777b9e1c610f86f137c7cb3ac18be6eab06cce"; - sha256 = "0s51hifibvhbf51ia3lc4wv53n80qz7adv0cgn9i4x1y4yh9skpd"; - revdate = "2019-01-12T18:53:31Z"; + rev = "b0cde860ae3fee787c582af53858ed03684e845f"; + sha256 = "1d9pvvbwcjadz891slbhm76km750mdhdp1f87w2dnqmifkyz6497"; + revdate = "2019-01-13T18:08:01Z"; } diff --git a/pkgs/sway-beta/metadata.nix b/pkgs/sway-beta/metadata.nix index 03a0baa..8d9a91f 100644 --- a/pkgs/sway-beta/metadata.nix +++ b/pkgs/sway-beta/metadata.nix @@ -1,5 +1,5 @@ { - rev = "a43863aa60bd9eff0972d096610cb5a6de79aacb"; - sha256 = "1k1w4i22jh2cagi5xnkmllwqymz9p7xgjml5wnq6y1wm3xn1q3bc"; - revdate = "2019-01-12T22:05:18Z"; + rev = "4879d40695047a4c493bd8871d810c543978a869"; + sha256 = "0c7rad8027b9cqdxk1bpf9jlayg32i70yfsf906sqq46l4sl6yml"; + revdate = "2019-01-14T01:42:39Z"; } diff --git a/pkgs/swayidle/default.nix b/pkgs/swayidle/default.nix index cf97316..fe9233f 100644 --- a/pkgs/swayidle/default.nix +++ b/pkgs/swayidle/default.nix @@ -1,9 +1,7 @@ { stdenv, fetchFromGitHub , meson, ninja , pkgconfig, scdoc -, wayland, libevdev, libxkbcommon, pcre, json_c, dbus -, pango, cairo, libinput, libcap, pam, gdk_pixbuf -, wlroots, wayland-protocols +, wayland, wayland-protocols , buildDocs ? true }: diff --git a/pkgs/waybar/default.nix b/pkgs/waybar/default.nix index d70b401..2ac8fac 100644 --- a/pkgs/waybar/default.nix +++ b/pkgs/waybar/default.nix @@ -5,25 +5,10 @@ , fmt, jsoncpp, libdbusmenu-gtk3 , glib , git -, python3Packages # TODO: temporary (meson480) -, fetchpatch }: let metadata = import ./metadata.nix; - meson480 = meson.overrideAttrs (oldAttrs: rec { - name = pname + "-" + version; - pname = "meson"; - version = "0.48.0"; - - src = python3Packages.fetchPypi { - inherit pname version; - sha256 = "0qawsm6px1vca3babnqwn0hmkzsxy4w0gi345apd2qk3v0cv7ipc"; - }; - patches = builtins.filter # Remove gir-fallback-path.patch - (str: !(stdenv.lib.hasSuffix "gir-fallback-path.patch" str)) - oldAttrs.patches; - }); in stdenv.mkDerivation rec { name = "waybar-${version}"; @@ -36,7 +21,7 @@ stdenv.mkDerivation rec { sha256 = metadata.sha256; }; - nativeBuildInputs = [ meson480 ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = [ wayland wayland-protocols sway wlroots libpulseaudio libinput libnl gtkmm3 diff --git a/pkgs/waybar/metadata.nix b/pkgs/waybar/metadata.nix index 82284ec..9db6663 100644 --- a/pkgs/waybar/metadata.nix +++ b/pkgs/waybar/metadata.nix @@ -1,5 +1,5 @@ { - rev = "8af813c2f1f619182a09eeddcc4c6fb0ed1b2e07"; - sha256 = "01lvlz535m2nscmhzpqk3wdc4a8g698jh74sqhdhnbjlg6j7k6fy"; - revdate = "2019-01-09T00:00:00Z"; + rev = "9348e885929db86ca5f775c5909c753197db311e"; + sha256 = "123pw1fy6qgm73rqmaaf4xf6mps195asklzfz3x6z0582rldqp4y"; + revdate = "2019-01-13T21:37:19Z"; } diff --git a/pkgs/wl-clipboard/metadata.nix b/pkgs/wl-clipboard/metadata.nix index 3757bc2..6ca4a73 100644 --- a/pkgs/wl-clipboard/metadata.nix +++ b/pkgs/wl-clipboard/metadata.nix @@ -1,5 +1,5 @@ { - rev = "1d99c3d5720a012d5a034535f703f6b290408ebf"; - sha256 = "1zy5a1pwx0s1ywlh3g9g3n1j6idrq2ayxb8zl1y8yri50krsvp45"; - revdate = "2018-12-30T09:56:27Z"; + rev = "7a851c6690c99935d455572b121306a0decad48a"; + sha256 = "173p9c6a04bvnvrxpjjm70wi891lh10wnxm2v28m5yf807420bwl"; + revdate = "2019-01-13T11:21:14Z"; } diff --git a/pkgs/wlroots/metadata.nix b/pkgs/wlroots/metadata.nix index 44f94cc..2e05342 100644 --- a/pkgs/wlroots/metadata.nix +++ b/pkgs/wlroots/metadata.nix @@ -1,5 +1,5 @@ { - rev = "8134d5b1e0b8c65f7c8b2e7ae626c1f2e5cbc9e1"; - sha256 = "0xkm8lcsbp142y66n4b3wbs9xrdcnapsnydi7ykawjy933ms6pz9"; - revdate = "2019-01-11T23:13:54Z"; + rev = "10a2c4edec5e4f0877ff4afc83178c3f08b4f063"; + sha256 = "11nrnc8jia00k66iw1rwzdvpb4pd0hmpnlqavwryqxdia8kg404s"; + revdate = "2019-01-13T20:45:08Z"; } |