diff --git a/flake.nix b/flake.nix index e8d3354..2c56c41 100644 --- a/flake.nix +++ b/flake.nix @@ -14,6 +14,7 @@ nimPackages = prev.nimPackages.overrideScope' (final': prev': { preserves = final'.callPackage ./preserves-nim { }; syndicate = final'.callPackage ./syndicate-nim { }; + syndicate_utils = final'.callPackage ./syndicate_utils-nim { }; xdg_open_ng = final'.callPackage ./xdg_open_ng { }; }); @@ -40,7 +41,7 @@ packages = self.lib.mapAttrs (system: pkgs: with pkgs; { inherit preserves-tools squeak squeaker syndicate-server; - inherit (nimPackages) xdg_open_ng; + inherit (nimPackages) syndicate_utils xdg_open_ng; preserves-nim = nimPackages.preserves; preserves-py = python3Packages.preserves; syndicate-nim = nimPackages.syndicate; diff --git a/syndicate-nim/default.nix b/syndicate-nim/default.nix index 0650224..27fe8f9 100644 --- a/syndicate-nim/default.nix +++ b/syndicate-nim/default.nix @@ -10,14 +10,14 @@ let in buildNimPackage rec { pname = "syndicate"; - version = "1.3.0"; + version = "20220627"; src = fetchFromGitea { domain = "git.syndicate-lang.org"; owner = "ehmry"; repo = "${pname}-nim"; - rev = "nim-${pname}-${version}"; - hash = "sha256-VEVwbZLr+h+kbge7B7kmDUgt4URh+Lqm3yQ2U+g61ww="; + rev = version; + hash = "sha256-o9RvXLsGK1sJzA2eshAxxD2/PznIqmBrSTh8NmZdIJU="; }; propagatedBuildInputs = [ nimSHA2 preserves ]; diff --git a/syndicate_utils-nim/default.nix b/syndicate_utils-nim/default.nix new file mode 100644 index 0000000..936b02e --- /dev/null +++ b/syndicate_utils-nim/default.nix @@ -0,0 +1,41 @@ +{ lib, buildNimPackage, fetchFromGitea, fetchFromGitHub, syndicate, libnotify }: + +let + gtk2 = fetchFromGitHub { + owner = "nim-lang"; + repo = "gtk2"; + rev = "v1.3"; + hash = "sha256-KPHMF2gHIwjRuslJOhbf7KU0VUwp4Oe0+63YKKOBCPk="; + }; + nim-libnotify = buildNimPackage rec { + pname = "libnotify"; + version = "HEAD"; + src = fetchFromGitHub { + owner = "FedericoCeratto"; + repo = "nim-${pname}"; + rev = "c715ca5b23377a9bceba93529339526fbca11517"; + hash = "sha256-Ifp7cV+Jxa7ZotggIkR6OT6I/f4LZ7ZBtSdfkjVtg7w="; + }; + propagatedBuildInputs = [ libnotify gtk2 ]; + }; +in buildNimPackage rec { + pname = "syndicate_utils"; + version = "20220627"; + + src = fetchFromGitea { + domain = "git.syndicate-lang.org"; + owner = "ehmry"; + repo = pname; + rev = version; + hash = "sha256-FFKDjSUECnintVyhTBoNOt+gIRQu9ydaA3uCLjSnyAE="; + }; + + propagatedBuildInputs = [ syndicate nim-libnotify ]; + nimFlags = + [ "-p:${gtk2}/src/" ]; # everyone breaks the nimble rules, nim-lang included + + meta = src.meta // { + maintainers = [ lib.maintainers.ehmry ]; + license = lib.licenses.unlicense; + }; +}