diff --git a/flake.lock b/flake.lock index cadab6d..c8c76b0 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1696757521, - "narHash": "sha256-cfgtLNCBLFx2qOzRLI6DHfqTdfWI+UbvsKYa3b3fvaA=", - "owner": "NixOS", + "lastModified": 1701182890, + "narHash": "sha256-4Or0sGbBO9RTpLv5ZCftefUbtGxOy07sC+c6cGb+25g=", + "owner": "Nixos", "repo": "nixpkgs", - "rev": "2646b294a146df2781b1ca49092450e8a32814e1", + "rev": "acab2ad0e77f1b9e27cd3217e69a004959487353", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7ccdc8c..248949c 100644 --- a/flake.nix +++ b/flake.nix @@ -14,12 +14,9 @@ packages = self.lib.mapAttrs (system: pkgs: with pkgs; { inherit fontconfig_actor libnotify_actor noise-c preserves-tools squeak - squeaker syndicate-server; - inherit (nim2Packages) syndicate_utils xdg_open_ng; - preserves-nim = nim2Packages.preserves; + squeaker syndicate-server syndicated-open syndicate_utils; preserves-py = python3Packages.preserves; - syndicate-nim = nim2Packages.syndicate; - syndicate-py = python3Packages.syndicate; + syndicate-py = python3Packages.syndicate-py; }) self.legacyPackages; nixosModules.default = self.nixosModules.syndicate-server; diff --git a/overlay.nix b/overlay.nix index d1acb27..6f1d18b 100644 --- a/overlay.nix +++ b/overlay.nix @@ -1,17 +1,5 @@ final: prev: let - nimOverlay = final': prev': { - nix_actor = final'.callPackage ./packages/nix_actor { }; - - noiseprotocol = final'.callPackage ./packages/nim/noiseprotocol { }; - - syndicate_utils = final'.callPackage ./packages/syndicate_utils-nim { }; - syndicated-open = final'.callPackage ./packages/syndicated-open { }; - xdg_open_ng = - builtins.trace "xdg_open_ng has been renamed to syndicated-open" - final'.syndicated-open; - }; - rustPkgs = let overlay = import (prev.fetchFromGitHub { owner = "oxalica"; @@ -26,42 +14,21 @@ let in { lib = prev.lib.extend (import ./lib.nix); - acpi_actor = final.nim2Packages.callPackage ./packages/acpi_actor { }; + acpi_actor = final.callPackage ./packages/acpi_actor { }; fontconfig_actor = - final.nim2Packages.callPackage ./packages/fontconfig_actor { }; + final.callPackage ./packages/fontconfig_actor { }; libnotify_actor = - final.nim2Packages.callPackage ./packages/libnotify_actor { }; + final.callPackage ./packages/libnotify_actor { }; - nimFlagsFromLockFile = let - fetchDependency = let - methods = { - fetchzip = { url, sha256, ... }: - final.fetchzip { - name = "source"; - inherit url sha256; - }; - git = { fetchSubmodules, leaveDotGit, rev, sha256, url, ... }: - final.fetchgit { - inherit fetchSubmodules leaveDotGit rev sha256 url; - }; - }; - in attrs@{ method, ... }: methods.${method} attrs // attrs; - in lockFile: - with builtins; - final.lib.pipe lockFile [ - readFile - fromJSON - (getAttr "depends") - (map fetchDependency) - (map ({ outPath, srcDir, ... }: ''--path:"${outPath}/${srcDir}"'')) - ]; + nix_actor = final.callPackage ./packages/nix_actor { }; - nimPackages = prev.nimPackages.overrideScope' nimOverlay; - nim2Packages = prev.nim2Packages.overrideScope' nimOverlay; + noiseprotocol = final.callPackage ./packages/nim/noiseprotocol { }; - inherit (final.nim2Packages) nix_actor; + syndicate_utils = final.callPackage ./packages/syndicate_utils-nim { }; + + syndicated-open = final.callPackage ./packages/syndicated-open { }; noise-c = final.callPackage ./packages/noise-c { }; @@ -73,7 +40,7 @@ in { synit-daemons = final'.callPackage ./packages/synit-daemons-py { }; }); - sqlite_actor = final.nim2Packages.callPackage ./packages/sqlite_actor { }; + sqlite_actor = final.callPackage ./packages/sqlite_actor { }; squeak = final.callPackage ./packages/squeak { }; squeaker = final.python3Packages.callPackage ./packages/squeaker { }; @@ -83,5 +50,5 @@ in { synit-pid1 = final.callPackage ./packages/synit-pid1 { }; - xapian_actor = final.nim2Packages.callPackage ./packages/xapian_actor { }; + xapian_actor = final.callPackage ./packages/xapian_actor { }; } diff --git a/packages/acpi_actor/default.nix b/packages/acpi_actor/default.nix index ae69139..ae90100 100644 --- a/packages/acpi_actor/default.nix +++ b/packages/acpi_actor/default.nix @@ -1,20 +1,20 @@ -{ lib, buildNimPackage, fetchFromGitea, nimFlagsFromLockFile }: +{ lib, buildNimPackage, fetchFromGitea }: -buildNimPackage (final: prev: { +buildNimPackage rec { pname = "acpi_actor"; version = "20231010"; src = fetchFromGitea { domain = "git.syndicate-lang.org"; owner = "ehmry"; - repo = final.pname; - rev = final.version; + repo = pname; + rev = version; hash = "sha256-eN3VC2yL6UvjeIGvzx0PAujR/Xd6Rc1e9Ftf6fKKk2E="; }; - nimFlags = nimFlagsFromLockFile "${final.src}/lock.json"; + lockFile = "${src}/lock.json"; - meta = final.src.meta // { + meta = src.meta // { maintainers = [ lib.maintainers.ehmry ]; license = lib.licenses.unlicense; }; diff --git a/packages/fontconfig_actor/default.nix b/packages/fontconfig_actor/default.nix index 057b3e6..a002fc3 100644 --- a/packages/fontconfig_actor/default.nix +++ b/packages/fontconfig_actor/default.nix @@ -1,27 +1,25 @@ -{ lib, buildNimPackage, fetchFromGitea, fontconfig, pkg-config -, nimFlagsFromLockFile }: +{ lib, buildNimPackage, fetchFromGitea, fontconfig, pkg-config }: -buildNimPackage (final: prev: { +buildNimPackage rec { pname = "fontconfig_actor"; - version = "20231009"; - nimBinOnly = true; + version = "20231021"; src = fetchFromGitea { domain = "git.syndicate-lang.org"; owner = "ehmry"; - repo = final.pname; - rev = final.version; - hash = "sha256-DeoHz+vi3/cXANxm54C7zY2H0lzrHTj2bfWLAMGOZBw="; + repo = pname; + rev = version; + hash = "sha256-3LRIsZ6NA+E799/z6PGb4wH3CgJ6lx2CgKH/CzEuSzQ="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ fontconfig ]; - nimFlags = nimFlagsFromLockFile "${final.src}/lock.json"; + lockFile = "${src}/lock.json"; - meta = final.src.meta // { + meta = src.meta // { description = "Syndicate actor for asserting Fontconfig information"; maintainers = [ lib.maintainers.ehmry ]; license = lib.licenses.unlicense; }; -}) +} diff --git a/packages/libnotify_actor/default.nix b/packages/libnotify_actor/default.nix index c502259..e57e6aa 100644 --- a/packages/libnotify_actor/default.nix +++ b/packages/libnotify_actor/default.nix @@ -1,25 +1,24 @@ -{ lib, buildNimPackage, fetchFromGitea, libnotify, pkg-config -, nimFlagsFromLockFile }: +{ lib, buildNimPackage, fetchFromGitea, libnotify, pkg-config }: -buildNimPackage (final: prev: { +buildNimPackage rec { pname = "libnotify_actor"; - version = "20231009"; + version = "20231130"; src = fetchFromGitea { domain = "git.syndicate-lang.org"; owner = "ehmry"; - repo = final.pname; - rev = final.version; - hash = "sha256-xNHadWL3Lay1HGEfdmjpLDJsOddrqziMGm0A74tbeYA="; + repo = pname; + rev = version; + hash = "sha256-PNRscNm3axhEr1O2QGLs9JBH35err34y3wc9arPxZ5c="; }; propagatedNativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ libnotify ]; - nimFlags = nimFlagsFromLockFile "${final.src}/lock.json"; + lockFile = "${src}/lock.json"; - meta = final.src.meta // { + meta = src.meta // { maintainers = [ lib.maintainers.ehmry ]; license = lib.licenses.unlicense; }; -}) +} diff --git a/packages/nix_actor/default.nix b/packages/nix_actor/default.nix index 72e5868..4af0bf7 100644 --- a/packages/nix_actor/default.nix +++ b/packages/nix_actor/default.nix @@ -1,5 +1,5 @@ -{ lib, buildNimPackage, fetchFromGitea, fetchFromGitHub, boost, nix -, nimFlagsFromLockFile, pkg-config }: +{ lib, buildNimPackage, fetchFromGitea, fetchFromGitHub, boost, nix, pkg-config +}: let nix' = nix.overrideAttrs (final: prev: { @@ -10,26 +10,25 @@ let hash = "sha256-jUc2ccTR8f6MGY2pUKgujm+lxSPNGm/ZAP+toX+nMNc="; }; }); -in buildNimPackage (final: prev: { +in buildNimPackage rec { pname = "nix_actor"; version = "20231009"; src = fetchFromGitea { domain = "git.syndicate-lang.org"; owner = "ehmry"; - repo = final.pname; - rev = final.version; + repo = pname; + rev = version; hash = "sha256-+wMhpmC1233Ze4+xnd5sNnIfsXkGEx67bZN3oMYu2EQ="; }; - nimBinOnly = true; - nimFlags = nimFlagsFromLockFile "${final.src}/lock.json"; + lockFile = "${src}/lock.json"; propagatedNativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ boost nix' ]; - meta = final.src.meta // { + meta = src.meta // { maintainers = [ lib.maintainers.ehmry ]; license = lib.licenses.unlicense; }; -}) +} diff --git a/packages/sqlite_actor/default.nix b/packages/sqlite_actor/default.nix index d9b5617..d7f6f1e 100644 --- a/packages/sqlite_actor/default.nix +++ b/packages/sqlite_actor/default.nix @@ -1,25 +1,24 @@ -{ lib, buildNimPackage, fetchFromGitea, pkg-config, sqlcipher -, nimFlagsFromLockFile }: +{ lib, buildNimPackage, fetchFromGitea, pkg-config, sqlcipher }: -buildNimPackage (final: prev: { +buildNimPackage rec { pname = "sqlite_actor"; version = "20231010"; src = fetchFromGitea { domain = "git.syndicate-lang.org"; owner = "ehmry"; - repo = final.pname; - rev = final.version; + repo = pname; + rev = version; hash = "sha256-oKw5GUsK1F2RegOFiNYkLXT5CvtWcF/8H6QdE4DXa1A="; }; propagatedNativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ sqlcipher ]; - nimFlags = nimFlagsFromLockFile "${final.src}/lock.json"; + lockFile = "${src}/lock.json"; - meta = final.src.meta // { + meta = src.meta // { maintainers = [ lib.maintainers.ehmry ]; license = lib.licenses.unlicense; }; -}) +} diff --git a/packages/syndicate_utils-nim/default.nix b/packages/syndicate_utils-nim/default.nix index a138bb6..80f03cd 100644 --- a/packages/syndicate_utils-nim/default.nix +++ b/packages/syndicate_utils-nim/default.nix @@ -1,22 +1,23 @@ -{ lib, buildNimPackage, fetchFromGitea, nimFlagsFromLockFile }: +{ lib, buildNimPackage, fetchFromGitea }: -buildNimPackage (final: prev: { +buildNimPackage rec { pname = "syndicate_utils"; - version = "20231005"; + version = "20231130"; src = fetchFromGitea { domain = "git.syndicate-lang.org"; owner = "ehmry"; - repo = final.pname; - rev = final.version; - hash = "sha256-RNbEoD4p8o4ZrBFGD2wdmM4VmqfeCbhm0bOzIO0pVNI="; + repo = "syndicate_utils"; + rev = version; + hash = "sha256-a9EjHSrLyWoP4qUQM+fRjZrNavQfT+SUO44pnPK1j/Q="; }; - nimBinOnly = true; - nimFlags = nimFlagsFromLockFile "${final.src}/lock.json"; + lockFile = "${src}/lock.json"; - meta = final.src.meta // { + meta = src.meta // { + description = "Utilities for the Syndicated Actor Model"; + homepage = "https://git.syndicate-lang.org/ehmry/syndicate_utils"; maintainers = [ lib.maintainers.ehmry ]; license = lib.licenses.unlicense; }; -}) +} diff --git a/packages/syndicated-open/default.nix b/packages/syndicated-open/default.nix index 8b3ffe9..502a769 100644 --- a/packages/syndicated-open/default.nix +++ b/packages/syndicated-open/default.nix @@ -1,23 +1,21 @@ -{ lib, buildNimPackage, fetchFromGitea, makeDesktopItem, pkg-config, pcre -, nimFlagsFromLockFile }: +{ lib, buildNimPackage, fetchFromGitea, makeDesktopItem, pkg-config, pcre }: -buildNimPackage (final: prev: { +buildNimPackage rec { pname = "syndicated-open"; version = "20231010"; - nimBinOnly = true; src = fetchFromGitea { domain = "git.syndicate-lang.org"; owner = "ehmry"; - repo = final.pname; - rev = final.version; + repo = pname; + rev = version; hash = "sha256-DVBSsnN59XKV7Pc1spBxcLwyOIif3xMHXHID9khVJck="; }; nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ pcre ]; - nimFlags = nimFlagsFromLockFile "${final.src}/lock.json"; + lockFile = "${src}/lock.json"; desktopItem = makeDesktopItem rec { name = "open"; @@ -38,9 +36,9 @@ buildNimPackage (final: prev: { cp -a $desktopItem/* $out/ ''; - meta = final.src.meta // { + meta = src.meta // { description = "Syndicated open command"; maintainers = [ lib.maintainers.ehmry ]; license = lib.licenses.unlicense; }; -}) +}