From 2bd240a4e1fd4b5fbaf2a68fff93b6c054c7da09 Mon Sep 17 00:00:00 2001 From: Giulio De Pasquale Date: Wed, 21 Feb 2024 11:43:26 +0000 Subject: [PATCH] flake update --- flake.lock | 31 ++++++++++++++++++++++--------- flake.nix | 16 +++++++++++++--- 2 files changed, 35 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index faa07a6..99e29c9 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1704099619, - "narHash": "sha256-QRVMkdxLmv+aKGjcgeEg31xtJEIsYq4i1Kbyw5EPS6g=", + "lastModified": 1706981411, + "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "7e398b3d76bc1503171b1364c9d4a07ac06f3851", + "rev": "652fda4ca6dafeb090943422c34ae9145787af37", "type": "github" }, "original": { @@ -21,13 +21,25 @@ "type": "github" } }, + "local-unstable": { + "locked": { + "lastModified": 0, + "narHash": "sha256-IpDKZGbaoaWizPo0tst5yJ5ZIDwL6iq/juqXjGpQ7jQ=", + "path": "/home/giulio/dev/nixpkgs", + "type": "path" + }, + "original": { + "path": "/home/giulio/dev/nixpkgs", + "type": "path" + } + }, "nixos-unstable": { "locked": { - "lastModified": 1704538339, - "narHash": "sha256-1734d3mQuux9ySvwf6axRWZRBhtcZA9Q8eftD6EZg6U=", + "lastModified": 1708296515, + "narHash": "sha256-FyF489fYNAUy7b6dkYV6rGPyzp+4tThhr80KNAaF/yY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "46ae0210ce163b3cba6c7da08840c1d63de9c701", + "rev": "b98a4e1746acceb92c509bc496ef3d0e5ad8d4aa", "type": "github" }, "original": { @@ -39,11 +51,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1704795870, - "narHash": "sha256-M86cqEn65whEr2JC4yWVJXzGikqpt+2SzcSe3DOiRHQ=", + "lastModified": 1708509836, + "narHash": "sha256-Gk86rEGzpc4ZtlJs2wqCCpAlDcmVgojazG2FqkHrB6Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "72f7568a6d748d87e878098957077118a6af91f8", + "rev": "e837b632e2417b275998501e381be3270afc3ee2", "type": "github" }, "original": { @@ -56,6 +68,7 @@ "root": { "inputs": { "home-manager": "home-manager", + "local-unstable": "local-unstable", "nixos-unstable": "nixos-unstable", "nixpkgs": "nixpkgs" } diff --git a/flake.nix b/flake.nix index fc5b5bd..0e15ca0 100644 --- a/flake.nix +++ b/flake.nix @@ -2,13 +2,14 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/release-23.11"; nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; + local-unstable.url = "path:///home/giulio/dev/nixpkgs"; home-manager = { url = "github:nix-community/home-manager/release-23.11"; inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { self, nixpkgs, nixos-unstable, home-manager }: + outputs = { self, nixpkgs, nixos-unstable, local-unstable, home-manager }: let sysLinuxX64 = "x86_64-linux"; sysDarwin = "aarch64-darwin"; @@ -19,9 +20,16 @@ inherit system; unstablePkgs = wrapUnstablePkgsSystem { inherit system; }; - config.allowUnfree = true; + localPkgs = import local-unstable { + inherit system; + config.allowUnfree = true; + }; + config = { + allowUnfree = true; + }; overlays = [ (final: prev: { inherit unstablePkgs; }) + (final: prev: { inherit localPkgs; }) ]; }; @@ -29,7 +37,9 @@ import nixos-unstable { inherit system; - config.allowUnfree = true; + config = { + allowUnfree = true; + }; }; wrapUtils = { pkgs, unstablePkgs, system }: