From 8afb8e457d4b41e1d75aa7306655b0a1414d16e3 Mon Sep 17 00:00:00 2001
From: Ana Hobden <operator@hoverbear.org>
Date: Mon, 20 Mar 2023 09:38:44 -0700
Subject: [PATCH] Use nixpkgs-unstable (#351)

---
 flake.lock                                   |  8 ++++----
 flake.nix                                    | 10 +++++-----
 src/action/macos/create_synthetic_objects.rs |  2 +-
 src/action/mod.rs                            |  2 +-
 src/error.rs                                 |  2 +-
 src/lib.rs                                   |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/flake.lock b/flake.lock
index 8c65bb8..b8ef6b4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -112,16 +112,16 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1672580127,
-        "narHash": "sha256-3lW3xZslREhJogoOkjeZtlBtvFMyxHku7I/9IVehhT8=",
+        "lastModified": 1678875422,
+        "narHash": "sha256-T3o6NcQPwXjxJMn2shz86Chch4ljXgZn746c2caGxd8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0874168639713f547c05947c76124f78441ea46c",
+        "rev": "126f49a01de5b7e35a43fd43f891ecf6d3a51459",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-22.05",
+        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index e72be85..7f3be78 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "The Determinate Nix Installer";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
 
     fenix = {
       url = "github:nix-community/fenix";
@@ -58,7 +58,7 @@
     {
       overlays.default = final: prev:
         let
-          toolchain = fenixToolchain final.hostPlatform.system;
+          toolchain = fenixToolchain final.stdenv.system;
           naerskLib = final.callPackage naersk {
             cargo = toolchain;
             rustc = toolchain;
@@ -95,19 +95,19 @@
         in
         rec {
           nix-installer = naerskLib.buildPackage sharedAttrs;
-        } // nixpkgs.lib.optionalAttrs (prev.hostPlatform.system == "x86_64-linux") rec {
+        } // nixpkgs.lib.optionalAttrs (prev.stdenv.system == "x86_64-linux") rec {
           default = nix-installer-static;
           nix-installer-static = naerskLib.buildPackage
             (sharedAttrs // {
               CARGO_BUILD_TARGET = "x86_64-unknown-linux-musl";
             });
-        } // nixpkgs.lib.optionalAttrs (prev.hostPlatform.system == "i686-linux") rec {
+        } // nixpkgs.lib.optionalAttrs (prev.stdenv.system == "i686-linux") rec {
           default = nix-installer-static;
           nix-installer-static = naerskLib.buildPackage
             (sharedAttrs // {
               CARGO_BUILD_TARGET = "i686-unknown-linux-musl";
             });
-        } // nixpkgs.lib.optionalAttrs (prev.hostPlatform.system == "aarch64-linux") rec {
+        } // nixpkgs.lib.optionalAttrs (prev.stdenv.system == "aarch64-linux") rec {
           default = nix-installer-static;
           nix-installer-static = naerskLib.buildPackage
             (sharedAttrs // {
diff --git a/src/action/macos/create_synthetic_objects.rs b/src/action/macos/create_synthetic_objects.rs
index aa56a3a..56f31ae 100644
--- a/src/action/macos/create_synthetic_objects.rs
+++ b/src/action/macos/create_synthetic_objects.rs
@@ -5,7 +5,7 @@ use crate::execute_command;
 
 use crate::action::{Action, ActionDescription, ActionError, ActionTag, StatefulAction};
 
-/// Create the synthetic objects defined in `/etc/syntethic.conf`
+/// Create the synthetic objects defined in `/etc/synthetic.conf`
 #[derive(Debug, serde::Deserialize, serde::Serialize, Clone)]
 pub struct CreateSyntheticObjects;
 
diff --git a/src/action/mod.rs b/src/action/mod.rs
index 28d3003..17703af 100644
--- a/src/action/mod.rs
+++ b/src/action/mod.rs
@@ -1,4 +1,4 @@
-/*! An executable or revertable step, possibly orcestrating sub-[`Action`]s using things like
+/*! An executable or revertable step, possibly orchestrating sub-[`Action`]s using things like
     [`JoinSet`](tokio::task::JoinSet)s
 
 
diff --git a/src/error.rs b/src/error.rs
index 3c19ea0..3070374 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -30,7 +30,7 @@ pub enum NixInstallerError {
         #[source]
         serde_json::Error,
     ),
-    /// An error ocurring when a signal is issued along [`InstallPlan::install`](crate::InstallPlan::install)'s `cancel_channel` argument
+    /// An error occurring when a signal is issued along [`InstallPlan::install`](crate::InstallPlan::install)'s `cancel_channel` argument
     #[error("Cancelled by user")]
     Cancelled,
     /// Semver error
diff --git a/src/lib.rs b/src/lib.rs
index 3868aba..40b371a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -2,7 +2,7 @@
 
 `nix-installer` breaks down into three main concepts:
 
-* [`Action`]: An executable or revertable step, possibly orcestrating sub-[`Action`]s using things
+* [`Action`]: An executable or revertable step, possibly orchestrating sub-[`Action`]s using things
   like [`JoinSet`](tokio::task::JoinSet)s.
 * [`InstallPlan`]: A set of [`Action`]s, along with some metadata, which can be carried out to
   drive an install or revert.