From dee6180e88577b9a25e8cafd265544568fdff7ea Mon Sep 17 00:00:00 2001 From: "DavidCrompton1192@gmail.com" Date: Wed, 8 Mar 2023 00:20:20 -0500 Subject: [PATCH] Move deploy --- deploy.nix => deploy/flake.nix | 2 +- flake.lock | 24 ++++++++++++------------ flake.nix | 14 ++++++++------ 3 files changed, 21 insertions(+), 19 deletions(-) rename deploy.nix => deploy/flake.nix (86%) diff --git a/deploy.nix b/deploy/flake.nix similarity index 86% rename from deploy.nix rename to deploy/flake.nix index 18d8cd7..8fb5d29 100644 --- a/deploy.nix +++ b/deploy/flake.nix @@ -4,7 +4,7 @@ outputs = { self, nixpkgs, newalan }: let in { - nixosConfigurations.staging = nixpkgs.lib.nixosSystem { + packages."x86_64-linux".nixosConfigurations."staging" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ ({ config, pkgs, ... }: { diff --git a/flake.lock b/flake.lock index 7b1366c..93b385f 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "advisory-db": { "flake": false, "locked": { - "lastModified": 1677345087, - "narHash": "sha256-PSkBGJ6KyGbTeLtEgdHSljm76NOeoww9hDgBD/QBffk=", + "lastModified": 1678190193, + "narHash": "sha256-nuiUyTTjzMVfeRZInX81mBrWk26/2AgjZs/cdjX1oIk=", "owner": "rustsec", "repo": "advisory-db", - "rev": "9a5b1008028e4b37e91f5951e639ad7848232f8e", + "rev": "292b3a8437125f015adbd32efd6bcdbbd95303f3", "type": "github" }, "original": { @@ -26,11 +26,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1677642623, - "narHash": "sha256-GlRa6/HWg8mIxPM29ZuTP2dP8y9sQ6BdbrjzCO8JgAo=", + "lastModified": 1678152261, + "narHash": "sha256-cPRDxwygVMleiSEGELrvAiq9vYAN4c3KK/K4UEO13vU=", "owner": "ipetkov", "repo": "crane", - "rev": "f3f763e4d9f156ec0c37f39b0f77e2d62213b296", + "rev": "5291dd0aa7a52d607fc952763ef60714e4c881d4", "type": "github" }, "original": { @@ -87,11 +87,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1677816901, - "narHash": "sha256-oqe8Q9LlWNGfVfUDkKfpWAk+I9RRDBvMSyYVIOZCfPM=", + "lastModified": 1678207308, + "narHash": "sha256-WrmS/Inla0koTZIiq094tmjQA0akXjKtvZMcbgqfEP0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0749042bfaa2f4efa70ac829c5387133cfc0a337", + "rev": "0ef02c4792fbde4b78957a46a8cb107b6c7aa3cc", "type": "github" }, "original": { @@ -121,11 +121,11 @@ ] }, "locked": { - "lastModified": 1676437770, - "narHash": "sha256-mhJye91Bn0jJIE7NnEywGty/U5qdELfsT8S+FBjTdG4=", + "lastModified": 1677812689, + "narHash": "sha256-EakqhgRnjVeYJv5+BJx/NZ7/eFTMBxc4AhICUNquhUg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a619538647bd03e3ee1d7b947f7c11ff289b376e", + "rev": "e53e8853aa7b0688bc270e9e6a681d22e01cf299", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9bf6831..10e9da0 100644 --- a/flake.nix +++ b/flake.nix @@ -106,12 +106,6 @@ partitions = 1; partitionType = "count"; }); - runCommandHook = { - newalan = pkgs.writeScript "New Alan CD" '' - echo HIIIII - echo Wheee - ''; - }; } // lib.optionalAttrs (system == "x86_64-linux") { # NB: cargo-tarpaulin only supports x86_64 systems # Check code coverage (note: this will not upload coverage anywhere) @@ -120,6 +114,12 @@ }); }; + runCommandHook = { + newalan = pkgs.writeScript "New Alan CD" '' + echo HIIIII $(date) >> ~/TEST_SCRIPT + echo Wheee + ''; + }; packages.default = newalan; apps.default = flake-utils.lib.mkApp { @@ -137,6 +137,8 @@ cargo rustc rust-analyzer + + deploy-rs ]; }; }