Compare commits

...

2 commits

Author SHA1 Message Date
6878b25b8f
flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/c3aa7b8938b17aebd2deecf7be0636000d62a2b9' (2024-08-14)
  → 'github:nixos/nixpkgs/71e91c409d1e654808b2621f28a327acfdad8dc2' (2024-08-28)
2024-08-30 12:06:21 -05:00
b8f1629a3f
use nim2nix 2024-08-30 12:06:08 -05:00
4 changed files with 55 additions and 10 deletions

View file

@ -1,12 +1,46 @@
{ {
"nodes": { "nodes": {
"nim2nix": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1724878933,
"narHash": "sha256-VP0+Lal3jJJqDH1EzQX73rP9Ue8ZTIyAErJvDz6PQSg=",
"owner": "daylinmorgan",
"repo": "nim2nix",
"rev": "5153c772e4c6a4f5645efa85ce536fe1c5063ebb",
"type": "github"
},
"original": {
"owner": "daylinmorgan",
"repo": "nim2nix",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1723637854, "lastModified": 1724479785,
"narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", "rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1724819573,
"narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -18,7 +52,8 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs" "nim2nix": "nim2nix",
"nixpkgs": "nixpkgs_2"
} }
} }
}, },

View file

@ -3,10 +3,11 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nim2nix.url = "github:daylinmorgan/nim2nix";
}; };
outputs = outputs =
{ nixpkgs, ... }: { nixpkgs, nim2nix, ... }:
let let
inherit (nixpkgs.lib) genAttrs; inherit (nixpkgs.lib) genAttrs;
systems = [ systems = [
@ -15,7 +16,17 @@
"aarch64-linux" "aarch64-linux"
"aarch64-darwin" "aarch64-darwin"
]; ];
forAllSystems = f: genAttrs systems (system: f (import nixpkgs { inherit system; })); forAllSystems =
f:
genAttrs systems (
system:
f (
import nixpkgs {
inherit system;
overlays = [ nim2nix.overlays.default ];
}
)
);
in in
{ {
packages = forAllSystems (pkgs: rec { packages = forAllSystems (pkgs: rec {

View file

@ -10,7 +10,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
pname = "meta"; pname = "meta";
version = "unstable"; version = "unstable";
# src =
buildInputs = [ tunnel ]; buildInputs = [ tunnel ];
phases = [ "installPhase" ]; phases = [ "installPhase" ];

View file

@ -1,14 +1,14 @@
{ {
lib, lib,
buildNimPackage,
makeWrapper, makeWrapper,
buildNimblePackage,
}: }:
buildNimPackage { buildNimblePackage {
pname = "tunnel"; pname = "tunnel";
version = "unstable"; version = "unstable";
src = lib.cleanSource ./.; src = lib.cleanSource ./.;
lockFile = ./lock.json;
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
doCheck = false; doCheck = false;
nimbleDepsHash = "sha256-9tv/dQ+2H24QkZYuJWpLVH2yvzP8t5GLLbmV0eQOWVk=";
} }