ehmry/meta
ehmry
/
meta
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Compare commits

merge into: ehmry:trunk
Branches Tags
ehmry:trunk
ehmry:flake
ehmry:20231005
...
pull from: ehmry:flake
Branches Tags
ehmry:trunk
ehmry:flake
ehmry:20231005

11 Commits
trunk ... flake

Author SHA1 Message Date
Ehmry - 0ebf890638 Use NixOS release for nixpkgs pin 2023-05-15 15:19:17 +01:00
Ehmry - 9d4db1aab7 Add simplex_history_actor shell 2023-05-11 22:18:35 +01:00
Ehmry - d84de12836 Add battery_actor 2023-04-30 10:16:56 +01:00
Ehmry - aaceea0c37 Add gemlog shell 2023-04-16 11:38:30 -05:00
Ehmry - 848b5bd97a Add watch firmware shell 2023-04-10 13:34:10 -05:00
Ehmry - 858c3c9312 Add libnotify_actor 2023-04-05 12:44:25 -05:00
Ehmry - 352dcec33c zua: add SDL2 2023-04-02 15:45:17 -05:00
Ehmry - 4fb4ccb3f5 Add nix_actor shell 2023-03-12 17:37:03 -05:00
Ehmry - fbe90ecb74 Add zua shell 2023-03-01 21:49:47 -06:00
Ehmry - 78546fac3e Add devShell for libnl 2023-02-24 11:18:19 -06:00
Ehmry - c7b8bca4bf Draw down flake branch to flake only 2023-01-18 23:14:27 -06:00
24 changed files with 72 additions and 203 deletions
Show Stats Expand all files Collapse all files

3
.envrc
View File

@ -1,3 +0,0 @@
use flake work
PATH_add bin
PATH_add nim/bin

48
.gitmodules vendored
View File

@ -1,51 +1,3 @@
[submodule "syndicate/preserves-nim"]
path = preserves-nim
url = git.syndicate-lang.org:ehmry/preserves-nim.git
[submodule "syndicate/preserves"]
path = preserves
url = https://git.syndicate-lang.org/syndicate-lang/preserves.git
[submodule "coap"]
path = coap
url = git@codeberg.org:eris/nim-coap.git
[submodule "syndicate/protocols"]
path = syndicate/protocols
url = https://git.syndicate-lang.org/syndicate-lang/syndicate-protocols.git
[submodule "syndicate/syndicate-protocols"]
path = syndicate-protocols
url = https://git.syndicate-lang.org/syndicate-lang/syndicate-protocols.git
[submodule "nim"]
path = nim
url = https://github.com/nim-lang/nim.git
[submodule "npeg"]
path = npeg
url = https://github.com/zevv/npeg.git
[submodule "getdns"]
path = getdns
url = https://git.sr.ht/~ehmry/getdns-nim
[submodule "taps"]
path = taps
url = https://git.sr.ht/~ehmry/nim_taps
[submodule "tkrzw"]
path = tkrzw
url = https://git.sr.ht/~ehmry/nim-tkrzw
[submodule "eris-python"]
path = eris-python
url = https://codeberg.org/eris/python-eris.git
[submodule "eris-go"]
path = eris-go
url = https://codeberg.org/eris/eris-go.git
[submodule "git-annex-backend-ERIS"]
path = git-annex-backend-ERIS
url = https://codeberg.org/eris/git-annex-backend-XERIS.git
[submodule "eris-nim"]
path = eris-nim
url = https://codeberg.org/eris/nim-eris.git
[submodule "eris-flake"]
path = eris-flake
url = https://codeberg.org/eris/nix-eris
[submodule "watch-firmware"]
path = watch-firmware
url = https://github.com/joeycastillo/Sensor-Watch
[submodule "eris-meta"]
path = eris-meta
url = git@codeberg.org:eris/meta.git

1
README.md
View File

@ -1 +0,0 @@
This repository contains git-submodules and Tup rules for building the projects that I work on in parallel.

0
Tupfile.ini
View File

17
Tuprules.tup
View File

@ -1,17 +0,0 @@
.gitignore
export NIX_PATH
export XDG_CACHE_HOME
DIRENV = direnv exec .
BIN_DIR = $(TUP_CWD)/bin
NIM_BACKEND = compile
!nim = |> ^o nim compile %B^ $(DIRENV) nim $(NIM_BACKEND) --hints:off -o:%o %f |> %B
!nim_run = |> ^o nim run %B^ $(DIRENV) nim c $(NIM_PATH) --hints:off -o:%o -r %f |> %B.run
!nim_bin = |> ^o nim bin %B^ $(DIRENV) nim c $(NIM_PATH) --hints:off -o:%o %f |> $(BIN_DIR)/%B | $(BIN_DIR)/<%B>
!symlink = |> ln -s %f %o |>
!preserves_schema_nim = | $(BIN_DIR)/<preserves_schema_nim> |> ^o generate nim module %B^ $(BIN_DIR)/preserves_schema_nim %f |> %B.nim
!preserves_schemac = | $(BIN_DIR)/<schemac> |> ^o^ $(BIN_DIR)/schemac |>

2
bin/Tupfile
View File

@ -1,2 +0,0 @@
include_rules
: | $(BIN_DIR)/<msg> |> cp msg %o |> $(BIN_DIR)/beep

1
coap

@ -1 +0,0 @@
Subproject commit bec05d6046cd029b979a6549d864e92916ebaea8

1
eris-flake

@ -1 +0,0 @@
Subproject commit c960373cd75826d98127629ff1be92c9ad473e22

1
eris-go

@ -1 +0,0 @@
Subproject commit 4a7518beba1d20126eedd7b503a6945ad9a759cb

1
eris-meta

@ -1 +0,0 @@
Subproject commit 0529fff2abd9f6b1486aa341a10e43f12e58dcae

1
eris-nim

@ -1 +0,0 @@
Subproject commit 7aed5cc1ac3f99446fc930fa3166f04d4cd6f172

1
eris-python

@ -1 +0,0 @@
Subproject commit 5b4bdfab0e31e4df5dac6a4c69d64e0acc1b07f7

154
flake.lock
View File

@ -1,146 +1,73 @@
{
"nodes": {
"eris": {
"inputs": {
"nixpkgs": [
"ops",
"nixpkgs"
]
},
"locked": {
"lastModified": 1673553193,
"narHash": "sha256-fw8DQs+NrFfZTSlwWNGbEZ8rre69YOKAIsk1MqJIFgY=",
"ref": "refs/heads/trunk",
"rev": "008b29ca3b27e53e678b6c2f11da98d2755fe437",
"revCount": 48,
"type": "git",
"url": "https://codeberg.org/eris/nix-eris"
},
"original": {
"type": "git",
"url": "https://codeberg.org/eris/nix-eris"
}
},
"flake-utils": {
"locked": {
"lastModified": 1656928814,
"narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"gemini": {
"inputs": {
"nixpkgs": "nixpkgs"
"systems": "systems"
},
"locked": {
"lastModified": 1639155521,
"narHash": "sha256-Lh74QEjPIPZSZNvz1zPKEqEjSA6eIci0eDRoZJKIYeE=",
"owner": "nix-community",
"repo": "flake-gemini",
"rev": "2900f752c983974a03e66077f1e6522764486aed",
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github"
},
"original": {
"id": "gemini",
"type": "indirect"
}
},
"nixos-hardware": {
"locked": {
"lastModified": 1673440569,
"narHash": "sha256-FQ5o0yI+MH9MgfseeGDsVIIpIqv3BCgq+0NzncuZ9Zo=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "88016c96c3c338aa801695cdd9f186820bcfe4d6",
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
},
"original": {
"id": "nixos-hardware",
"type": "indirect"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1639153468,
"narHash": "sha256-AXlstb8jjYs8HKGTLOuSjIdFLyPQSI5aYPN34qUy+Rc=",
"lastModified": 1684141842,
"narHash": "sha256-sbdzOwBDcyzz/Dr1ztdF+tElMyM/cgx+4XxVgz+NLRM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "cf8f41fe116c8e733c833acd4759d9261ecd6d1f",
"rev": "2eb0795720849ae19c068e39b17362d3ebcd585c",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-21.11",
"ref": "release-22.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1673450908,
"narHash": "sha256-b8em+kwrNtnB7gR8SyVf6WuTyQ+6tHS6dzt9D9wgKF0=",
"owner": "nixos",
"lastModified": 1682960002,
"narHash": "sha256-5Zjh4pT3lAjFGN1gVrjqj1LLJHKCAlGdLD8raU7oEMc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6c8644fc37b6e141cbfa6c7dc8d98846c4ff0c2e",
"rev": "8670e496ffd093b60e74e7fa53526aa5920d09eb",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"ops": {
"inputs": {
"eris": "eris",
"gemini": "gemini",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2",
"syndicate": "syndicate"
},
"locked": {
"lastModified": 1673902012,
"narHash": "sha256-jbvQJgMqeB6q0mWi0RU9NYS7luoE8x8yY5XzQ2WY/Jk=",
"ref": "refs/heads/trunk",
"rev": "df23e65b3d67a19f11a1ee455845ddcc68c454d9",
"revCount": 673,
"type": "git",
"url": "git://[20a:c3d2:8cf8:f8e5:80fe:9194:3800:87e6]/ops"
},
"original": {
"id": "ops",
"id": "nixpkgs",
"type": "indirect"
}
},
"root": {
"inputs": {
"ops": "ops"
"nixpkgs": "nixpkgs",
"syndicate": "syndicate"
}
},
"rust": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"ops",
"syndicate",
"nixpkgs"
]
},
"locked": {
"lastModified": 1663038100,
"narHash": "sha256-DpqF/1FYpUo3Fm54oBaXzdqIG7BuRkHHFOgLM0uVVF0=",
"lastModified": 1682993975,
"narHash": "sha256-LlI5vwUw97NLAwcOYHRLRfhICVdp7MK2KFcUSj0Zwdg=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "dbd08f5b5469e1e24f00de45ddc73c26290a2bcb",
"rev": "07f421299826591e2b28e03bbbe19a5292395afe",
"type": "github"
},
"original": {
@ -151,25 +78,36 @@
},
"syndicate": {
"inputs": {
"nixpkgs": [
"ops",
"nixpkgs"
],
"nixpkgs": "nixpkgs_2",
"rust": "rust"
},
"locked": {
"lastModified": 1663517796,
"narHash": "sha256-9ay9RvgR2hh0ClQ8P6NkbJKIz4gmgcT/vZ7qXiK0Hik=",
"ref": "synit",
"rev": "3cf46ea6e18cd72c917a2431b716767481262409",
"revCount": 68,
"lastModified": 1683631238,
"narHash": "sha256-7yk++GfD8/sxOm4DLPK7IpoECVXPJ4exsdYZveisRgE=",
"ref": "refs/heads/trunk",
"rev": "673b2aaf1f6b130d8f9a63d04fd8d88d39509d3c",
"revCount": 78,
"type": "git",
"url": "https://git.syndicate-lang.org/ehmry/syndicate-flake"
"url": "https://git.syndicate-lang.org/ehmry/syndicate-flake.git"
},
"original": {
"ref": "synit",
"type": "git",
"url": "https://git.syndicate-lang.org/ehmry/syndicate-flake"
"id": "syndicate",
"type": "indirect"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},

34
flake.nix
View File

@ -1,12 +1,12 @@
{
inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-22.11";
description = "Packages pin";
outputs = { self, ops }:
let
nixpkgs = ops;
inherit (ops.inputs.nixpkgs) lib;
outputs = { self, nixpkgs, syndicate }:
let inherit (nixpkgs) lib;
in {
overlay = final: prev: {
overlays.default = final: prev: {
tup = let
tup' = prev.tup.overrideAttrs
({ patches ? [ ], ... }: { patches = patches ++ [ ./tup.patch ]; });
@ -17,19 +17,37 @@
'';
};
legacyPackages = lib.mapAttrs (_: { extend, ... }: extend self.overlay)
legacyPackages =
lib.mapAttrs (_: { extend, ... }: extend self.overlays.default)
nixpkgs.legacyPackages;
packages =
lib.mapAttrs (_: pkgs: { inherit (pkgs) tup; }) self.legacyPackages;
devShells = lib.mapAttrs (_: pkgs:
with pkgs.extend self.overlay; {
with pkgs.extend self.overlays.default; {
default = mkShell { packages = [ ccacheWrapper gdb tup ]; };
nim = mkShell { packages = [ ccacheWrapper nim-unwrapped nodejs openssl solo5 ]; };
nim = mkShell {
packages = [ ccacheWrapper nim-unwrapped nodejs openssl solo5 ];
};
battery_actor = mkShell { packages = [ libnl pkg-config ]; };
config = mkShell { packages = [ gnused ]; };
eris = mkShell { packages = [ getdns pkg-config solo5 tkrzw ]; };
gemlog = mkShell { packages = [ dhall ]; };
getdns = mkShell { packages = [ getdns pkg-config ]; };
libnl = let
libnl' = libnl.overrideAttrs ({ configureFlags ? [ ], ... }: {
configureFlags = configureFlags ++ [ "--enable-debug" ];
});
in mkShell { packages = [ libnl' pkg-config ]; };
libnotify_actor = mkShell { packages = [ libnotify pkg-config ]; };
nix_actor = mkShell { packages = [ boost nix pkg-config ]; };
movement = mkShell {
packages = [ emscripten gcc-arm-embedded python3Minimal ];
};
simplex_history_actor =
mkShell { packages = [ pkg-config sqlcipher ]; };
zua = mkShell { packages = [ fontconfig pkg-config SDL2 ]; };
}) nixpkgs.legacyPackages;
};

1
getdns

@ -1 +0,0 @@
Subproject commit 764366d3d113b4d78d72487874facaeb0aefa3c1

1
git-annex-backend-ERIS

@ -1 +0,0 @@
Subproject commit 00c45f99959c0e44567cd46bbc4cce356962f6d7

1
nim

@ -1 +0,0 @@
Subproject commit f1519259f85cbdf2d5ff617c6a5534fcd2ff6942

1
npeg

@ -1 +0,0 @@
Subproject commit 8ed85bb6e395f625ffa3c10ec2b9abb2665d6db1

1
preserves

@ -1 +0,0 @@
Subproject commit b88cccb884ef55cefce0807cd3b5dd267af99f25

1
preserves-nim

@ -1 +0,0 @@
Subproject commit 66a653a77514f94fdb53aef807248b5e780c3a8a

1
syndicate-protocols

@ -1 +0,0 @@
Subproject commit 4c03646567eec97016ee08426bad7adfb593e288

1
taps

@ -1 +0,0 @@
Subproject commit 7421a2f47039a986113afb7455d02934c8884c37

1
tkrzw

@ -1 +0,0 @@
Subproject commit efd87edb7b063182c1a1fa018006a87b515d589b

1
watch-firmware

@ -1 +0,0 @@
Subproject commit 801230cc3ab910af73a56738f9b539597e15fa56