From 454aeb92b29c8e9621ae49142e076eb6fd8d691d Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Mon, 14 Oct 2024 15:18:07 +0200 Subject: [PATCH 1/2] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/d57112db877f07387ce7104b5ac346ede556d2d7?narHash=sha256-8ZWr1HpciQsrFjvPMvZl0W%2Bb0dilZOqXPoKa2Ux36bc%3D' (2024-10-12) → 'github:nix-community/home-manager/e1aec543f5caf643ca0d94b6a633101942fd065f?narHash=sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o%3D' (2024-10-14) • Updated input 'nix-index-database': 'github:nix-community/nix-index-database/5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259?narHash=sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg%3D' (2024-10-07) → 'github:nix-community/nix-index-database/5c54c33aa04df5dd4b0984b7eb861d1981009b22?narHash=sha256-grMdAd4KSU6uPqsfLzA1B/3pb9GtGI9o8qb0qFzEU/Y%3D' (2024-10-13) • Updated input 'nixpkgs-master': 'github:NixOS/nixpkgs/54cce652cb480258b12f15b2915e7a6c79ac51ae?narHash=sha256-BKniFdCCST/4gmDPjHgfVOOvCyVk5sp3PX%2Bf4SKSFM0%3D' (2024-10-12) → 'github:NixOS/nixpkgs/7fa916ffb5a18e5c644c6b00cb93109e4394addb?narHash=sha256-E83WJwDfBmIfx8cTpHqlY456nA2Xd3faZI4YWsKS6fo%3D' (2024-10-14) • Updated input 'nixpkgs-update': 'github:ryantm/nixpkgs-update/2625c4cffc6053ae368741b0da69a3f329f6e735?narHash=sha256-2wU4hcFOdqWLqVjUib5ffZMRDagXxsrD5puXugubon8%3D' (2024-10-02) → 'github:ryantm/nixpkgs-update/2063b5e8465c04ca9e541fe14a0b121cb21cc301?narHash=sha256-6ld8eO7cwm7hGT9qXmioFSEW6tHmgP5z/oKTkBpAUFM%3D' (2024-10-14) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 2e53dd6..3acb5c7 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1728726232, - "narHash": "sha256-8ZWr1HpciQsrFjvPMvZl0W+b0dilZOqXPoKa2Ux36bc=", + "lastModified": 1728903686, + "narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=", "owner": "nix-community", "repo": "home-manager", - "rev": "d57112db877f07387ce7104b5ac346ede556d2d7", + "rev": "e1aec543f5caf643ca0d94b6a633101942fd065f", "type": "github" }, "original": { @@ -213,11 +213,11 @@ ] }, "locked": { - "lastModified": 1728263287, - "narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=", + "lastModified": 1728790083, + "narHash": "sha256-grMdAd4KSU6uPqsfLzA1B/3pb9GtGI9o8qb0qFzEU/Y=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259", + "rev": "5c54c33aa04df5dd4b0984b7eb861d1981009b22", "type": "github" }, "original": { @@ -265,11 +265,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1728738154, - "narHash": "sha256-BKniFdCCST/4gmDPjHgfVOOvCyVk5sp3PX+f4SKSFM0=", + "lastModified": 1728911864, + "narHash": "sha256-E83WJwDfBmIfx8cTpHqlY456nA2Xd3faZI4YWsKS6fo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "54cce652cb480258b12f15b2915e7a6c79ac51ae", + "rev": "7fa916ffb5a18e5c644c6b00cb93109e4394addb", "type": "github" }, "original": { @@ -287,11 +287,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1727910488, - "narHash": "sha256-2wU4hcFOdqWLqVjUib5ffZMRDagXxsrD5puXugubon8=", + "lastModified": 1728865681, + "narHash": "sha256-6ld8eO7cwm7hGT9qXmioFSEW6tHmgP5z/oKTkBpAUFM=", "owner": "ryantm", "repo": "nixpkgs-update", - "rev": "2625c4cffc6053ae368741b0da69a3f329f6e735", + "rev": "2063b5e8465c04ca9e541fe14a0b121cb21cc301", "type": "github" }, "original": { From 80007a9bd33228106dc54b4c6a95b7add2aa0aed Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Mon, 21 Oct 2024 21:46:41 +0200 Subject: [PATCH 2/2] remove nixpkgs master --- flake.lock | 41 ++++++++++++----------------------------- flake.nix | 8 -------- 2 files changed, 12 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index 1566cef..4b63a9a 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1728599261, - "narHash": "sha256-gPQLxw6B3KSlYb+OxXLinVI7ea+ocNiRuvPQKnO6i5M=", + "lastModified": 1729457257, + "narHash": "sha256-UCuWoY+T0fT2lT0/EusCDVVMidzeAzh9JpYyD2bTkqA=", "owner": "dagger", "repo": "nix", - "rev": "ddf4f5a9c2506235119d527a9461014aff39b11a", + "rev": "fddec739bab363dd03b0bbd1e7d36c285508666c", "type": "github" }, "original": { @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1729260213, - "narHash": "sha256-jAvHoU/1y/yCuXzr2fNF+q6uKmr8Jj2xgAisK4QB9to=", + "lastModified": 1729459288, + "narHash": "sha256-gBOVJv+q6Mx8jGvwX7cE6J8+sZmi1uxpRVsO7WxvVuQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "09a0c0c02953318bf94425738c7061ffdc4cba75", + "rev": "1e27f213d77fc842603628bcf2df6681d7d08f7e", "type": "github" }, "original": { @@ -213,11 +213,11 @@ ] }, "locked": { - "lastModified": 1728790083, - "narHash": "sha256-grMdAd4KSU6uPqsfLzA1B/3pb9GtGI9o8qb0qFzEU/Y=", + "lastModified": 1729394935, + "narHash": "sha256-2ntUG+NJKdfhlrh/tF+jOU0fOesO7lm5ZZVSYitsvH8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "5c54c33aa04df5dd4b0984b7eb861d1981009b22", + "rev": "04f8a11f247ba00263b060fbcdc95484fd046104", "type": "github" }, "original": { @@ -263,22 +263,6 @@ "type": "github" } }, - "nixpkgs-master": { - "locked": { - "lastModified": 1729281999, - "narHash": "sha256-Dr9QpT0SPsGOMqwrSPR9GQbvKACz2TceDtm5MPEYj3Y=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "47607103f07ce272790ca07a7d4982256047dbb6", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "master", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-update": { "inputs": { "mmdoc": "mmdoc", @@ -302,11 +286,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1729070438, - "narHash": "sha256-KOTTUfPkugH52avUvXGxvWy8ibKKj4genodIYUED+Kc=", + "lastModified": 1729256560, + "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5785b6bb5eaae44e627d541023034e1601455827", + "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", "type": "github" }, "original": { @@ -355,7 +339,6 @@ "nix-index-database": "nix-index-database_2", "nixgl": "nixgl", "nixpkgs": "nixpkgs_2", - "nixpkgs-master": "nixpkgs-master", "nixpkgs-update": "nixpkgs-update", "suyu": "suyu", "w17": "w17" diff --git a/flake.nix b/flake.nix index 5a127f4..9c5dfcc 100644 --- a/flake.nix +++ b/flake.nix @@ -5,9 +5,6 @@ nixpkgs = { url = "github:NixOS/nixpkgs/nixos-unstable"; }; - nixpkgs-master = { - url = "github:NixOS/nixpkgs/master"; - }; nixpkgs-update = { url = "github:ryantm/nixpkgs-update"; }; @@ -54,7 +51,6 @@ outputs = { nixpkgs - , nixpkgs-master , home-manager , nixgl , w17 @@ -66,10 +62,6 @@ system = "${system}"; overlays = [ nixgl.overlay - (final: prev: { - inherit (nixpkgs-master.legacyPackages.${prev.system}) - deno; - }) ]; allowUnfree = true; };