diff --git a/flake.lock b/flake.lock index b8aa739..9889bc3 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1788297115, - "narHash": "sha256-Z+vUNbfd2FIKkWOTkcT7RYlh3oFCnig/d2eXD1SWf2E=", + "lastModified": 1788752844, + "narHash": "sha256-VaWGJ6+cIYN2erfSecbRV+4ljI185Ty2wUrXyvQbgOw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3116115851d68b8952a2a4221cc25a84e56b532", + "rev": "dc5d91f840324650bac8c379428c7037a416959a", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-26.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 2f4d06c..c0091cc 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; }; outputs = { self, nixpkgs, ... }: diff --git a/overlays.nix b/overlays.nix index 4918c98..850a455 100644 --- a/overlays.nix +++ b/overlays.nix @@ -7,7 +7,7 @@ let edalize = final: _: final.callPackage ./pkgs/edalize.nix { }; leaf-markdown = final: _: final.callPackage ./pkgs/leaf.nix { }; naturaldocs = final: _: final.callPackage ./pkgs/naturaldocs.nix { }; - slang-server = final: _: final.callPackage ./pkgs/slangServer/slangServer.nix { }; + slang-server = final: _: final.callPackage ./pkgs/slangServer.nix { }; ttf2psf = final: _: final.callPackage ./pkgs/ttf2psf.nix { }; veadotube = final: _: final.callPackage ./pkgs/veadotube.nix { }; proton-wineland-bin = final: _: final.callPackage ./pkgs/proton-wineland-bin.nix { }; diff --git a/pkgs/slangServer/slangServer.nix b/pkgs/slangServer.nix similarity index 58% rename from pkgs/slangServer/slangServer.nix rename to pkgs/slangServer.nix index c582e01..66160ca 100644 --- a/pkgs/slangServer/slangServer.nix +++ b/pkgs/slangServer.nix @@ -3,7 +3,6 @@ catch2_3, cmake, cpptrace, - fetchFromGitHub, fetchgit, fmt, mimalloc, @@ -13,11 +12,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "slang-server"; - version = "0.2.9"; + version = "0.2.10"; src = fetchgit { url = "https://github.com/hudson-trading/slang-server"; rev = "v${finalAttrs.version}"; - hash = "sha256-6Lc9rS8FEUSYcr2ulRqez7Of3awsxw3T6DsvZr9sVWI="; + hash = "sha256-hyKiEtUpLkXYbwh9KKDc26EgZbC1bvf0hV5tM8p5vVU="; fetchSubmodules = true; }; nativeBuildInputs = [ @@ -28,28 +27,13 @@ stdenv.mkDerivation (finalAttrs: { mimalloc python3 tomlplusplus - (fmt.overrideAttrs ( - final: prev: { - version = "12.2.0"; - src = fetchFromGitHub { - owner = "fmtlib"; - repo = "fmt"; - rev = final.version; - hash = "sha256-Tc7PmNxUv7ajw6GaHPGEEtrD/fl6is7RB8TPestJa1o="; - }; - } - )).dev + fmt.dev ]; cmakeFlags = [ - "-DCMAKE_DISABLE_FIND_PACKAGE_fmt=0" "-DSLANG_SERVER_INCLUDE_TESTS=0" - "-DSLANG_USE_SYSTEM_FMT=1" + "-DSLANG_SERVER_USE_SYSTEM_FMT=1" "-DSLANG_USE_SYSTEM_BOOST=1" ]; - patches = [ ./findfmt.patch ]; - CXXFLAGS = [ - "-Wno-error=maybe-uninitialized" - ]; meta = { homepage = "https://hudson-trading.github.io/slang-server"; description = "A high-performance LSP implementation for SystemVerilog, built on top of the Slang frontend"; diff --git a/pkgs/slangServer/findfmt.patch b/pkgs/slangServer/findfmt.patch deleted file mode 100644 index 6df7cbe..0000000 --- a/pkgs/slangServer/findfmt.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2fc0314..b797a28 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -83,6 +83,10 @@ if(SLANG_SERVER_MASTER_PROJECT AND NOT DEFINED CMAKE_DISABLE_FIND_PACKAGE_fmt) - set(CMAKE_DISABLE_FIND_PACKAGE_fmt TRUE) - endif() - -+if(NOT CMAKE_DISABLE_FIND_PACKAGE_fmt) -+ find_package(fmt 12.2.0) -+endif() -+ - if(CMAKE_SYSTEM_NAME MATCHES "Darwin") - # This ensures that *all* targets (including slang and reflect-cpp) use the - # default Apple C++ runtime, preventing dynamic link conflicts.