From 3d80b2d137d0716a7fd620bcc6747a70fa995f50 Mon Sep 17 00:00:00 2001 From: Magic_RB Date: Wed, 5 Jan 2022 02:34:56 +0100 Subject: [PATCH] Flake updates Signed-off-by: Magic_RB --- flake.lock | 21 ++++++++++----------- flake.nix | 4 +++- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index c4e32c6..5d648af 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1632771837, - "narHash": "sha256-Nrhcl6EvS+V2LbUcEkwg3yrfa6O1Em6YygBmrhoktfA=", + "lastModified": 1641345147, + "narHash": "sha256-2DwiEp/pxQ/gIMlJyYOM/q2sEXaJ4LYqhdvW9TrFjpA=", "ref": "master", - "rev": "ade0f1216960f2aa7ddf0616c55ec16d6445d54b", - "revCount": 28, + "rev": "67759ba6aede849780dcedcc3b316ccc1c0084b0", + "revCount": 39, "type": "git", "url": "https://gitea.redalder.org/ThyW/camptules" }, @@ -75,16 +75,15 @@ ] }, "locked": { - "lastModified": 1638796503, - "narHash": "sha256-J5UjPK7kv41N79yku/gg3u7/vy5VN5W8DsH6AVcUuf0=", + "lastModified": 1641337254, + "narHash": "sha256-h4zTaiqFOlWNGVhBdQc3AqYqcOQ1GjCKn7wY6KbZkuk=", "owner": "MagicRB", "repo": "NixNG", - "rev": "990c82400885077b96491bb6f5d574e26daba917", + "rev": "5126892070a00a183cdaeae0d313e99d87a3b399", "type": "github" }, "original": { "owner": "MagicRB", - "ref": "rework", "repo": "NixNG", "type": "github" } @@ -108,11 +107,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1630761588, - "narHash": "sha256-7GXckvZy7DGh2KIyfdArqwnyeSc5Owy1fumEDQyd8eY=", + "lastModified": 1639256808, + "narHash": "sha256-RRKWi6grwe5lioKUyfZNQ4ojc5kjUTX55fPNzsGH2PY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a51aa6523bd8ee985bc70987909eff235900197a", + "rev": "e675946ecde5606c505540de2024e2732bae4185", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 83e5dcc..2cb22e0 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-unstable"; nixng = { - url = "github:MagicRB/NixNG?ref=rework"; + url = "github:MagicRB/NixNG"; inputs.nixpkgs.follows = "nixpkgs"; }; website = { @@ -40,6 +40,8 @@ { ociImages = mapAttrs (n: v: v.config.system.build.ociImage) containers; + nixngSystems = containers; + hydraJobs = let pkgs = import nixpkgs { system = "x86_64-linux"; };