c3d2/nix-config
c3d2
/
nix-config
24
7
Fork 3
Code Issues 12 Pull Requests 2 Releases Wiki Activity

rpi-netboot: add tracer, bevy-mandelbrot

This commit is contained in:
Astro 2022-09-14 21:34:27 +02:00
parent 4a03d23f75
commit 3ce02a849c
4 changed files with 189 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

167
flake.lock
View File

@ -1,5 +1,48 @@
{
"nodes": {
"affection-src": {
"inputs": {
"flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1663174424,
"narHash": "sha256-ahmQXwS2P34x7PxXt8Ve2ZVKJHW6yP1m/nZoo8sHwmE=",
"ref": "refs/heads/master",
"rev": "81a76d4eb34eaadee3585a2a1476db785858896c",
"revCount": 291,
"type": "git",
"url": "https://gitea.nek0.eu/nek0/affection"
},
"original": {
"type": "git",
"url": "https://gitea.nek0.eu/nek0/affection"
}
},
"bevy-mandelbrot": {
"inputs": {
"naersk": [
"naersk"
],
"nixpkgs": [
"nixos"
],
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1650651512,
"narHash": "sha256-IuAacdojjZE8QB2JW0NWXEdiErI99O+DhZ7oxPECXJo=",
"owner": "matelab",
"repo": "bevy_mandelbrot",
"rev": "71bed4042f353930f289b06b004de8aaf4d3d930",
"type": "github"
},
"original": {
"owner": "matelab",
"repo": "bevy_mandelbrot",
"type": "github"
}
},
"eris": {
"inputs": {
"nimble": "nimble",
@ -43,6 +86,21 @@
}
},
"flake-utils": {
"locked": {
"lastModified": 1637014545,
"narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
@ -57,7 +115,7 @@
"type": "github"
}
},
"flake-utils_2": {
"flake-utils_3": {
"locked": {
"lastModified": 1637014545,
"narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=",
@ -72,6 +130,21 @@
"type": "github"
}
},
"flake-utils_4": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"heliwatch": {
"inputs": {
"fenix": [
@ -285,7 +358,7 @@
"nix": {
"inputs": {
"lowdown-src": "lowdown-src",
"nixpkgs": "nixpkgs",
"nixpkgs": "nixpkgs_2",
"nixpkgs-regression": "nixpkgs-regression"
},
"locked": {
@ -306,7 +379,7 @@
"nix_2": {
"inputs": {
"lowdown-src": "lowdown-src_2",
"nixpkgs": "nixpkgs_2",
"nixpkgs": "nixpkgs_3",
"nixpkgs-regression": "nixpkgs-regression_2"
},
"locked": {
@ -373,16 +446,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1657693803,
"narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=",
"lastModified": 1637453606,
"narHash": "sha256-Gy6cwUswft9xqsjWxFYEnx/63/qzaFUwatcbV5GF/GQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "365e1b3a859281cf11b94f87231adeabbdd878a2",
"rev": "8afc4e543663ca0a6a4f496262cd05233737e732",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-22.05-small",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
@ -435,6 +508,22 @@
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1657693803,
"narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "365e1b3a859281cf11b94f87231adeabbdd878a2",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-22.05-small",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1645296114,
"narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=",
@ -449,6 +538,21 @@
"type": "indirect"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1663173135,
"narHash": "sha256-QL4JZYUlbt0ex78w30XJ0h9idUMj0DBxppyDsoxEPjE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5d1ddac9493642d7311a064351e643de9a0e24ee",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"type": "github"
}
},
"oparl-scraper": {
"flake": false,
"locked": {
@ -525,9 +629,10 @@
},
"root": {
"inputs": {
"bevy-mandelbrot": "bevy-mandelbrot",
"eris": "eris",
"fenix": "fenix",
"flake-utils": "flake-utils",
"flake-utils": "flake-utils_2",
"heliwatch": "heliwatch",
"hydra": "hydra",
"hydra-ca": "hydra-ca",
@ -548,13 +653,14 @@
"syndicate": "syndicate",
"ticker": "ticker",
"tigger": "tigger",
"tracer": "tracer",
"yammat": "yammat",
"zentralwerk": "zentralwerk"
}
},
"rust": {
"inputs": {
"flake-utils": "flake-utils_2",
"flake-utils": "flake-utils_3",
"nixpkgs": [
"syndicate",
"nixpkgs"
@ -591,6 +697,25 @@
"type": "github"
}
},
"rust-overlay": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1650336226,
"narHash": "sha256-A68t/BM3JPXUDFx9JGBk24euXvsaIZuPL28+hX5TmwA=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "8cd3024e5b011218308eeee35c4839601af458f8",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"scrapers": {
"flake": false,
"locked": {
@ -730,6 +855,30 @@
"type": "github"
}
},
"tracer": {
"inputs": {
"affection-src": "affection-src",
"flake-utils": [
"flake-utils"
],
"nixpkgs": [
"nixos"
]
},
"locked": {
"lastModified": 1663179020,
"narHash": "sha256-dJ1GQQuOLa+ABLO27Fe/Ei1TQaguVJDn5KmWcZo5+QE=",
"ref": "master",
"rev": "dd8556ee2b46588c469da799fe213d56abe6a952",
"revCount": 338,
"type": "git",
"url": "https://gitea.nek0.eu/nek0/tracer"
},
"original": {
"type": "git",
"url": "https://gitea.nek0.eu/nek0/tracer"
}
},
"yammat": {
"inputs": {
"nixpkgs": [

17
flake.nix
View File

@ -6,6 +6,17 @@
nixpkgs-mobilizon.url = "github:minijackson/nixpkgs/init-mobilizon";
nixos-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixos-hardware.url = "github:nixos/nixos-hardware";
bevy-mandelbrot = {
url = "github:matelab/bevy_mandelbrot";
inputs = {
nixpkgs.follows = "nixos";
naersk.follows = "naersk";
naersk.inputs.nixpkgs.follows = "nixpkgs";
# rust-overlay.follows = "rust-overlay";
# rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
# rust-overlay.inputs.flake-utils.follows = "flake-utils";
};
};
eris = {
url = "git+https://codeberg.org/eris/nix-eris";
inputs.nixpkgs.follows = "nixos";
@ -90,6 +101,11 @@
url = "github:astro/tigger";
flake = false;
};
tracer = {
url = "git+https://gitea.nek0.eu/nek0/tracer";
inputs.nixpkgs.follows = "nixos";
inputs.flake-utils.follows = "flake-utils";
};
syndicate = {
url = "git+https://git.syndicate-lang.org/ehmry/syndicate-flake";
inputs.nixpkgs.follows = "nixos";
@ -154,6 +170,7 @@
in {
overlay = import ./overlay {
inherit nixos-unstable;
inherit (inputs) tracer bevy-mandelbrot;
};
legacyPackages = lib.attrsets.mapAttrs (system: pkgs:

2
hosts/rpi-netboot/default.nix
View File

@ -66,6 +66,8 @@
firefox
pavucontrol
glxinfo
tracer-game
# bevy_mandelbrot
];
programs.tmux.enable = true;

17
overlay/default.nix
View File

@ -1,4 +1,7 @@
{ nixos-unstable }:
{ nixos-unstable
, tracer
, bevy-mandelbrot
}:
final: prev:
@ -6,6 +9,8 @@ let
pkgs-unstable = nixos-unstable.legacyPackages.${prev.system};
in
with final; {
inherit (bevy-mandelbrot.packages.${system}) bevy_mandelbrot;
bmxd = callPackage ./bmxd.nix { };
dump1090-influxdb = callPackage ./dump1090-influxdb { };
@ -63,6 +68,8 @@ with final; {
});
};
inherit (nixos-unstable.legacyPackages.${prev.targetPlatform.system}) nomad_1_3;
openssh = prev.openssh.overrideAttrs (oldAttrs: {
# takes 30 minutes
doCheck = false;
@ -78,14 +85,14 @@ with final; {
SimpleYggGen-CPP = prev.callPackage ./simpleygggen.nix { };
inherit (nixos-unstable.legacyPackages.${prev.targetPlatform.system}) nomad_1_3;
inherit (tracer.packages.${system}) tracer-game;
# vector-0.23 + mqtt-sink
vector = pkgs-unstable.callPackage ./vector {};
wander =
if prev ? wander
then builtins.trace "`wander` is now available on stable NixOS. Please remove from overlay!"
prev.wander
else pkgs-unstable.wander;
# vector-0.23 + mqtt-sink
vector = pkgs-unstable.callPackage ./vector {};
}