From e54e5cbc54734d9ef2c3e67a2202495bb9e639c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Yule=20B=C3=A4dorf?= Date: Tue, 12 Mar 2024 17:20:34 +0100 Subject: [PATCH] update: update nixpkgs & nvfetcher, use nixd from flake nixd is using a version of nix marked as unsafe: https://github.com/nix-community/nixd/issues/357 --- flake.lock | 93 ++++++++++++++++++++++++++++++++---- flake.nix | 5 +- overlays/default.nix | 1 + pkgs/_sources/generated.json | 8 ++-- pkgs/_sources/generated.nix | 8 ++-- 5 files changed, 96 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index 596e2fb..0d12f37 100644 --- a/flake.lock +++ b/flake.lock @@ -201,6 +201,24 @@ "type": "github" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, + "locked": { + "lastModified": 1709336216, + "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -301,6 +319,26 @@ "type": "github" } }, + "nixd": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1710142672, + "narHash": "sha256-MRClVDHMGXglXpSR+RflwnrY/ngePqrxOwiwoh5/BtU=", + "owner": "nix-community", + "repo": "nixd", + "rev": "eb40e5b315fafa1086f69be84918bbd9235e0a10", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "main", + "repo": "nixd", + "type": "github" + } + }, "nixos-flake": { "locked": { "lastModified": 1692742948, @@ -365,13 +403,31 @@ "type": "github" } }, + "nixpkgs-lib_2": { + "locked": { + "dir": "lib", + "lastModified": 1709237383, + "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-master": { "locked": { - "lastModified": 1709023659, - "narHash": "sha256-C9WikltVlB1yAyFEb/HpADTyDuLz5wctZMg+P+UASn4=", + "lastModified": 1710240611, + "narHash": "sha256-/0WLZkT77qAv/A4QiBdc1lEFxN5lRoWe2dZ1uTO0lMQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "51ea18aaa6b1951be64fcfad57088e2b591ca749", + "rev": "d317942391a1cd1c8c0621afd9a89edf64e7551b", "type": "github" }, "original": { @@ -383,11 +439,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1708807242, - "narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=", + "lastModified": 1709961763, + "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a", + "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", "type": "github" }, "original": { @@ -415,11 +471,27 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1708831307, - "narHash": "sha256-0iL/DuGjiUeck1zEaL+aIe2WvA3/cVhp/SlmTcOZXH4=", + "lastModified": 1710097495, + "narHash": "sha256-B7Ea7q7hU7SE8wOPJ9oXEBjvB89yl2csaLjf5v/7jr8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d40e866b1f98698d454dad8f592fe7616ff705a4", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1710162809, + "narHash": "sha256-i2R2bcnQp+85de67yjgZVvJhd6rRnJbSYNpGmB6Leb8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5bf1cadb72ab4e77cb0b700dab76bcdaf88f706b", + "rev": "ddcd7598b2184008c97e6c9c6a21c5f37590b8d2", "type": "github" }, "original": { @@ -462,9 +534,10 @@ "impermanence": "impermanence", "mobile-nixos": "mobile-nixos", "musnix": "musnix", + "nixd": "nixd", "nixos-flake": "nixos-flake", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-master": "nixpkgs-master", "nixpkgs-unstable": "nixpkgs-unstable", "openstreetmap": "openstreetmap" diff --git a/flake.nix b/flake.nix index 5911914..086e206 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,8 @@ nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-master.url = "github:nixos/nixpkgs/master"; + nixd.url = "github:nix-community/nixd/main"; + flake-compat.url = "github:edolstra/flake-compat"; flake-compat.flake = false; @@ -64,6 +66,7 @@ inherit system; overlays = with inputs; [ agenix.overlays.default + nixd.overlays.default ]; }; }; @@ -89,7 +92,7 @@ opentofu terraform-backend-git - + deno ]; diff --git a/overlays/default.nix b/overlays/default.nix index 04b0151..73c48b7 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -8,6 +8,7 @@ overlays = ({ ... }: { nixpkgs.overlays = [ inputs.deno2nix.overlays.default + inputs.nixd.overlays.default (final: prev: let unstable = import inputs.nixpkgs-unstable { system = prev.system; }; diff --git a/pkgs/_sources/generated.json b/pkgs/_sources/generated.json index 0a3e186..fddb96d 100644 --- a/pkgs/_sources/generated.json +++ b/pkgs/_sources/generated.json @@ -20,7 +20,7 @@ }, "blesh-nvfetcher": { "cargoLocks": null, - "date": "2024-02-06", + "date": "2024-03-11", "extract": null, "name": "blesh-nvfetcher", "passthru": null, @@ -32,11 +32,11 @@ "name": null, "owner": "akinomyoga", "repo": "ble.sh", - "rev": "27e6309ef2344d37a6cec49f37b958c70f660472", - "sha256": "sha256-Mp/oay4jDpA2UFUpsxaSbgw0gMDtSzVvWezhZ2SOW/E=", + "rev": "b6344b3be1978695889371de83ac4d15352e4fee", + "sha256": "sha256-mKqvbwLW71NBeuP5Cqsp/dmrbodzAmFI3HYN5v07cNg=", "type": "github" }, - "version": "27e6309ef2344d37a6cec49f37b958c70f660472" + "version": "b6344b3be1978695889371de83ac4d15352e4fee" }, "instant-nvim-nvfetcher": { "cargoLocks": null, diff --git a/pkgs/_sources/generated.nix b/pkgs/_sources/generated.nix index c7864d6..b4fe187 100644 --- a/pkgs/_sources/generated.nix +++ b/pkgs/_sources/generated.nix @@ -16,17 +16,17 @@ }; blesh-nvfetcher = { pname = "blesh-nvfetcher"; - version = "27e6309ef2344d37a6cec49f37b958c70f660472"; + version = "b6344b3be1978695889371de83ac4d15352e4fee"; src = fetchFromGitHub { owner = "akinomyoga"; repo = "ble.sh"; - rev = "27e6309ef2344d37a6cec49f37b958c70f660472"; + rev = "b6344b3be1978695889371de83ac4d15352e4fee"; fetchSubmodules = true; deepClone = false; leaveDotGit = true; - sha256 = "sha256-Mp/oay4jDpA2UFUpsxaSbgw0gMDtSzVvWezhZ2SOW/E="; + sha256 = "sha256-mKqvbwLW71NBeuP5Cqsp/dmrbodzAmFI3HYN5v07cNg="; }; - date = "2024-02-06"; + date = "2024-03-11"; }; instant-nvim-nvfetcher = { pname = "instant-nvim-nvfetcher";