Skip to content

Commit 7ed8b4b

Browse files
committed
sv-lang: added version 7.0
1 parent 810110b commit 7ed8b4b

File tree

2 files changed

+52
-46
lines changed

2 files changed

+52
-46
lines changed

pkgs/default.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
container-hotplug = pkgs.callPackage ./container-hotplug {};
2929
surfer = pkgs.callPackage ./surfer/default.nix {};
3030
uf2conv = pkgs.callPackage ./uf2conv.nix {};
31-
sv-lang_6 = pkgs.callPackage ./sv-lang.nix {};
31+
32+
inherit (pkgs.callPackage ./sv-lang.nix {}) sv-lang_6 sv-lang_7;
3233
veridian = pkgs.callPackage ./veridian/default.nix {inherit sv-lang_6;};
3334
peakrdl = pkgs.callPackage ./peakrdl.nix {};
3435

pkgs/sv-lang.nix

Lines changed: 50 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -10,58 +10,63 @@
1010
cmake,
1111
ninja,
1212
python3,
13-
}:
14-
stdenv.mkDerivation rec {
15-
pname = "sv-lang";
16-
version = "6.0";
13+
}: let
14+
svLangDerivation = version: hash:
15+
stdenv.mkDerivation rec {
16+
pname = "sv-lang";
17+
inherit version;
1718

18-
src = fetchFromGitHub {
19-
owner = "MikePopoloski";
20-
repo = "slang";
21-
rev = "v${version}";
22-
sha256 = "sha256-mT8sfUz0H4jWM/SkV/uW4kmVKE9UQy6XieG65yJvIA8=";
23-
};
19+
src = fetchFromGitHub {
20+
owner = "MikePopoloski";
21+
repo = "slang";
22+
rev = "v${version}";
23+
inherit hash;
24+
};
2425

25-
cmakeFlags = [
26-
# fix for https://github.com/NixOS/nixpkgs/issues/144170
27-
"-DCMAKE_INSTALL_INCLUDEDIR=include"
28-
"-DCMAKE_INSTALL_LIBDIR=lib"
26+
cmakeFlags = [
27+
# fix for https://github.com/NixOS/nixpkgs/issues/144170
28+
"-DCMAKE_INSTALL_INCLUDEDIR=include"
29+
"-DCMAKE_INSTALL_LIBDIR=lib"
2930

30-
"-DFETCHCONTENT_SOURCE_DIR_FMT=${fmt_10.src.outPath}"
31-
"-DFETCHCONTENT_SOURCE_DIR_CATCH2=${catch2_3.src.outPath}"
31+
"-DFETCHCONTENT_SOURCE_DIR_FMT=${fmt_10.src.outPath}"
32+
"-DFETCHCONTENT_SOURCE_DIR_CATCH2=${catch2_3.src.outPath}"
3233

33-
"-DSLANG_INCLUDE_TESTS=${
34-
if doCheck
35-
then "ON"
36-
else "OFF"
37-
}"
38-
"-DSLANG_USE_MIMALLOC=OFF"
39-
];
34+
"-DSLANG_INCLUDE_TESTS=${
35+
if doCheck
36+
then "ON"
37+
else "OFF"
38+
}"
39+
"-DSLANG_USE_MIMALLOC=OFF"
40+
];
4041

41-
nativeBuildInputs = [
42-
cmake
43-
python3
44-
ninja
42+
nativeBuildInputs = [
43+
cmake
44+
python3
45+
ninja
4546

46-
# though only used in tests, cmake will complain its absence when configuring
47-
catch2_3
48-
];
47+
# though only used in tests, cmake will complain its absence when configuring
48+
catch2_3
49+
];
4950

50-
buildInputs = [
51-
boost182
52-
];
51+
buildInputs = [
52+
boost182
53+
];
5354

54-
# TODO: a mysterious linker error occurs when building the unittests on darwin.
55-
# The error occurs when using catch2_3 in nixpkgs, not when fetching catch2_3 using CMake
56-
doCheck = !stdenv.isDarwin;
55+
# TODO: a mysterious linker error occurs when building the unittests on darwin.
56+
# The error occurs when using catch2_3 in nixpkgs, not when fetching catch2_3 using CMake
57+
doCheck = !stdenv.isDarwin;
5758

58-
meta = with lib; {
59-
description = "SystemVerilog compiler and language services";
60-
homepage = "https://github.com/MikePopoloski/slang";
61-
license = licenses.mit;
62-
maintainers = with maintainers; [sharzy];
63-
mainProgram = "slang";
64-
broken = stdenv.isDarwin;
65-
platforms = platforms.all;
66-
};
59+
meta = with lib; {
60+
description = "SystemVerilog compiler and language services";
61+
homepage = "https://github.com/MikePopoloski/slang";
62+
license = licenses.mit;
63+
maintainers = with maintainers; [sharzy];
64+
mainProgram = "slang";
65+
broken = stdenv.isDarwin;
66+
platforms = platforms.all;
67+
};
68+
};
69+
in {
70+
sv-lang_6 = svLangDerivation "6.0" "sha256-mT8sfUz0H4jWM/SkV/uW4kmVKE9UQy6XieG65yJvIA8=";
71+
sv-lang_7 = svLangDerivation "7.0" "sha256-msSc6jw2xbEZfOwtqwFEDIKcwf5SDKp+j15lVbNO98g=";
6772
}

0 commit comments

Comments
 (0)