From 6e2c04fb1ef707a40824b2ac0d0e8c0380db4f85 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Sun, 10 Mar 2024 21:27:03 +0100 Subject: [PATCH] make some flakes follow input nixpkgs --- flake.lock | 132 ++++++----------------------------------------------- flake.nix | 16 +++++-- 2 files changed, 25 insertions(+), 123 deletions(-) diff --git a/flake.lock b/flake.lock index 96aab00..4411d81 100644 --- a/flake.lock +++ b/flake.lock @@ -172,7 +172,9 @@ }, "muse-sounds-manager": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1707875169, @@ -212,29 +214,12 @@ "type": "github" } }, - "nix-software-center": { - "inputs": { - "nixpkgs": "nixpkgs_3", - "utils": "utils" - }, - "locked": { - "lastModified": 1703105285, - "narHash": "sha256-BHoW1RQMc2Auz8paBvTBriKv0F6FI99+3nnz/ELLawg=", - "owner": "vlinkz", - "repo": "nix-software-center", - "rev": "68e87fb6e24fb3e6fe65449918d0cbda96622b65", - "type": "github" - }, - "original": { - "owner": "vlinkz", - "repo": "nix-software-center", - "type": "github" - } - }, "nixgl": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_4" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1685908677, @@ -317,7 +302,7 @@ "nixpkgs-update": { "inputs": { "mmdoc": "mmdoc", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1703122623, @@ -334,52 +319,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1707689078, - "narHash": "sha256-UUGmRa84ZJHpGZ1WZEBEUOzaPOWG8LZ0yPg1pdDF/yM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1692638711, - "narHash": "sha256-J0LgSFgJVGCC1+j5R2QndadWI1oumusg6hCtYAzLID4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "91a22f76cd1716f9d0149e8a5c68424bb691de15", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1660551188, - "narHash": "sha256-a1LARMMYQ8DPx1BgoI/UN4bXe12hhZkCNqdxNi6uS0g=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "441dc5d512153039f19ef198e662e4f3dbb9fd65", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1709961763, "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", @@ -395,7 +334,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_3": { "locked": { "lastModified": 1672428209, "narHash": "sha256-eejhqkDz2cb2vc5VeaWphJz8UXNuoNoM8/Op8eWv2tQ=", @@ -409,19 +348,6 @@ "type": "indirect" } }, - "nixpkgs_7": { - "locked": { - "lastModified": 1709479366, - "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", - "path": "/nix/store/bjvqq8c79dbi59g7xzcc6lhl0f19m3d7-source", - "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "pre-commit-hooks": { "inputs": { "flake-compat": [ @@ -456,9 +382,8 @@ "devenv": "devenv", "home-manager": "home-manager", "muse-sounds-manager": "muse-sounds-manager", - "nix-software-center": "nix-software-center", "nixgl": "nixgl", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_2", "nixpkgs-update": "nixpkgs-update", "w17": "w17" } @@ -493,43 +418,10 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "utils": { "inputs": { "systems": "systems_2" }, - "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_2": { - "inputs": { - "systems": "systems_3" - }, "locked": { "lastModified": 1709126324, "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", @@ -546,8 +438,10 @@ }, "w17": { "inputs": { - "nixpkgs": "nixpkgs_7", - "utils": "utils_2" + "nixpkgs": [ + "nixpkgs" + ], + "utils": "utils" }, "locked": { "lastModified": 1709679417, diff --git a/flake.nix b/flake.nix index 94f69f7..808ed37 100644 --- a/flake.nix +++ b/flake.nix @@ -8,13 +8,21 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - nix-software-center.url = "github:vlinkz/nix-software-center"; devenv.url = "github:cachix/devenv"; dagger.url = "github:dagger/nix"; dagger.inputs.nixpkgs.follows = "nixpkgs"; - nixgl.url = "github:guibou/nixGL"; - muse-sounds-manager.url = "github:thilobillerbeck/muse-sounds-manager-nix"; - w17.url = "git+https://git.darmstadt.ccc.de/avocadoom/w17-cli.git"; + nixgl = { + url = "github:guibou/nixGL"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + muse-sounds-manager = { + url = "github:thilobillerbeck/muse-sounds-manager-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + w17 = { + url = "git+https://git.darmstadt.ccc.de/avocadoom/w17-cli.git"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { nixpkgs, home-manager, nixgl, w17, ... }@inputs: