From be6f87025be33d2dd8eaa5b7e2c7f143fbc77662 Mon Sep 17 00:00:00 2001 From: xenia Date: Mon, 16 Sep 2024 14:23:21 +0200 Subject: [PATCH] Add nixpkgs-unstable input --- flake.lock | 17 +++++++++++++++++ flake.nix | 6 +++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index d787cfc8..71af2b3d 100644 --- a/flake.lock +++ b/flake.lock @@ -266,6 +266,22 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1726436956, + "narHash": "sha256-a3rP7uafX/qBFX0y4CGS8vvTPvxsLl9eZQ85DkIn3DI=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "039b72d0c738c934e2e36d7fc5520d1b425287a6", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "agda": "agda", @@ -275,6 +291,7 @@ "nix-darwin": "nix-darwin", "nixos-apple-silicon": "nixos-apple-silicon", "nixpkgs": "nixpkgs", + "nixpkgs-unstable": "nixpkgs-unstable", "unambig-path": "unambig-path", "unispect": "unispect" } diff --git a/flake.nix b/flake.nix index 5a801b67..aef1444c 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,8 @@ url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; + nix-darwin = { url = "github:LnL7/nix-darwin"; inputs.nixpkgs.follows = "nixpkgs"; @@ -39,9 +41,10 @@ }; }; - outputs = { self, nixpkgs, home-manager, nix-darwin, kak, unispect, ansi-utils, unambig-path, agda, nixos-apple-silicon }: + outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, nix-darwin, kak, unispect, ansi-utils, unambig-path, agda, nixos-apple-silicon }: let mkPkgs = system: import nixpkgs { system = system; config.allowUnfree = true; }; + mkPkgsUnstable = system: import nixpkgs-unstable { system = system; config.allowUnfree = true; }; mkPkgsUnsupported = system: import nixpkgs { system = system; config.allowUnfree = true; config.allowUnsupportedSystem = true; }; mkHome = {username, home-dir, prompt-color, system, pkgs} : import ./home/common.nix { inherit username home-dir prompt-color pkgs; @@ -166,6 +169,7 @@ let system = "aarch64-linux"; pkgs = mkPkgs system; + pkgs-unstable = mkPkgsUnstable system; base = mkNixOsBase { inherit system pkgs; hostname = "foxhut";