From 66eca0ebac5fddc1ed38299d92b4f48da78efd08 Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Mon, 11 Mar 2024 12:45:13 -0500 Subject: [PATCH] Fixes vulnerable version of nixd by sourcing from github directly. This also updates the flake lock a ton. --- flake.lock | 114 ++++++++++++++++++++++++++++++------- flake.nix | 5 ++ home-manager/durincore.nix | 3 +- 3 files changed, 100 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index c8e6c6e..e8d5611 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1709742003, - "narHash": "sha256-fYVjm6VGqzacPzCEy4nKcVLXy7pctJNHFqPpwm669uM=", + "lastModified": 1710174970, + "narHash": "sha256-YEeNn5h9kIrkWPsraAqJ2fWh7YP1K8ngyMSA7bLDDVk=", "owner": "atuinsh", "repo": "atuin", - "rev": "8e9e7b92a3fe514b706d7fb372f8f31ad3168743", + "rev": "04f2c95617d8d5f1f9143fe1d9b1f71279232445", "type": "github" }, "original": { @@ -94,6 +94,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": { "inputs": { "systems": "systems" @@ -140,11 +158,11 @@ ] }, "locked": { - "lastModified": 1709764752, - "narHash": "sha256-+lM4J4JoJeiN8V+3WSWndPHj1pJ9Jc1UMikGbXLqCTk=", + "lastModified": 1710164657, + "narHash": "sha256-l64+ZjaQAVkHDVaK0VHwtXBdjcBD6nLBD+p7IfyBp/w=", "owner": "nix-community", "repo": "home-manager", - "rev": "cf111d1a849ddfc38e9155be029519b0e2329615", + "rev": "017b12de5b899ef9b64e2c035ce257bfe95b8ae2", "type": "github" }, "original": { @@ -397,11 +415,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1709560848, - "narHash": "sha256-rRapK+t6KC9vkAsvVU9QiXi94yBFMz0V0qdK8mUYNKw=", + "lastModified": 1709911523, + "narHash": "sha256-XNutwbRI6h57ybeKy0yYupfngWYcfcIqE0b0LgXnyxs=", "owner": "Mic92", "repo": "nix-fast-build", - "rev": "ef8f59a0fdec1801ddc86a8c834f5802d1947b7f", + "rev": "692fe3e98f36b60c678d637235271b57910a7f80", "type": "github" }, "original": { @@ -410,6 +428,25 @@ "type": "github" } }, + "nixd-git": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1710142672, + "narHash": "sha256-MRClVDHMGXglXpSR+RflwnrY/ngePqrxOwiwoh5/BtU=", + "owner": "nix-community", + "repo": "nixd", + "rev": "eb40e5b315fafa1086f69be84918bbd9235e0a10", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixd", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1709479366, @@ -444,13 +481,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-stable": { "locked": { - "lastModified": 1709569716, - "narHash": "sha256-iOR44RU4jQ+YPGrn+uQeYAp7Xo7Z/+gT+wXJoGxxLTY=", + "lastModified": 1710021367, + "narHash": "sha256-FuMVdWqXMT38u1lcySYyv93A7B8wU0EGzUr4t4jQu8g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "617579a787259b9a6419492eaac670a5f7663917", + "rev": "b94a96839afcc56de3551aa7472b8d9a3e77e05d", "type": "github" }, "original": { @@ -462,11 +517,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1709428628, - "narHash": "sha256-//ZCCnpVai/ShtO2vPjh3AWgo8riXCaret6V9s7Hew4=", + "lastModified": 1710033658, + "narHash": "sha256-yiZiVKP5Ya813iYLho2+CcFuuHpaqKc/CoxOlANKcqM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "66d65cb00b82ffa04ee03347595aa20e41fe3555", + "rev": "b17375d3bb7c79ffc52f3538028b2ec06eb79ef8", "type": "github" }, "original": { @@ -478,11 +533,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1709479366, - "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", + "lastModified": 1709961763, + "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", + "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", "type": "github" }, "original": { @@ -524,6 +579,22 @@ "type": "github" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1710097495, + "narHash": "sha256-B7Ea7q7hU7SE8wOPJ9oXEBjvB89yl2csaLjf5v/7jr8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d40e866b1f98698d454dad8f592fe7616ff705a4", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "atuin": "atuin", @@ -534,6 +605,7 @@ "hyprland-git": "hyprland-git", "hyprland-xdph-git": "hyprland-xdph-git", "nix-fast-build": "nix-fast-build", + "nixd-git": "nixd-git", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix" @@ -547,11 +619,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1709711091, - "narHash": "sha256-L0rSIU9IguTG4YqSj4B/02SyTEz55ACq5t8gXpzteYc=", + "lastModified": 1710039806, + "narHash": "sha256-vC2fo/phnetp6ub/nRv6mgAi5LbhJ6ujGQWrRD2VgNs=", "owner": "Mic92", "repo": "sops-nix", - "rev": "25dd60fdd08fcacee2567a26ba6b91fe098941dc", + "rev": "f8d5c8baa83fe620a28c0db633be9db3e34474b4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c9e59f7..9d871a3 100644 --- a/flake.nix +++ b/flake.nix @@ -63,6 +63,11 @@ hyprland-xdph-git = { url = "github:hyprwm/xdg-desktop-portal-hyprland"; }; + + # nixd language server + nixd-git = { + url = "github:nix-community/nixd"; + }; }; # The `@` syntax here is used to alias the attribute set of the diff --git a/home-manager/durincore.nix b/home-manager/durincore.nix index a2f2826..df74be0 100644 --- a/home-manager/durincore.nix +++ b/home-manager/durincore.nix @@ -223,7 +223,8 @@ # it provides the command `nom` works just like `nix` # with more details log output nix-output-monitor - nixd # nix lsp server + # nix + inputs.nixd-git.packages.${pkgs.system}.nixd # nix lsp server # productivity glow # markdown previewer in terminal