From 9c52c420c7f5e989c81c0c2480c8a811ba4ceac2 Mon Sep 17 00:00:00 2001 From: Fedir Zadniprovskyi Date: Tue, 28 Jan 2025 18:50:54 -0800 Subject: [PATCH] deps: add nixpkgs-master flake input --- flake.lock | 19 ++++++++++++++++++- flake.nix | 13 ++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/flake.lock b/flake.lock index 4029d991..17fa548b 100644 --- a/flake.lock +++ b/flake.lock @@ -34,10 +34,27 @@ "type": "github" } }, + "nixpkgs-master": { + "locked": { + "lastModified": 1737994093, + "narHash": "sha256-W4XwCjMCGKCPgxUP+uy0i45xPUIEzGihD/f2Hg/jUFM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "34a9dfb71ee97f281ccf43b043f491090845a4ac", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "nixpkgs-master": "nixpkgs-master" } }, "systems": { diff --git a/flake.nix b/flake.nix index d6e933e8..f5d2818c 100644 --- a/flake.nix +++ b/flake.nix @@ -1,10 +1,16 @@ { inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs-master.url = "github:NixOS/nixpkgs/master"; flake-utils.url = "github:numtide/flake-utils"; }; outputs = - { nixpkgs, flake-utils, ... }: + { + nixpkgs, + nixpkgs-master, + flake-utils, + ... + }: flake-utils.lib.eachDefaultSystem ( system: let @@ -13,6 +19,11 @@ config.allowUnfree = true; }; + pkgs-master = import nixpkgs-master { + inherit system; + config.allowUnfree = true; + }; + linuxOnlyPkgs = with pkgs; if system == "x86_64-linux" then