From 7f4e302f7d53852cca8b95765bd4ff8d45bebb2c Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Tue, 14 Oct 2025 20:37:12 -0700 Subject: [PATCH 1/2] sv-lang: 7.0 -> 9.1 --- pkgs/by-name/sv/sv-lang/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sv/sv-lang/package.nix b/pkgs/by-name/sv/sv-lang/package.nix index b72ba3e6316b..b04eca78a498 100644 --- a/pkgs/by-name/sv/sv-lang/package.nix +++ b/pkgs/by-name/sv/sv-lang/package.nix @@ -13,18 +13,18 @@ stdenv.mkDerivation rec { pname = "sv-lang"; - version = "7.0"; + version = "9.1"; src = fetchFromGitHub { owner = "MikePopoloski"; repo = "slang"; rev = "v${version}"; - sha256 = "sha256-msSc6jw2xbEZfOwtqwFEDIKcwf5SDKp+j15lVbNO98g="; + sha256 = "sha256-IfRh6F6vA+nFa+diPKD2aMv9kRbvVIY80IqX0d+d5JA="; }; postPatch = '' substituteInPlace external/CMakeLists.txt \ - --replace-fail 'set(mimalloc_min_version "2.1")' 'set(mimalloc_min_version "${lib.versions.majorMinor mimalloc.version}")' + --replace-fail 'set(mimalloc_min_version "2.2")' 'set(mimalloc_min_version "${lib.versions.majorMinor mimalloc.version}")' ''; cmakeFlags = [ From f18df57364f4d89ba08968774eba0c649748f6b4 Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Wed, 15 Oct 2025 14:05:07 -0700 Subject: [PATCH 2/2] sv-lang: cleanup --- pkgs/by-name/sv/sv-lang/package.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/sv/sv-lang/package.nix b/pkgs/by-name/sv/sv-lang/package.nix index b04eca78a498..ee4ef1d3c843 100644 --- a/pkgs/by-name/sv/sv-lang/package.nix +++ b/pkgs/by-name/sv/sv-lang/package.nix @@ -11,20 +11,21 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sv-lang"; version = "9.1"; src = fetchFromGitHub { owner = "MikePopoloski"; repo = "slang"; - rev = "v${version}"; - sha256 = "sha256-IfRh6F6vA+nFa+diPKD2aMv9kRbvVIY80IqX0d+d5JA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-IfRh6F6vA+nFa+diPKD2aMv9kRbvVIY80IqX0d+d5JA="; }; postPatch = '' - substituteInPlace external/CMakeLists.txt \ - --replace-fail 'set(mimalloc_min_version "2.2")' 'set(mimalloc_min_version "${lib.versions.majorMinor mimalloc.version}")' + substituteInPlace external/CMakeLists.txt --replace-fail \ + 'set(mimalloc_min_version "2.2")' \ + 'set(mimalloc_min_version "${lib.versions.majorMinor mimalloc.version}")' ''; cmakeFlags = [ @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_INCLUDEDIR=include" "-DCMAKE_INSTALL_LIBDIR=lib" - "-DSLANG_INCLUDE_TESTS=${if doCheck then "ON" else "OFF"}" + "-DSLANG_INCLUDE_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" ]; nativeBuildInputs = [ @@ -41,6 +42,8 @@ stdenv.mkDerivation rec { ninja ]; + strictDeps = true; + buildInputs = [ boost fmt @@ -62,4 +65,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; broken = stdenv.hostPlatform.isDarwin; }; -} +})