diff options
| -rw-r--r-- | flake.lock | 94 | ||||
| -rw-r--r-- | flake.nix | 1 | ||||
| -rw-r--r-- | nixos/configurations.nix | 1 | ||||
| -rw-r--r-- | pkgs/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/shvspy/default.nix | 51 |
5 files changed, 83 insertions, 67 deletions
@@ -117,6 +117,23 @@ } }, "flake-utils_5": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "type": "github" + }, + "original": { + "id": "flake-utils", + "type": "indirect" + } + }, + "flake-utils_6": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -154,11 +171,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1683646964, - "narHash": "sha256-DZZa3OZIOeIrGwEt9lGXSih4BoO0RBKyrZdYrCx1LQA=", + "lastModified": 1683734489, + "narHash": "sha256-h1RgVCwQd8888WCrkmintDD/eqe3q6XCsRS48IzIdc4=", "owner": "NixOS", "repo": "nix", - "rev": "aacde38d2c8a0cf159794e5ec87ef63dccf59e35", + "rev": "f60b21563990ec11d87dd4abe57b8b187d6b6fb3", "type": "github" }, "original": { @@ -263,11 +280,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1683665855, - "narHash": "sha256-+zaVmryrI+qh+LuSgC8j10x/qWG0fYbMXAdXjzs7hm8=", + "lastModified": 1683723037, + "narHash": "sha256-lHtF5qWd2WhGXPe6p/ZSEFJ4o+QR43Ahj4/byVaNDjU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4487c14ec3f62ebbb677f2da4f83d4c0a424b6e2", + "rev": "f219df95eaf1215df3aa0e92cac74a80df0ee680", "type": "github" }, "original": { @@ -293,6 +310,20 @@ }, "nixpkgs_6": { "locked": { + "lastModified": 1682109806, + "narHash": "sha256-d9g7RKNShMLboTWwukM+RObDWWpHKaqTYXB48clBWXI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2362848adf8def2866fabbffc50462e929d7fffb", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_7": { + "locked": { "lastModified": 1637875414, "narHash": "sha256-Ica++SXFuLyxX9Q7YxhfZulUif6/gwM8AEQYlUxqSgE=", "owner": "NixOS", @@ -306,7 +337,7 @@ "type": "indirect" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1664847737, "narHash": "sha256-Wxl0CtRH3Vo8+qEZ/PbCcx+9D8wEEi56tJPmROum2ss=", @@ -367,6 +398,7 @@ "nixturris": "nixturris", "personal-secret": "personal-secret", "shellrc": "shellrc", + "shvspy": "shvspy", "sterm": "sterm", "usbkey": "usbkey", "vpsadminos": "vpsadminos" @@ -391,11 +423,32 @@ "url": "https://git.cynerd.cz/shellrc" } }, - "sterm": { + "shvspy": { "inputs": { + "flake-utils": "flake-utils_5", "nixpkgs": "nixpkgs_6" }, "locked": { + "lastModified": 1683727373, + "narHash": "sha256-Gn2lRytHVf71jjZB3W1CRwV4lwYKMrusrjZWE763rxY=", + "ref": "refs/heads/master", + "rev": "2065f9776fe2c23d74cc6d948f5a4940675668fc", + "revCount": 366, + "submodules": true, + "type": "git", + "url": "https://github.com/silicon-heaven/shvspy.git" + }, + "original": { + "submodules": true, + "type": "git", + "url": "https://github.com/silicon-heaven/shvspy.git" + } + }, + "sterm": { + "inputs": { + "nixpkgs": "nixpkgs_7" + }, + "locked": { "lastModified": 1661025608, "narHash": "sha256-RJD0js+10s18ovDy0b/edPdQ+H4rc6V0UI0YjGK4rL0=", "owner": "wentasah", @@ -424,10 +477,25 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "usbkey": { "inputs": { - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_7" + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1665754388, @@ -446,11 +514,11 @@ }, "vpsadminos": { "locked": { - "lastModified": 1683615591, - "narHash": "sha256-+/Ww8opcfNw16hpSQEFlfRJvPrul0HrEEFFjNAhX9LU=", + "lastModified": 1683732834, + "narHash": "sha256-djEbQCgd6ykc+0JVBQKCkSL3y3n/brmAijrlFuaH7ms=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "11ab10652190fa10f95f56e5ef3d8af2d1298048", + "rev": "86277fe53af8474cb8e10c9bd1f0d4dcafc30e14", "type": "github" }, "original": { @@ -6,6 +6,7 @@ personal-secret.url = "git+ssh://git@cynerd.cz/nixos-personal-secret"; agenix.url = "github:ryantm/agenix"; + shvspy.url = "git+https://github.com/silicon-heaven/shvspy.git?submodules=1"; nixturris = { url = "github:cynerd/nixturris"; diff --git a/nixos/configurations.nix b/nixos/configurations.nix index 9525888..e247b65 100644 --- a/nixos/configurations.nix +++ b/nixos/configurations.nix @@ -14,6 +14,7 @@ with nixpkgs.lib; let nixpkgs.overlays = [ self.overlays.default agenix.overlays.default + shvspy.overlays.default sterm.overlay ]; system.configurationRevision = self.rev or "dirty"; diff --git a/pkgs/default.nix b/pkgs/default.nix index 6c9ba38..533ce47 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -24,9 +24,6 @@ pkgs: let bigclown-leds = callPackage ./bigclown-leds {}; - # Elektroline packages - shvspy = callPackage ./shvspy {}; - # cyrus_sasl with curus_sasl_xoauth2 cyrus_sasl_xoauth2 = callPackage ./cyrus-sasl-xoauth2 { inherit (pkgs) cyrus_sasl; diff --git a/pkgs/shvspy/default.nix b/pkgs/shvspy/default.nix deleted file mode 100644 index c8b57f5..0000000 --- a/pkgs/shvspy/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - doctest, - qt6, - makeDesktopItem, - copyDesktopItems, -}: -with qt6; - stdenv.mkDerivation rec { - name = "shvspy"; - - src = fetchFromGitHub { - owner = "silicon-heaven"; - repo = "shvspy"; - rev = "c8a3b52e7300f1f05a54569121da8a2e9bb015aa"; - hash = "sha256-+aknZ/Uo0VuMm45PHqSrvdyfD73hofS8HKVSfkIyM5I="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ - cmake - doctest - wrapQtAppsHook - copyDesktopItems - ]; - buildInputs = [ - qtbase - qtserialport - qtwebsockets - qtsvg - doctest - ]; - - desktopItems = [ - (makeDesktopItem { - name = "shvspy"; - exec = "shvspy"; - desktopName = "SHVSpy"; - categories = ["Network" "RemoteAccess"]; - }) - ]; - - meta = with lib; { - description = "Console version of Stardict program"; - homepage = "https://dushistov.github.io/sdcv/"; - license = licenses.gpl2; - }; - } |