# HG changeset patch # User Robin Stumm # Date 1650914298 -7200 # Mon Apr 25 21:18:18 2022 +0200 # Node ID 39cb426d5debb9df5838fb3655adf905176a6fba # Parent 8caa0b1c9aa808a2ee9b1112b277a2fafd2b5634 use styx' nixpkgs diff --git a/flake.lock b/flake.lock --- a/flake.lock +++ b/flake.lock @@ -17,11 +17,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1631222974, - "narHash": "sha256-l4yzBfIsPDS0A/ECgIrpjhACzQk9eto1hbZQk6Tdqxc=", + "lastModified": 1623423544, + "narHash": "sha256-3b6CdnlUBXb2M5F7vLQ/DVRmpu31YDo1wthdybF46Dc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a7490b0149fbc833fb27c6f33df5c04820ead6c2", + "rev": "5707a8efadbd9a2bfe5aa663555c62ba2933cc81", "type": "github" }, "original": { @@ -32,15 +32,16 @@ "root": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", + "nixpkgs": [ + "styx", + "nixpkgs" + ], "styx": "styx" } }, "styx": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs", "utils": [ "flake-utils" ] diff --git a/flake.nix b/flake.nix --- a/flake.nix +++ b/flake.nix @@ -1,18 +1,16 @@ { inputs = { + nixpkgs.follows = "styx/nixpkgs"; flake-utils.url = "github:numtide/flake-utils"; styx = { url = "github:dermetfan/styx/modernize"; - inputs = { - utils.follows = "flake-utils"; - nixpkgs.follows = "nixpkgs"; - }; + inputs.utils.follows = "flake-utils"; }; }; outputs = { self, nixpkgs, flake-utils, styx, ... } @ inputs: flake-utils.lib.eachDefaultSystem (system: let - pkgs = import nixpkgs { inherit system; }; + pkgs = nixpkgs.legacyPackages.${system}; in rec { packages = self.outputs.overlay {} pkgs;