summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.md11
-rw-r--r--default.nix1
-rw-r--r--nixpkgs/nixpkgs-unstable/metadata.nix6
-rw-r--r--pkgs/sway-beta/default.nix4
-rw-r--r--pkgs/sway-beta/metadata.nix6
-rw-r--r--pkgs/swayidle/metadata.nix6
-rw-r--r--pkgs/swaylock/default.nix44
-rw-r--r--pkgs/swaylock/metadata.nix5
-rw-r--r--pkgs/wayfire/metadata.nix6
-rw-r--r--pkgs/wlroots/metadata.nix6
-rwxr-xr-xupdate.sh1
11 files changed, 74 insertions, 22 deletions
diff --git a/README.md b/README.md
index 13a3177..172d082 100644
--- a/README.md
+++ b/README.md
@@ -16,10 +16,11 @@ Packages from this overlay are regularly updated and built against `nixos-unstab
| Attribute Name | Last Upstream Commit Time |
| -------------- | ------------------------- |
| nixpkgs/nixos-unstable | [2019-01-14 15:24](https://github.com/nixos/nixpkgs-channels/commits/be445a9074f139d63e704fa82610d25456562c3d) |
-| nixpkgs/nixpkgs-unstable | [2019-01-16 23:40](https://github.com/nixos/nixpkgs-channels/commits/c052da08dcb3235ee0e3f7c353fc9a664b12dbef) |
-| pkgs/wlroots | [2019-01-17 05:02](https://github.com/swaywm/wlroots/commits/0e0ba65bc0187cc1dabd7591e2f081ab3bf44d01) |
-| pkgs/sway-beta | [2019-01-17 05:13](https://github.com/swaywm/sway/commits/5a0c4234b8f0ef5ad3d17430e876e29242b934e2) |
-| pkgs/swayidle | [2019-01-17 06:20](https://github.com/swaywm/swayidle/commits/956c40d336ef310b7e39bfd819d0f30ca03c14ea) |
+| nixpkgs/nixpkgs-unstable | [2019-01-18 00:49](https://github.com/nixos/nixpkgs-channels/commits/8aba4ca411948d7c3e498f09a5191c0cff549425) |
+| pkgs/wlroots | [2019-01-18 13:52](https://github.com/swaywm/wlroots/commits/5dde2e794d076cd4ba8cb66849615dcc70f30ea4) |
+| pkgs/sway-beta | [2019-01-18 15:30](https://github.com/swaywm/sway/commits/1cce14e7c7ee78acacbe7210d177a96048a4e74b) |
+| pkgs/swayidle | [2019-01-18 12:55](https://github.com/swaywm/swayidle/commits/c94949dd75721faa9ea53f41e0326129c0449872) |
+| pkgs/swaylock | [2019-01-18 06:07](https://github.com/swaywm/swaylock/commits/52eeb9fc1e145a121fdbdaab56446ada26367903) |
| 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) |
@@ -27,7 +28,7 @@ Packages from this overlay are regularly updated and built against `nixos-unstab
| 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-14 00:05](https://github.com/Alexays/waybar/commits/aedf133b168ae780cb8688ef3e85abd143d79f3c) |
-| pkgs/wayfire | [2019-01-16 12:30](https://github.com/WayfireWM/wayfire/commits/c84e50904dfb2c4d60047b9448919cd286fc9b24) |
+| pkgs/wayfire | [2019-01-18 14:18](https://github.com/WayfireWM/wayfire/commits/d50be91a7f3a5c8ef270930855b7057e9dd21517) |
| 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) |
diff --git a/default.nix b/default.nix
index 1b90771..3dca42f 100644
--- a/default.nix
+++ b/default.nix
@@ -6,6 +6,7 @@ waylandPkgs = rec {
wlroots-old = pkgs.callPackage ./pkgs-temp/wlroots {};
sway-beta = pkgs.callPackage ./pkgs/sway-beta {};
swayidle = pkgs.callPackage ./pkgs/swayidle {};
+ swaylock = pkgs.callPackage ./pkgs/swaylock {};
grim = pkgs.callPackage ./pkgs/grim {};
slurp = pkgs.callPackage ./pkgs/slurp {};
mako = pkgs.callPackage ./pkgs/mako {};
diff --git a/nixpkgs/nixpkgs-unstable/metadata.nix b/nixpkgs/nixpkgs-unstable/metadata.nix
index b0cb96d..86ecb87 100644
--- a/nixpkgs/nixpkgs-unstable/metadata.nix
+++ b/nixpkgs/nixpkgs-unstable/metadata.nix
@@ -1,5 +1,5 @@
{
- rev = "c052da08dcb3235ee0e3f7c353fc9a664b12dbef";
- sha256 = "1m4yq3fbawyr10if10r5nddwjia9kj8zxvkkah2spiskyv3md4qw";
- revdate = "2019-01-17T07:40:59Z";
+ rev = "8aba4ca411948d7c3e498f09a5191c0cff549425";
+ sha256 = "11sn42bwcnqf72w6231zj2fg7ad4n25x45i3q5mzs91mxxnph45m";
+ revdate = "2019-01-18T08:49:50Z";
}
diff --git a/pkgs/sway-beta/default.nix b/pkgs/sway-beta/default.nix
index a259522..fd7e4bc 100644
--- a/pkgs/sway-beta/default.nix
+++ b/pkgs/sway-beta/default.nix
@@ -2,7 +2,7 @@
, meson, ninja
, pkgconfig, scdoc
, wayland, libevdev, libxkbcommon, pcre, json_c, dbus
-, pango, cairo, libinput, libcap, pam, gdk_pixbuf
+, pango, cairo, libinput, libcap, gdk_pixbuf
, wlroots, wayland-protocols
, buildDocs ? true
}:
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
buildInputs = [
wayland libevdev libxkbcommon pcre json_c dbus
- pango cairo libinput libcap pam gdk_pixbuf
+ pango cairo libinput libcap gdk_pixbuf
wlroots wayland-protocols
];
diff --git a/pkgs/sway-beta/metadata.nix b/pkgs/sway-beta/metadata.nix
index 1d14680..899c367 100644
--- a/pkgs/sway-beta/metadata.nix
+++ b/pkgs/sway-beta/metadata.nix
@@ -1,5 +1,5 @@
{
- rev = "5a0c4234b8f0ef5ad3d17430e876e29242b934e2";
- sha256 = "038w8z0j41p98vwg7h4ng14ys2i7zxys7r1cpnaq53vs3raz1vbf";
- revdate = "2019-01-17T13:13:19Z";
+ rev = "1cce14e7c7ee78acacbe7210d177a96048a4e74b";
+ sha256 = "142k7fj134wappw45cpr6rkzr8skpj47ba520a88nl57j7z0k1lx";
+ revdate = "2019-01-18T23:30:13Z";
}
diff --git a/pkgs/swayidle/metadata.nix b/pkgs/swayidle/metadata.nix
index a67b18f..c9d3106 100644
--- a/pkgs/swayidle/metadata.nix
+++ b/pkgs/swayidle/metadata.nix
@@ -1,5 +1,5 @@
{
- rev = "956c40d336ef310b7e39bfd819d0f30ca03c14ea";
- sha256 = "0093lff21f4ri0fjr9qvl72ymz3rd91cdnyjdxi07a7hmniq8pys";
- revdate = "2019-01-17T14:20:30Z";
+ rev = "c94949dd75721faa9ea53f41e0326129c0449872";
+ sha256 = "1kx8miwlkbx3kj6ndcc0n8zdcn6yn3z97iz0xbi52ajmzrvjbqmm";
+ revdate = "2019-01-18T20:55:52Z";
}
diff --git a/pkgs/swaylock/default.nix b/pkgs/swaylock/default.nix
new file mode 100644
index 0000000..bb3bc26
--- /dev/null
+++ b/pkgs/swaylock/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchFromGitHub
+, meson, ninja
+, pkgconfig, scdoc
+, wayland, wayland-protocols
+, libxkbcommon, cairo, pango, gdk_pixbuf, pam
+, buildDocs ? true
+}:
+
+let
+ metadata = import ./metadata.nix;
+in
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "swaylock";
+ version = metadata.rev;
+
+ src = fetchFromGitHub {
+ owner = "swaywm";
+ repo = "swaylock";
+ rev = version;
+ sha256 = metadata.sha256;
+ };
+
+ nativeBuildInputs = [
+ pkgconfig meson ninja
+ ] ++ stdenv.lib.optional buildDocs scdoc;
+
+ buildInputs = [
+ wayland wayland-protocols
+ libxkbcommon cairo pango gdk_pixbuf pam
+ ];
+
+ mesonFlags = "-Dswaylock-version=${version}";
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "Screen locker for Wayland";
+ homepage = https://swaywm.org;
+ license = licenses.mit;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ primeos synthetica ]; # Trying to keep it up-to-date.
+ };
+}
diff --git a/pkgs/swaylock/metadata.nix b/pkgs/swaylock/metadata.nix
new file mode 100644
index 0000000..28b3033
--- /dev/null
+++ b/pkgs/swaylock/metadata.nix
@@ -0,0 +1,5 @@
+{
+ rev = "52eeb9fc1e145a121fdbdaab56446ada26367903";
+ sha256 = "0201r2vfi5hx4lapgghqp4gxycrpsr78c9ybw8gzmlccs72fmnac";
+ revdate = "2019-01-18T14:07:17Z";
+}
diff --git a/pkgs/wayfire/metadata.nix b/pkgs/wayfire/metadata.nix
index 6efbd4a..d34da1d 100644
--- a/pkgs/wayfire/metadata.nix
+++ b/pkgs/wayfire/metadata.nix
@@ -1,5 +1,5 @@
{
- rev = "c84e50904dfb2c4d60047b9448919cd286fc9b24";
- sha256 = "0g625db73zagi5am2wiw8k37gyn1idfnml6kmyg1v1z1p1zm6lr2";
- revdate = "2019-01-16T20:30:08Z";
+ rev = "d50be91a7f3a5c8ef270930855b7057e9dd21517";
+ sha256 = "0805ayk8yagla7x43z247z64bvxrvrvl52b8y23nkbpyi0ha9hrx";
+ revdate = "2019-01-18T22:18:22Z";
}
diff --git a/pkgs/wlroots/metadata.nix b/pkgs/wlroots/metadata.nix
index d99a4dc..4582958 100644
--- a/pkgs/wlroots/metadata.nix
+++ b/pkgs/wlroots/metadata.nix
@@ -1,5 +1,5 @@
{
- rev = "0e0ba65bc0187cc1dabd7591e2f081ab3bf44d01";
- sha256 = "1hiymvlzi13hr2dw582cv5dc1x88rwz4cn8gwiz6xa9znhgvk4bs";
- revdate = "2019-01-17T13:02:27Z";
+ rev = "5dde2e794d076cd4ba8cb66849615dcc70f30ea4";
+ sha256 = "0567ypizh27r1sidx608fg9gh2ar8v1kgnflfik3lvl36qaxhzm6";
+ revdate = "2019-01-18T21:52:38Z";
}
diff --git a/update.sh b/update.sh
index 877508a..687e13b 100755
--- a/update.sh
+++ b/update.sh
@@ -40,6 +40,7 @@ update "nixpkgs/nixpkgs-unstable" "nixos" "nixpkgs-channels" "nixpkgs-unstable"
update "pkgs/wlroots" "swaywm" "wlroots" "master"
update "pkgs/sway-beta" "swaywm" "sway" "master"
update "pkgs/swayidle" "swaywm" "swayidle" "master"
+update "pkgs/swaylock" "swaywm" "swaylock" "master"
update "pkgs/slurp" "emersion" "slurp" "master"
update "pkgs/grim" "emersion" "grim" "master"
update "pkgs/mako" "emersion" "mako" "master"
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 11:55:06 +0000