lix-project/lix-installer
15
3
Fork 4
Code Issues 18 Code Review (Gerrit) Projects Activity

Use nixpkgs-unstable (#351)

Browse source
This commit is contained in:
Ana Hobden 2023-03-20 09:38:44 -07:00 committed by GitHub
parent 371f94ba51
commit 8afb8e457d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
flake.lock
View file

@ -112,16 +112,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1672580127, "lastModified": 1678875422,
"narHash": "sha256-3lW3xZslREhJogoOkjeZtlBtvFMyxHku7I/9IVehhT8=", "narHash": "sha256-T3o6NcQPwXjxJMn2shz86Chch4ljXgZn746c2caGxd8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0874168639713f547c05947c76124f78441ea46c", "rev": "126f49a01de5b7e35a43fd43f891ecf6d3a51459",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-22.05", "ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

10
flake.nix
View file

@ -2,7 +2,7 @@
description = "The Determinate Nix Installer"; description = "The Determinate Nix Installer";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05"; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
fenix = { fenix = {
url = "github:nix-community/fenix"; url = "github:nix-community/fenix";
@ -58,7 +58,7 @@
{ {
overlays.default = final: prev: overlays.default = final: prev:
let let
toolchain = fenixToolchain final.hostPlatform.system; toolchain = fenixToolchain final.stdenv.system;
naerskLib = final.callPackage naersk { naerskLib = final.callPackage naersk {
cargo = toolchain; cargo = toolchain;
rustc = toolchain; rustc = toolchain;
@ -95,19 +95,19 @@
in in
rec { rec {
nix-installer = naerskLib.buildPackage sharedAttrs; 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; default = nix-installer-static;
nix-installer-static = naerskLib.buildPackage nix-installer-static = naerskLib.buildPackage
(sharedAttrs // { (sharedAttrs // {
CARGO_BUILD_TARGET = "x86_64-unknown-linux-musl"; 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; default = nix-installer-static;
nix-installer-static = naerskLib.buildPackage nix-installer-static = naerskLib.buildPackage
(sharedAttrs // { (sharedAttrs // {
CARGO_BUILD_TARGET = "i686-unknown-linux-musl"; 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; default = nix-installer-static;
nix-installer-static = naerskLib.buildPackage nix-installer-static = naerskLib.buildPackage
(sharedAttrs // { (sharedAttrs // {

2
src/action/macos/create_synthetic_objects.rs
View file

@ -5,7 +5,7 @@ use crate::execute_command;
use crate::action::{Action, ActionDescription, ActionError, ActionTag, StatefulAction}; 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)] #[derive(Debug, serde::Deserialize, serde::Serialize, Clone)]
pub struct CreateSyntheticObjects; pub struct CreateSyntheticObjects;

2
src/action/mod.rs
View file

@ -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 [`JoinSet`](tokio::task::JoinSet)s

2
src/error.rs
View file

@ -30,7 +30,7 @@ pub enum NixInstallerError {
#[source] #[source]
serde_json::Error, 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")] #[error("Cancelled by user")]
Cancelled, Cancelled,
/// Semver error /// Semver error

2
src/lib.rs
View file

@ -2,7 +2,7 @@
`nix-installer` breaks down into three main concepts: `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. like [`JoinSet`](tokio::task::JoinSet)s.
* [`InstallPlan`]: A set of [`Action`]s, along with some metadata, which can be carried out to * [`InstallPlan`]: A set of [`Action`]s, along with some metadata, which can be carried out to
drive an install or revert. drive an install or revert.