ehmry
/
syndicate-flake
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update inputs and some packages

This commit is contained in:
Emery Hemingway 2023-11-30 12:23:20 +02:00
parent 42e809cf9e
commit 46dfdc0b4d
10 changed files with 73 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flake.lock
View File

@ -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": {

7
flake.nix
View File

@ -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;

53
overlay.nix
View File

@ -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 { };
}

12
packages/acpi_actor/default.nix
View File

@ -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;
};

20
packages/fontconfig_actor/default.nix
View File

@ -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;
};
})
}

19
packages/libnotify_actor/default.nix
View File

@ -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;
};
})
}

17
packages/nix_actor/default.nix
View File

@ -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;
};
})
}

15
packages/sqlite_actor/default.nix
View File

@ -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;
};
})
}

21
packages/syndicate_utils-nim/default.nix
View File

@ -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;
};
})
}

16
packages/syndicated-open/default.nix
View File

@ -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;
};
})
}