From 04e8575f81fafda78b411c2b3d17b29d4d113538 Mon Sep 17 00:00:00 2001 From: "DavidCrompton1192@gmail.com" Date: Wed, 8 Mar 2023 00:46:23 -0500 Subject: [PATCH] Update Deploy Flake --- deploy/flake.lock | 175 ++++++++++++++++++++++++++++++++++++++++++++++ deploy/flake.nix | 16 +++-- 2 files changed, 184 insertions(+), 7 deletions(-) create mode 100644 deploy/flake.lock diff --git a/deploy/flake.lock b/deploy/flake.lock new file mode 100644 index 0000000..6361ea2 --- /dev/null +++ b/deploy/flake.lock @@ -0,0 +1,175 @@ +{ + "nodes": { + "advisory-db": { + "flake": false, + "locked": { + "lastModified": 1678190193, + "narHash": "sha256-nuiUyTTjzMVfeRZInX81mBrWk26/2AgjZs/cdjX1oIk=", + "owner": "rustsec", + "repo": "advisory-db", + "rev": "292b3a8437125f015adbd32efd6bcdbbd95303f3", + "type": "github" + }, + "original": { + "owner": "rustsec", + "repo": "advisory-db", + "type": "github" + } + }, + "crane": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nixpkgs": [ + "newalan", + "nixpkgs" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1678152261, + "narHash": "sha256-cPRDxwygVMleiSEGELrvAiq9vYAN4c3KK/K4UEO13vU=", + "owner": "ipetkov", + "repo": "crane", + "rev": "5291dd0aa7a52d607fc952763ef60714e4c881d4", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-utils": { + "locked": { + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "locked": { + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "newalan": { + "inputs": { + "advisory-db": "advisory-db", + "crane": "crane", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 0, + "narHash": "sha256-zCLpkysrnKrXsa3b3f/YU37ZcJ5m9ZzlV6Nub51zT3o=", + "path": "/nix/store/mm63zimn8i76kxkjaz8kgmrffiv92fim-source", + "type": "path" + }, + "original": { + "path": "/nix/store/mm63zimn8i76kxkjaz8kgmrffiv92fim-source", + "type": "path" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1678207308, + "narHash": "sha256-WrmS/Inla0koTZIiq094tmjQA0akXjKtvZMcbgqfEP0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0ef02c4792fbde4b78957a46a8cb107b6c7aa3cc", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1678111249, + "narHash": "sha256-ZTIbK7vthZwti5XeLZE+twkb4l44q01q2XoLMmmJe94=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a028e2873d7fcf44e66b784b4ba061824315537f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "newalan": "newalan", + "nixpkgs": "nixpkgs_2" + } + }, + "rust-overlay": { + "inputs": { + "flake-utils": [ + "newalan", + "crane", + "flake-utils" + ], + "nixpkgs": [ + "newalan", + "crane", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1677812689, + "narHash": "sha256-EakqhgRnjVeYJv5+BJx/NZ7/eFTMBxc4AhICUNquhUg=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "e53e8853aa7b0688bc270e9e6a681d22e01cf299", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/deploy/flake.nix b/deploy/flake.nix index 8fb5d29..f4d9de5 100644 --- a/deploy/flake.nix +++ b/deploy/flake.nix @@ -1,23 +1,25 @@ { inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - inputs.newalan.url = ./flake.nix; + inputs.newalan.url = "../"; - outputs = { self, nixpkgs, newalan }: let + outputs = { self, nixpkgs, newalan, ... }: let + new_alan_overlay = (final: prev: { + new_alan = newalan.packages.newalan; + }); in { - packages."x86_64-linux".nixosConfigurations."staging" = nixpkgs.lib.nixosSystem { + nixosConfigurations."staging" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ ({ config, pkgs, ... }: { nixpkgs.overlays = [ - (final: prev: { - newalan = newalan.newalan; - }); + new_alan_overlay ]; }) ({lib, config, pkgs, ...}: { system.stateVersion = "22.11"; + boot.isContainer = true; environment.systemPackages = with pkgs; [ - newalan + new_alan ]; }) ];