hosts/samhain: ckb-next 0.4.4 got upstreamed, moved to

hosts/samhain/home/sway.nix

@@ -1 +1,5 @@
-{ ... }: { }
+{ config, pkgs, ... }: { 
+  wayland.windowManager.sway.config.startup = [
+    { command = "${pkgs.ckb-next}/bin/ckb-next -b"; }
+  ];
+}

hosts/samhain/nixos/default.nix

@@ -51,7 +51,7 @@
 
   hardware.ckb-next = {
     enable = true;
-    package = pkgs.kat-ckb;
+    package = pkgs.ckb-next;
   };
 
   services.usbmuxd.enable = true;
@@ -68,7 +68,7 @@
   # graphics tablet
   services.xserver.wacom.enable = true;
 
-  environment.systemPackages = [ pkgs.idevicerestore pkgs.kat-ckb ];
+  environment.systemPackages = [ pkgs.idevicerestore pkgs.ckb-next ];
 
   # other stuffs
   boot.loader.systemd-boot.enable = true;

nix/sources.json

@@ -5,10 +5,10 @@
         "homepage": "https://nur.nix-community.org/",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "a1a5ea869e7cad04d103915bec415e067f4fa5e2",
-        "sha256": "17ffkw8dj8cf10dfbjm1rxrvi6hjfanfv91kbj24kcan67yczj2s",
+        "rev": "5169a012713a35c4ebef6e1f2841a02116bce5e2",
+        "sha256": "050i6vs5v4g809pa4as0ycdiazsiy0rhnan0g85l0x533vkz9k53",
         "type": "tarball",
-        "url": "https://github.com/nix-community/NUR/archive/a1a5ea869e7cad04d103915bec415e067f4fa5e2.tar.gz",
+        "url": "https://github.com/nix-community/NUR/archive/5169a012713a35c4ebef6e1f2841a02116bce5e2.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "arc-nixexprs": {
@@ -17,10 +17,10 @@
         "homepage": null,
         "owner": "arcnmx",
         "repo": "nixexprs",
-        "rev": "c2b6052b8737dc014c6abbabb638228628785857",
-        "sha256": "12i0grqfsn1ylknch4abyfyiqi3bi7bi72bxmjphwg45kyyyz05b",
+        "rev": "1a6fb812ced3df8686938021e2daa46823f9f7a4",
+        "sha256": "083w8qsqfavnyyc7g8n5c198jksz9c2myp5m82ldlqn00p274yk2",
         "type": "tarball",
-        "url": "https://github.com/arcnmx/nixexprs/archive/c2b6052b8737dc014c6abbabb638228628785857.tar.gz",
+        "url": "https://github.com/arcnmx/nixexprs/archive/1a6fb812ced3df8686938021e2daa46823f9f7a4.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "home-manager": {
@@ -29,10 +29,10 @@
         "homepage": "https://nix-community.github.io/home-manager/",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "db00b39a9abec04245486a01b236b8d9734c9ad0",
-        "sha256": "12r8j34j6x26c7vr4na5nrm4sm8rg5m5im109j6xw0zfcpi9vjqi",
+        "rev": "827636c619ce0d8178ddc08ab86ee92b50f2e5b4",
+        "sha256": "0imqxlj40fabg7iifqqa5d91is842124qpflb8l36xpcjgfs4q4p",
         "type": "tarball",
-        "url": "https://github.com/nix-community/home-manager/archive/db00b39a9abec04245486a01b236b8d9734c9ad0.tar.gz",
+        "url": "https://github.com/nix-community/home-manager/archive/827636c619ce0d8178ddc08ab86ee92b50f2e5b4.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "niv": {
@@ -60,8 +60,8 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixos-mailserver": {
-        "ref": "master",
         "branch": "master",
+        "ref": "master",
         "repo": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver",
         "rev": "f4c8d4b298cdf4364ca1f31668c686e1774d7ab3",
         "sha256": "032bgz6aysfn43wn8kazvvh0pws8r2mdgghy84hvrb3fwb11xldr",
@@ -75,10 +75,10 @@
         "homepage": "",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0a5f5bab0e08e968ef25cff393312aa51a3512cf",
-        "sha256": "161xisa5a7wi2h5hs0p1w7zbf095w21cs0wp0524kp7p6cpvvfyn",
+        "rev": "93de027ee045d0c1fbf13418fb86d86e6309b962",
+        "sha256": "0lz73h01pzcgz8l20k1qawk20g7jcjnrppbxf1wvr8fq21dl4bj1",
         "type": "tarball",
-        "url": "https://github.com/nixos/nixpkgs/archive/0a5f5bab0e08e968ef25cff393312aa51a3512cf.tar.gz",
+        "url": "https://github.com/nixos/nixpkgs/archive/93de027ee045d0c1fbf13418fb86d86e6309b962.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs-mozilla": {
@@ -99,10 +99,10 @@
         "homepage": "",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "93184413f2180ce79d53df91df4d43c2e8f931aa",
-        "sha256": "184dzm4xc6ywxfxn96ady8s27q06fxbymf8s8g03rkdishdnjy7h",
+        "rev": "1fe6ed37fd9beb92afe90671c0c2a662a03463dd",
+        "sha256": "1daa0y3p17shn9gibr321vx8vija6bfsb5zd7h4pxdbbwjkfq8n2",
         "type": "tarball",
-        "url": "https://github.com/nixos/nixpkgs/archive/93184413f2180ce79d53df91df4d43c2e8f931aa.tar.gz",
+        "url": "https://github.com/nixos/nixpkgs/archive/1fe6ed37fd9beb92afe90671c0c2a662a03463dd.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "pbb-nixfiles": {

pkgs/default.nix

@@ -30,30 +30,6 @@ let
 
     screenstub = unstable.callPackage ./screenstub { };
 
-    kat-ckb = super.ckb-next.overrideAttrs (old: rec {
-      version = "0.4.4";
-      src = self.fetchFromGitHub {
-        owner = "ckb-next";
-        repo = "ckb-next";
-        rev = "v${version}";
-        sha256 = "1fgvh2hsrm8vqbqq9g45skhyyrhhka4d8ngmyldkldak1fgmrvb7";
-      };
-      buildInputs = old.buildInputs ++ [
-        self.xorg.libXdmcp
-        self.qt5.qttools
-        self.libsForQt5.qt5.qtx11extras
-        self.libsForQt5.libdbusmenu
-      ];
-      patches = [
-        ./kat-ckb/install-dirs.patch
-        (self.substituteAll {
-          name = "ckb-next-modprobe.patch";
-          src = ./kat-ckb/modprobe.patch;
-          kmod = self.kmod;
-        })
-      ];
-    });
-
     kat-vm = super.callPackage ./kat-vm { };
 
     kat-glauca-dns = unstable.callPackage ./kat-glauca-dns { inherit sources; };

pkgs/kat-ckb/install-dirs.patch

@@ -1,13 +0,0 @@
-diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt
-index a04b80c..2969b3b 100644
---- a/src/daemon/CMakeLists.txt
-+++ b/src/daemon/CMakeLists.txt
-@@ -437,7 +437,7 @@ if ("${CKB_NEXT_INIT_SYSTEM}" STREQUAL "launchd")
- elseif ("${CKB_NEXT_INIT_SYSTEM}" STREQUAL "systemd")
-     install(
-         FILES "${CMAKE_CURRENT_BINARY_DIR}/service/ckb-next-daemon.service"
--        DESTINATION "${SYSTEMD_UNIT_INSTALL_DIR}"
-+   	DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/systemd/system"
-         PERMISSIONS
-         OWNER_READ OWNER_WRITE
-         GROUP_READ

pkgs/kat-ckb/modprobe.patch

@@ -1,26 +0,0 @@
-diff --git a/src/daemon/input_linux.c b/src/daemon/input_linux.c
-index 933e628..c4f97f2 100644
---- a/src/daemon/input_linux.c
-+++ b/src/daemon/input_linux.c
-@@ -70,7 +70,7 @@ int os_inputopen(usbdevice* kb){
- 
-     // If not available, load the module
-     if(fd < 0){
--        if(system("modprobe uinput") != 0) {
-+        if(system("@kmod@/bin/modprobe uinput") != 0) {
-             ckb_fatal("Failed to load uinput module");
-             return 1;
-         }
-diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
-index eeadaf8..87de71f 100644
---- a/src/gui/mainwindow.cpp
-+++ b/src/gui/mainwindow.cpp
-@@ -309,7 +309,7 @@ void MainWindow::updateVersion(){
- #elif defined(Q_OS_LINUX)
-             if(!(QFileInfo("/dev/uinput").exists() || QFileInfo("/dev/input/uinput").exists())){
-                 QProcess modprobe;
--                modprobe.start("modprobe", QStringList("uinput"));
-+                modprobe.start("@kmod@/bin/modprobe", QStringList("uinput"));
- 
-                 if(!modprobe.waitForFinished())
-                     qDebug() << "Modprobe error";