From 4929ad48c05db721647669db8c062cc4d6d63c61 Mon Sep 17 00:00:00 2001 From: Alex Stan <90788596+Ultra980@users.noreply.github.com> Date: Wed, 28 Jun 2023 10:20:19 +0300 Subject: [PATCH] made most of the inputs follow nixpkgs unstable Signed-off-by: Alex Stan --- flake.lock | 177 ++++++++++++----------------------------------------- flake.nix | 40 +++++++++--- 2 files changed, 71 insertions(+), 146 deletions(-) diff --git a/flake.lock b/flake.lock index 50ddff1..a3f6a24 100644 --- a/flake.lock +++ b/flake.lock @@ -272,7 +272,9 @@ "eww": { "inputs": { "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs", + "nixpkgs": [ + "nixpkgs" + ], "rust-overlay": "rust-overlay" }, "locked": { @@ -442,16 +444,18 @@ "helix": { "inputs": { "nci": "nci", - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "nixpkgs" + ], "parts": "parts_2", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1687842567, - "narHash": "sha256-V47oJQs9XgLlZ8XXgGeuB2ELZ5db3mq63CcvqelwMbg=", + "lastModified": 1687873042, + "narHash": "sha256-7L376DQc66K8s2p9UxreHUwFpbx/hpRMQDxHzeRmQ4g=", "owner": "helix-editor", "repo": "helix", - "rev": "b68b3608a6772fd6740fb7e7ccc623a1a1579b17", + "rev": "d8f9b901ddb1d91bf3ade66cf091e93b5cab6e49", "type": "github" }, "original": { @@ -468,11 +472,11 @@ ] }, "locked": { - "lastModified": 1687847320, - "narHash": "sha256-/nISfR5SHOYWhpoMFp1LqXbRm1MuqY+gxUMggXM9HMk=", + "lastModified": 1687901550, + "narHash": "sha256-p0AWnbv6+6dxBgvTZuvMHu9FW/spaISiT9k+r4bWm2g=", "owner": "nix-community", "repo": "home-manager", - "rev": "3bc1bc40121eb0975dc3d96741300bb4fd16be29", + "rev": "9dd107a1d5395fae9b969597e02f3ef3a43ddd47", "type": "github" }, "original": { @@ -483,7 +487,9 @@ }, "hypr-contrib": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1687033460, @@ -502,16 +508,18 @@ "hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols", - "nixpkgs": "nixpkgs_4", + "nixpkgs": [ + "nixpkgs" + ], "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1687816264, - "narHash": "sha256-WDX7CpYEanlCPTxlcrACbqyRx9lPgqY/xAgStXG2/js=", + "lastModified": 1687865038, + "narHash": "sha256-zFTxFNXmXc2XOriWtNzuznEICcSBnIbRVVR/M5w/Y40=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "62c75883d1b275d2a6e62bf31d59a43f0a404c14", + "rev": "d83296c7a9029eccc04544ddf0a8387d8104b882", "type": "github" }, "original": { @@ -589,7 +597,9 @@ "inputs": { "flake-parts": "flake-parts", "nix-filter": "nix-filter", - "nixpkgs": "nixpkgs_5" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1687380522, @@ -621,7 +631,9 @@ "flake-utils": "flake-utils_3", "format-all": "format-all", "nix-straight": "nix-straight", - "nixpkgs": "nixpkgs_6", + "nixpkgs": [ + "nixpkgs" + ], "nose": "nose", "ob-racket": "ob-racket", "org": "org", @@ -665,7 +677,9 @@ }, "nix-software-center": { "inputs": { - "nixpkgs": "nixpkgs_7", + "nixpkgs": [ + "nixpkgs" + ], "utils": "utils" }, "locked": { @@ -715,16 +729,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1661353537, - "narHash": "sha256-1E2IGPajOsrkR49mM5h55OtYnU0dGyre6gl60NXKITE=", - "owner": "nixos", + "lastModified": 1687807295, + "narHash": "sha256-7TUD0p0m4mZpIi1O+Cyk5NCqpJUnhv/CJOAuHOndjao=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e304ff0d9db453a4b230e9386418fd974d5804a", + "rev": "6b3d1b1cf13f407fef5e634b224d575eb7211975", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -767,11 +781,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1687844701, - "narHash": "sha256-+XLIQD4q8dMvg2K0LCRBNtcr0rIsarJPiGw+//Modtg=", + "lastModified": 1687936315, + "narHash": "sha256-3NAg0S7+2zaUADsSwJZWOWjf/Dl1364kGgbXYQRRL3I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e426af54ff8e59a89ca34436eb245b0fd32348b4", + "rev": "32281c4ae8c9522ab80e2a85776d192dfd631bca", "type": "github" }, "original": { @@ -796,117 +810,6 @@ "type": "indirect" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1683408522, - "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1658161305, - "narHash": "sha256-X/nhnMCa1Wx4YapsspyAs6QYz6T/85FofrI6NpdPDHg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e4d49de45a3b5dbcb881656b4e3986e666141ea9", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1687502512, - "narHash": "sha256-dBL/01TayOSZYxtY4cMXuNCBk8UMLoqRZA+94xiFpJA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3ae20aa58a6c0d1ca95c9b11f59a2d12eebc511f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1685383865, - "narHash": "sha256-3uQytfnotO6QJv3r04ajSXbEFMII0dUtw0uqYlZ4dbk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5e871d8aa6f57cc8e0dc087d1c5013f6e212b4ce", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1682566018, - "narHash": "sha256-HPzPRFiy2o/7k7mtnwfM1E6NVZHiFbPdmYCMoIpkHO4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8e3b64db39f2aaa14b35ee5376bd6a2e707cadc2", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixpkgs-unstable", - "type": "indirect" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1686592866, - "narHash": "sha256-riGg89eWhXJcPNrQGcSwTEEm7CGxWC06oSX44hajeMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0eeebd64de89e4163f4d3cf34ffe925a5cf67a05", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { - "locked": { - "lastModified": 1687681650, - "narHash": "sha256-M2If+gRcfpmaJy/XbfSsRzLlPpoU4nr0NHnKKl50fd8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1c9db9710cb23d60570ad4d7ab829c2d34403de3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nose": { "flake": false, "locked": { @@ -1070,7 +973,7 @@ "nix-doom-emacs": "nix-doom-emacs", "nix-software-center": "nix-software-center", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs", "nixpkgs-master": "nixpkgs-master" } }, diff --git a/flake.nix b/flake.nix index 02cac17..abc5dda 100644 --- a/flake.nix +++ b/flake.nix @@ -3,20 +3,42 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - nix-software-center.url = "github:vlinkz/nix-software-center"; - nix-doom-emacs.url = "github:nix-community/nix-doom-emacs"; + nix-software-center = { + url = "github:vlinkz/nix-software-center"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nix-doom-emacs = { + url = "github:nix-community/nix-doom-emacs"; + inputs.nixpkgs.follows = "nixpkgs"; + }; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - helix.url = "github:helix-editor/helix/master"; - nixos-hardware.url = "github:NixOS/nixos-hardware"; - + helix = { + url = "github:helix-editor/helix/master"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nixos-hardware = { + url = "github:NixOS/nixos-hardware"; + }; nixpkgs-master.url = "github:NixOS/nixpkgs/master"; - hypr-contrib.url = "github:hyprwm/contrib"; - hyprland.url = "github:hyprwm/Hyprland"; - eww.url = "github:elkowar/eww"; - nix-but-gigachad.url = "github:viperML/nh"; + hypr-contrib = { + url = "github:hyprwm/contrib"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + hyprland = { + url = "github:hyprwm/Hyprland"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + eww = { + url = "github:elkowar/eww"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nix-but-gigachad = { + url = "github:viperML/nh"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { self, nixpkgs, home-manager, ... }@inputs: {