add scdoc; update sway pkg; update sway, i3status-rus, mako, waybar, wayfire, wlroots

Signed-off-by: Cole Mickens <cole.mickens@gmail.com>

10 files changed, 97 insertions, 37 deletions

diff --git a/pkgs/i3status-rust/metadata.nix b/pkgs/i3status-rust/metadata.nix
index 761d625..4e906d1 100644
--- a/pkgs/i3status-rust/metadata.nix
+++ b/pkgs/i3status-rust/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "2dc958995834b529a245c22c510b57d5c928c747";
-  sha256 = "091a2pqgkiwnya2xv5rw5sj730hf6lvkp2kk5midsa3wz2dfbc2j";
-  revdate = "2019-02-15T18:03:08Z";
+  rev = "6e39780c7e191335f0d73eca7ccef140adc3a54a";
+  sha256 = "1xkx37laq2zi2nrbgrgrl2cr9p0g0l78k990y6x5m940rny1fv70";
+  revdate = "2019-03-11T03:12:14Z";
 }
diff --git a/pkgs/mako/metadata.nix b/pkgs/mako/metadata.nix
index 4a4aed0..a198de8 100644
--- a/pkgs/mako/metadata.nix
+++ b/pkgs/mako/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "e3a69aa4017d6cb64a270fcc2e708c98cd9d2b39";
-  sha256 = "1cd1jbpipcr4x2m5ci5q45w3c6gxxgwwv6zih3wjxw0j36ff1mz6";
-  revdate = "2019-02-20T22:00:18Z";
+  rev = "9cf8a0335c811ccf4a6ea72be4c30aa646804365";
+  sha256 = "1h82gav1rp63pd7pdqmmqfxx17qznn8fhzf8dgya8xl8n4i7kdxa";
+  revdate = "2019-03-08T08:53:39Z";
 }
diff --git a/pkgs/scdoc/default.nix b/pkgs/scdoc/default.nix
new file mode 100644
index 0000000..c32042b
--- /dev/null
+++ b/pkgs/scdoc/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl }:
+
+let
+  metadata = import ./metadata.nix;
+in
+stdenv.mkDerivation rec {
+  name = "scdoc-${version}";
+  version = metadata.rev;
+
+  src = fetchurl {
+    url = "https://git.sr.ht/~sircmpwn/scdoc/archive/${metadata.rev}.tar.gz";
+    sha256 = metadata.sha256;
+  };
+
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace "-static" "" \
+      --replace "/usr/local" "$out"
+    # It happens from time to time that the version wasn't updated:
+    sed -iE 's/VERSION=[0-9]\.[0-9]\.[0-9]/VERSION=${version}/' Makefile
+  '';
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "A simple man page generator";
+    longDescription = ''
+      scdoc is a simple man page generator written for POSIX systems written in
+      C99.
+    '';
+    homepage = https://git.sr.ht/~sircmpwn/scdoc;
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ primeos ];
+  };
+}
diff --git a/pkgs/scdoc/metadata.nix b/pkgs/scdoc/metadata.nix
new file mode 100644
index 0000000..49839bd
--- /dev/null
+++ b/pkgs/scdoc/metadata.nix
@@ -0,0 +1,5 @@
+{
+  rev = "599f968c0110b8eebe94e7019359e966fc7a53bb";
+  sha256 = "1lc4xi7him44mj46vv3qfwf1qdcrzcvk2vksrxvk2cp0ksr3363r";
+  revdate = "2019-02-19T14:19:38Z";
+}
diff --git a/pkgs/sway/default.nix b/pkgs/sway/default.nix
index a4f2130..5560a43 100644
--- a/pkgs/sway/default.nix
+++ b/pkgs/sway/default.nix
@@ -1,10 +1,9 @@
-{ stdenv, fetchFromGitHub
+{ stdenv, fetchFromGitHub, fetchpatch
 , meson, ninja
 , pkgconfig, scdoc
-, wayland, libevdev, libxkbcommon, pcre, json_c, dbus
-, pango, cairo, libinput, libcap, gdk_pixbuf
+, wayland, libxkbcommon, pcre, json_c, dbus, libevdev
+, pango, cairo, libinput, libcap, pam, gdk_pixbuf
 , wlroots, wayland-protocols
-, buildDocs ? true
 }:
 
 let
@@ -13,41 +12,40 @@ in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "sway";
-  version = metadata.rev;
+  version = "1.0";
 
   src = fetchFromGitHub {
     owner = "swaywm";
     repo = "sway";
-    rev = version;
+    rev = metadata.rev;
     sha256 = metadata.sha256;
   };
 
-  nativeBuildInputs = [
-    pkgconfig meson ninja
-  ] ++ stdenv.lib.optional buildDocs scdoc;
+  patches = [
+    ./sway-config-no-nix-store-references.patch
+  ];
+
+  nativeBuildInputs = [ pkgconfig meson ninja scdoc ];
 
   buildInputs = [
-    wayland libevdev libxkbcommon pcre json_c dbus
-    pango cairo libinput libcap gdk_pixbuf
+    wayland libxkbcommon pcre json_c dbus libevdev
+    pango cairo libinput libcap pam gdk_pixbuf
     wlroots wayland-protocols
   ];
 
   enableParallelBuilding = true;
 
   mesonFlags = [
-    "-Dsway-version=${version}"
-    "-Ddefault-wallpaper=false"
-    "-Dxwayland=enabled"
-    "-Dtray=enabled"
-    "-Dgdk-pixbuf=enabled"
-    "-Dman-pages=enabled"
+    "-Ddefault-wallpaper=false" "-Dxwayland=enabled" "-Dgdk-pixbuf=enabled"
+    "-Dtray=enabled" "-Dman-pages=enabled"
   ];
 
   meta = with stdenv.lib; {
-    description = "i3-compatible window manager for Wayland";
+    description = "i3-compatible tiling Wayland compositor";
     homepage    = https://swaywm.org;
     license     = licenses.mit;
     platforms   = platforms.linux;
-    maintainers = with maintainers; [ primeos synthetica ]; # Trying to keep it up-to-date.
+    maintainers = with maintainers; [ primeos synthetica ];
   };
 }
+
diff --git a/pkgs/sway/metadata.nix b/pkgs/sway/metadata.nix
index fedbdd5..4cbb836 100644
--- a/pkgs/sway/metadata.nix
+++ b/pkgs/sway/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "0df76ed96afa75ff8dd8ab6cf7748026e1caf5e7";
-  sha256 = "10hqbks8gpwrynrpp3vkr28qqjvhrsy0pq7bfjw9z07g0gjj7rck";
-  revdate = "2019-03-06T17:49:45Z";
+  rev = "52a61671e93953a06b6b440ede5512e8fe45b35e";
+  sha256 = "1aiw54slc1p68rnmx2v6p7lk0ys1ksm0nl5k7vr49xqq9vz6mqpk";
+  revdate = "2019-03-13T02:52:09Z";
 }
diff --git a/pkgs/sway/sway-config-no-nix-store-references.patch b/pkgs/sway/sway-config-no-nix-store-references.patch
new file mode 100644
index 0000000..009c129
--- /dev/null
+++ b/pkgs/sway/sway-config-no-nix-store-references.patch
@@ -0,0 +1,21 @@
+diff --git a/config.in b/config.in
+--- a/config.in
++++ b/config.in
+@@ -21,8 +21,8 @@ set $menu dmenu_path | dmenu | xargs swaymsg exec
+ 
+ ### Output configuration
+ #
+-# Default wallpaper (more resolutions are available in @datadir@/backgrounds/sway/)
+-output * bg @datadir@/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
++# Default wallpaper
++#output * bg ~/.config/sway/backgrounds/Sway_Wallpaper_Blue_1920x1080.png fill
+ #
+ # Example configuration:
+ #
+@@ -213,5 +213,3 @@ bar {
+         inactive_workspace #32323200 #32323200 #5c5c5c
+     }
+ }
+-
+-include @sysconfdir@/sway/config.d/*
+
diff --git a/pkgs/waybar/metadata.nix b/pkgs/waybar/metadata.nix
index e5c8926..f798dd4 100644
--- a/pkgs/waybar/metadata.nix
+++ b/pkgs/waybar/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "ab0dcbfb2e405e0380796ced6bdf52a91244dd3c";
-  sha256 = "0iq7xkh50gkx1fn3l9i39hm669nfffp2qcip9rh6dqhlrlwyxfq9";
-  revdate = "2019-03-05T09:16:19Z";
+  rev = "cd131801996d002fc3e1b02cb750b6580ea4ba8c";
+  sha256 = "0cn9mj99fn3zkk4qcgpn49d6fbrz5cl5x10k1z1sn6r9zzjw3zd9";
+  revdate = "2019-03-12T10:41:05Z";
 }
diff --git a/pkgs/wayfire/metadata.nix b/pkgs/wayfire/metadata.nix
index ca40f8c..5f37db6 100644
--- a/pkgs/wayfire/metadata.nix
+++ b/pkgs/wayfire/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "af1379e9ab67f408bd7c309ee79bad05700ef530";
-  sha256 = "1n0icqapp9y9pdbx3r895kki8c16ddax4jbriz2cwabmqn7rpni9";
-  revdate = "2019-03-05T23:00:53Z";
+  rev = "ce81c6625b5b4d8a4ff3718bda94b6d13993c189";
+  sha256 = "1lrq41wzp0vzsrzqx6c72gc5qiy3kr816fhd40q5s0ysl8smjz18";
+  revdate = "2019-03-12T20:16:40Z";
 }
diff --git a/pkgs/wlroots/metadata.nix b/pkgs/wlroots/metadata.nix
index c65a0b8..1ffadb4 100644
--- a/pkgs/wlroots/metadata.nix
+++ b/pkgs/wlroots/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "2baad6eba6c7f4edd3bc1ca266503920e9789ad0";
-  sha256 = "1456qqk37445g0543frq2kdfmbb3k6cdj4kn7zjnzllkzprxqis8";
-  revdate = "2019-03-06T12:20:51Z";
+  rev = "408eca7dfa12eda0f1b0ec6050e99ee2e6a8f2b4";
+  sha256 = "04r74njqmcxc2zhvwkn8c9xm95n7brln0z92x25p3ajwrpp5bs8b";
+  revdate = "2019-03-12T14:16:07Z";
 }